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

util: restructure tracevol.py function to get_subvol_group()

Browse Source 
get_subvol_group() returns empty string if subvolumeGroup is not defined,
changed it to return "csi" as default subvolumeGroup.

Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
This commit is contained in:
Mudit Agarwal 2020-07-29 18:19:27 +05:30 committed by mergify[bot]
parent 5fa1be586a
commit 1eff20590d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
troubleshooting/tools/tracevol.py
View File

@ -413,9 +413,6 @@ def check_subvol_in_cluster(arg, subvol_name, fsname):
""" """
# check if user has specified subvolumeGroup # check if user has specified subvolumeGroup
subvol_group = get_subvol_group(arg) subvol_group = get_subvol_group(arg)
if subvol_group == "":
# default subvolumeGroup
subvol_group = "csi"
return check_subvol_path(arg, subvol_name, subvol_group, fsname) return check_subvol_path(arg, subvol_name, subvol_group, fsname)
def check_subvol_path(arg, subvol_name, subvol_group, fsname): def check_subvol_path(arg, subvol_name, subvol_group, fsname):
@ -466,7 +463,8 @@ def get_subvol_group(arg):
except ValueError as err: except ValueError as err:
print(err, stdout) print(err, stdout)
sys.exit() sys.exit()
subvol_group = "" # default subvolumeGroup
subvol_group = "csi"
cm_data = config_map['data'].get('config.json') cm_data = config_map['data'].get('config.json')
# Absence of 'config.json' means that the configmap # Absence of 'config.json' means that the configmap
# is created by Rook and there won't be any provision to # is created by Rook and there won't be any provision to