cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix race condifiton where multiple hosts can try and create or delete (#39698)

Browse source 
the same volume, snapshot or hostgroup,
This commit is contained in:
Simon Dodsley 2018-06-13 12:52:51 -04:00 committed by Matt Davis
parent 3832d04611
commit 8df02ac37e
3 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/modules/storage/purestorage/purefa_hg.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# (c) 2017, Simon Dodsley (simon@purestorage.com)
# (c) 2018, Simon Dodsley (simon@purestorage.com)
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import absolute_import, division, print_function
@ -126,7 +126,7 @@ def make_hostgroup(module, array):
try:
array.create_hgroup(module.params['hostgroup'])
except:
module.fail_json(msg='Failed to create hostgroup {0}'.format(module.params['hostgroup']))
changed = False
if module.params['host']:
array.set_hgroup(module.params['hostgroup'], hostlist=module.params['host'])
if module.params['volume']:
@ -188,14 +188,24 @@ def update_hostgroup(module, array):
def delete_hostgroup(module, array):
changed = True
for vol in array.list_hgroup_connections(module.params['hostgroup']):
array.disconnect_hgroup(module.params['hostgroup'], vol["vol"])
host = array.get_hgroup(module.params['hostgroup'])
array.set_hgroup(module.params['hostgroup'], remhostlist=host['hosts'])
try:
array.delete_hgroup(module.params['hostgroup'])
vols = array.list_hgroup_connections(module.params['hostgroup'])
for vol in vols:
try:
array.disconnect_hgroup(module.params['hostgroup'], vol["vol"])
except:
changed = False
host = array.get_hgroup(module.params['hostgroup'])
try:
array.set_hgroup(module.params['hostgroup'], remhostlist=host['hosts'])
try:
array.delete_hgroup(module.params['hostgroup'])
except:
changed = False
except:
changed = False
except:
module.fail_json(msg='Failed to delete hostgroup {0}'.format(module.params['hostgroup']))
changed = False
module.exit_json(changed=changed)

23
lib/ansible/modules/storage/purestorage/purefa_snap.py
View file

@ -132,9 +132,13 @@ def get_snapshot(module, array):
def create_snapshot(module, array):
"""Create Snapshot"""
changed = True
if not module.check_mode:
array.create_snapshot(module.params['name'], suffix=module.params['suffix'])
module.exit_json(changed=True)
try:
array.create_snapshot(module.params['name'], suffix=module.params['suffix'])
except:
changed = False
module.exit_json(changed=changed)
def create_from_snapshot(module, array):
@ -165,12 +169,19 @@ def update_snapshot(module, array):
def delete_snapshot(module, array):
""" Delete Snapshot"""
changed = True
if not module.check_mode:
snapname = module.params['name'] + "." + module.params['suffix']
array.destroy_volume(snapname)
if module.params['eradicate']:
array.eradicate_volume(snapname)
module.exit_json(changed=True)
try:
array.destroy_volume(snapname)
if module.params['eradicate']:
try:
array.eradicate_volume(snapname)
except:
changed = False
except:
changed = False
module.exit_json(changed=changed)
def main():

24
lib/ansible/modules/storage/purestorage/purefa_volume.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# (c) 2017, Simon Dodsley (simon@purestorage.com)
# (c) 2018, Simon Dodsley (simon@purestorage.com)
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import absolute_import, division, print_function
@ -149,10 +149,13 @@ def get_target(module, array):
def create_volume(module, array):
"""Create Volume"""
size = module.params['size']
changed = True
if not module.check_mode:
array.create_volume(module.params['name'], size)
module.exit_json(changed=True)
try:
array.create_volume(module.params['name'], size)
except:
changed = False
module.exit_json(changed=changed)
def copy_from_volume(module, array):
@ -190,10 +193,17 @@ def update_volume(module, array):
def delete_volume(module, array):
""" Delete Volume"""
changed = True
if not module.check_mode:
array.destroy_volume(module.params['name'])
if module.params['eradicate']:
array.eradicate_volume(module.params['name'])
try:
array.destroy_volume(module.params['name'])
if module.params['eradicate']:
try:
array.eradicate_volume(module.params['name'])
except:
changed = False
except:
changed = False
module.exit_json(changed=True)