mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-09 16:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: fix tracevol.py to manage config map created by Rook

Browse Source 
If the config map is created by rook then there won't be any provision to
specify subvolumeGroup, tracevol.py should skip looking for subvolumeGroup
in such case.

Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
This commit is contained in:
Mudit Agarwal 2020-07-29 15:03:29 +05:30 committed by mergify[bot]
parent 3585b21e80
commit 6814f598ce
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
troubleshooting/tools/tracevol.py
View File

@ -465,16 +465,19 @@ def get_subvol_group(arg):
except ValueError as err: except ValueError as err:
print(err, stdout) print(err, stdout)
sys.exit() sys.exit()
cm_data = config_map['data']['config.json']
subvol_group = "" subvol_group = ""
if "subvolumeGroup" in cm_data: cm_data = config_map['data'].get('config.json')
try: # Absence of 'config.json' means that the configmap
cm_data_json = json.loads(cm_data) # is created by Rook and there won't be any provision to
except ValueError as err: # specify subvolumeGroup
print(err, stdout) if cm_data:
sys.exit() if "subvolumeGroup" in cm_data:
for data in cm_data_json: try:
subvol_group = data['cephFS']['subvolumeGroup'] cm_data_list = json.loads(cm_data)
except ValueError as err:
print(err, stdout)
sys.exit()
subvol_group = cm_data_list[0]['cephFS']['subvolumeGroup']
return subvol_group return subvol_group
def is_rbd_pv(arg, pvname, pvdata): def is_rbd_pv(arg, pvname, pvdata):