Skip to content

Fix for CDW Virtual Warehouse race condition #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2022
Merged

Fix for CDW Virtual Warehouse race condition #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/modules/datahub_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,17 @@
wait: no

# Stop the datahub (and wait for status change)
- cloudera.cloud.datahub:
- cloudera.cloud.datahub_cluster:
name: example-datahub
state: stopped

# Start the datahub (and wait for status change)
- cloudera.cloud.datahub:
- cloudera.cloud.datahub_cluster:
name: example-datahub
state: started

# Delete the datahub (and wait for status change)
cloudera.cloud.datahub:
cloudera.cloud.datahub_cluster:
name: example-datahub
state: absent
'''
Expand Down
31 changes: 18 additions & 13 deletions plugins/modules/dw_virtual_warehouse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,16 @@
default: True
delay:
description:
- The internal polling interval (in seconds) while the module waits for the Virtual Warehouse to achieve the declared
state.
- The internal polling interval (in seconds) while the module waits for the Virtual Warehouse to achieve the
declared state.
type: int
default: 15
aliases:
- polling_delay
timeout:
description:
- The internal polling timeout (in seconds) while the module waits for the Virtual Warehouse to achieve the declared
state.
- The internal polling timeout (in seconds) while the module waits for the Virtual Warehouse to achieve the
declared state.
type: int
default: 3600
aliases:
Expand Down Expand Up @@ -377,7 +377,9 @@ def process(self):
)
else:
self.cdpy.sdk.sleep(self.delay) # Wait for consistency sync
self.virtual_warehouse = self.cdpy.dw.describe_vw(cluster_id=self.cluster_id, vw_id=self.target['id'])
self.virtual_warehouse = self.cdpy.dw.describe_vw(
cluster_id=self.cluster_id, vw_id=self.target['id']
)
# End Drop
elif self.state == 'present':
# Begin Config check
Expand Down Expand Up @@ -411,32 +413,35 @@ def process(self):
tags=self.tags)
self.changed = True
if self.wait:
completed_states = self.cdpy.sdk.STARTED_STATES + self.cdpy.sdk.STOPPED_STATES
self.virtual_warehouse = self.cdpy.sdk.wait_for_state(
describe_func=self.cdpy.dw.describe_vw,
params=dict(cluster_id=self.cluster_id, vw_id=vw_id),
state=self.cdpy.sdk.STARTED_STATES, delay=self.delay, timeout=self.timeout
state=completed_states, delay=self.delay, timeout=self.timeout
)
else:
self.virtual_warehouse = self.cdpy.dw.describe_vw(cluster_id=self.cluster_id, vw_id=vw_id)
else:
self.module.fail_json(msg="State %s is not valid for this module" % self.state)
# End Virtual Warehouse Not Found


def main():
module = AnsibleModule(
argument_spec=CdpModule.argument_spec(
warehouse_id=dict(type='str', aliases=['vw_id', 'id']),
cluster_id=dict(required=True, type='str'),
catalog_id=dict(type='str', aliases=['dbc_id']),
type = dict(type='str'),
name = dict(type='str'),
type=dict(type='str'),
name=dict(type='str'),
template=dict(type='str', choices=['xsmall', 'small', 'medium', 'large']),
autoscaling_min_nodes=dict(type='int'),
autoscaling_max_nodes=dict(type='int'),
common_configs=dict(type='dict', options=dict(
configBlocks = dict(type='list', elements='dict', options=dict(
configBlocks=dict(type='list', elements='dict', options=dict(
id=dict(type='str'),
format=dict(type='str', choices=['HADOOP_XML', 'PROPERTIES', 'TEXT', 'JSON', 'BINARY', 'ENV', 'FLAGFILE']),
format=dict(
type='str', choices=['HADOOP_XML', 'PROPERTIES', 'TEXT', 'JSON', 'BINARY', 'ENV', 'FLAGFILE']),
content=dict(type='dict', options=dict(
keyValues=dict(type='dict'),
text=dict(type='str'),
Expand All @@ -449,9 +454,9 @@ def main():
enable_sso=dict(type='bool', default=False),
tags=dict(type='dict'),
state=dict(type='str', choices=['present', 'absent'], default='present'),
wait = dict(type='bool', default=True),
delay = dict(type='int', aliases=['polling_delay'], default=15),
timeout = dict(type='int', aliases=['polling_timeout'], default=3600)
wait=dict(type='bool', default=True),
delay=dict(type='int', aliases=['polling_delay'], default=15),
timeout=dict(type='int', aliases=['polling_timeout'], default=3600)
),
required_if=[
['state', 'absent', ['warehouse_id']],
Expand Down