hcq/openGauss-OM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix bug for priate vgname not found"

Browse Source
This commit is contained in:
z00793368
2023-08-30 16:21:07 +08:00
parent 201787c3c6
commit b61281d802
4 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
script/gspylib/component/DSS/dss_comp.py
View File

@ -64,22 +64,48 @@ class DssInst():
else:
raise Exception(ErrorCode.GAUSS_502["GAUSS_50201"] % self.cfg_path)
return items
@staticmethod
def get_private_vgname_by_ini(dss_home, dss_id):
def get_private_vg_num(dss_home):
'''
Obtaining a Private Volume
Obtaining Private Volumes
'''
vg_cfg = os.path.join(dss_home, 'cfg', 'dss_vg_conf.ini')
if os.path.isfile(vg_cfg):
try:
with open(vg_cfg, "r") as fp:
context = fp.read().strip()
pris = re.findall('(.+):(.+)', context)
if pris and len(pris) == 2:
return pris[1][0].strip()
elif pris and len(pris) > dss_id + 1:
return pris[dss_id + 1][0].strip()
pris = re.findall(
'(.*):/dev/.*private_.*', context)
if pris:
return len(pris)
else:
raise Exception(ErrorCode.GAUSS_504["GAUSS_50416"] %
'in dss_vg_conf.ini')
except Exception as eds:
raise Exception(ErrorCode.GAUSS_504["GAUSS_50414"] % eds)
else:
raise Exception(ErrorCode.GAUSS_502["GAUSS_50201"] % vg_cfg)
@staticmethod
def get_private_vgname_by_ini(dss_home, dss_id, xlog_in_one_priv_vg):
'''
Obtaining a Private Volume
'''
if xlog_in_one_priv_vg:
dss_id = 0
vg_cfg = os.path.join(dss_home, 'cfg', 'dss_vg_conf.ini')
if os.path.isfile(vg_cfg):
try:
with open(vg_cfg, "r") as fp:
context = fp.read().strip()
pris = re.findall(
'(.*):/dev/.*private_{}'.format(str(dss_id)), context)
if pris:
return pris[0].strip()
else:
raise Exception(ErrorCode.GAUSS_504["GAUSS_50416"] %
'in dss_vg_conf.ini')