parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Correct duplicating fuzzy limits 

These were put in a bad spot (inside the loop) and would cause
operations to take progressively longer. Only do these once.
This commit is contained in:
Joshua Boniface 2019-07-26 15:03:48 -04:00
parent 35363671a0
commit 1872489b1d
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client-common/ceph.py
View File

@ -391,16 +391,16 @@ def get_list_osd(zk_conn, limit, is_fuzzy=True):
osd_list = [] osd_list = []
full_osd_list = zkhandler.listchildren(zk_conn, '/ceph/osds') full_osd_list = zkhandler.listchildren(zk_conn, '/ceph/osds')
for osd in full_osd_list: if is_fuzzy and limit:
if limit:
try:
if is_fuzzy:
# Implicitly assume fuzzy limits # Implicitly assume fuzzy limits
if not re.match('\^.*', limit): if not re.match('\^.*', limit):
limit = '.*' + limit limit = '.*' + limit
if not re.match('.*\$', limit): if not re.match('.*\$', limit):
limit = limit + '.*' limit = limit + '.*'
for osd in full_osd_list:
if limit:
try:
if re.match(limit, osd): if re.match(limit, osd):
osd_list.append(getOSDInformation(zk_conn, osd)) osd_list.append(getOSDInformation(zk_conn, osd))
except Exception as e: except Exception as e:
@ -723,16 +723,16 @@ def get_list_pool(zk_conn, limit, is_fuzzy=True):
pool_list = [] pool_list = []
full_pool_list = zkhandler.listchildren(zk_conn, '/ceph/pools') full_pool_list = zkhandler.listchildren(zk_conn, '/ceph/pools')
for pool in full_pool_list: if is_fuzzy and limit:
if limit:
try:
if is_fuzzy:
# Implicitly assume fuzzy limits # Implicitly assume fuzzy limits
if not re.match('\^.*', limit): if not re.match('\^.*', limit):
limit = '.*' + limit limit = '.*' + limit
if not re.match('.*\$', limit): if not re.match('.*\$', limit):
limit = limit + '.*' limit = limit + '.*'
for pool in full_pool_list:
if limit:
try:
if re.match(limit, pool): if re.match(limit, pool):
pool_list.append(getPoolInformation(zk_conn, pool)) pool_list.append(getPoolInformation(zk_conn, pool))
except Exception as e: except Exception as e:
@ -1064,17 +1064,17 @@ def get_list_volume(zk_conn, pool, limit, is_fuzzy=True):
full_volume_list = getCephVolumes(zk_conn, pool) full_volume_list = getCephVolumes(zk_conn, pool)
for volume in full_volume_list: if is_fuzzy and limit:
pool_name, volume_name = volume.split('/')
if limit:
try:
if is_fuzzy:
# Implicitly assume fuzzy limits # Implicitly assume fuzzy limits
if not re.match('\^.*', limit): if not re.match('\^.*', limit):
limit = '.*' + limit limit = '.*' + limit
if not re.match('.*\$', limit): if not re.match('.*\$', limit):
limit = limit + '.*' limit = limit + '.*'
for volume in full_volume_list:
pool_name, volume_name = volume.split('/')
if limit:
try:
if re.match(limit, volume): if re.match(limit, volume):
volume_list.append(getVolumeInformation(zk_conn, pool_name, volume_name)) volume_list.append(getVolumeInformation(zk_conn, pool_name, volume_name))
except Exception as e: except Exception as e:
@ -1284,18 +1284,18 @@ def get_list_snapshot(zk_conn, pool, volume, limit, is_fuzzy=True):
full_snapshot_list = getCephSnapshots(zk_conn, pool, volume) full_snapshot_list = getCephSnapshots(zk_conn, pool, volume)
for snapshot in full_snapshot_list: if is_fuzzy and limit:
volume, snapshot_name = snapshot.split('@')
pool_name, volume_name = volume.split('/')
if limit:
try:
if is_fuzzy:
# Implicitly assume fuzzy limits # Implicitly assume fuzzy limits
if not re.match('\^.*', limit): if not re.match('\^.*', limit):
limit = '.*' + limit limit = '.*' + limit
if not re.match('.*\$', limit): if not re.match('.*\$', limit):
limit = limit + '.*' limit = limit + '.*'
for snapshot in full_snapshot_list:
volume, snapshot_name = snapshot.split('@')
pool_name, volume_name = volume.split('/')
if limit:
try:
if re.match(limit, snapshot): if re.match(limit, snapshot):
snapshot_list.append(getVolumeInformation(zk_conn, pool_name, volume_name, snapshot_name)) snapshot_list.append(getVolumeInformation(zk_conn, pool_name, volume_name, snapshot_name))
except Exception as e: except Exception as e: