Fix up exception logging for py3
It used "e.message", which py3 doesn't have. Thus, this uses str(e) which works on both py2 and py3. Change-Id: I34a5de9430ce8fabdf715e83867f0d69336676f1
This commit is contained in:
parent
730b1d6b6a
commit
a2b3283c5a
@ -53,7 +53,7 @@ def list_pools():
|
||||
rados.NoData,
|
||||
rados.NoSpace,
|
||||
rados.PermissionError) as e:
|
||||
action_fail(e.message)
|
||||
action_fail(str(e))
|
||||
|
||||
|
||||
def pool_get():
|
||||
@ -64,7 +64,7 @@ def pool_get():
|
||||
.decode('UTF-8'))
|
||||
return value
|
||||
except CalledProcessError as e:
|
||||
action_fail(e.message)
|
||||
action_fail(str(e))
|
||||
|
||||
|
||||
def set_pool():
|
||||
@ -89,7 +89,7 @@ def pool_stats():
|
||||
rados.NoData,
|
||||
rados.NoSpace,
|
||||
rados.PermissionError) as e:
|
||||
action_fail(e.message)
|
||||
action_fail(str(e))
|
||||
|
||||
|
||||
def delete_pool_snapshot():
|
||||
|
@ -45,10 +45,10 @@ def make_cache_tier():
|
||||
try:
|
||||
pool.add_cache_tier(cache_pool=cache_pool, mode=cache_mode)
|
||||
except CalledProcessError as err:
|
||||
log("Add cache tier failed with message: {}".format(
|
||||
err.message))
|
||||
log("Add cache tier failed with message: {}"
|
||||
.format(str(err)))
|
||||
action_fail("create-cache-tier failed. Add cache tier failed with "
|
||||
"message: {}".format(err.message))
|
||||
"message: {}".format(str(err)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -46,7 +46,7 @@ def make_erasure_profile():
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Create erasure profile failed with "
|
||||
"message: {}".format(e.message))
|
||||
"message: {}".format(str(e)))
|
||||
elif plugin == "isa":
|
||||
k = action_get("data-chunks")
|
||||
m = action_get("coding-chunks")
|
||||
@ -60,7 +60,7 @@ def make_erasure_profile():
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Create erasure profile failed with "
|
||||
"message: {}".format(e.message))
|
||||
"message: {}".format(str(e)))
|
||||
elif plugin == "local":
|
||||
k = action_get("data-chunks")
|
||||
m = action_get("coding-chunks")
|
||||
@ -76,7 +76,7 @@ def make_erasure_profile():
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Create erasure profile failed with "
|
||||
"message: {}".format(e.message))
|
||||
"message: {}".format(str(e)))
|
||||
elif plugin == "shec":
|
||||
k = action_get("data-chunks")
|
||||
m = action_get("coding-chunks")
|
||||
@ -92,7 +92,7 @@ def make_erasure_profile():
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Create erasure profile failed with "
|
||||
"message: {}".format(e.message))
|
||||
"message: {}".format(str(e)))
|
||||
else:
|
||||
# Unknown erasure plugin
|
||||
action_fail("Unknown erasure-plugin type of {}. "
|
||||
|
@ -46,7 +46,7 @@ def create_pool():
|
||||
"is allowed".format(pool_type))
|
||||
except CalledProcessError as e:
|
||||
action_fail("Pool creation failed because of a failed process. "
|
||||
"Ret Code: {} Message: {}".format(e.returncode, e.message))
|
||||
"Ret Code: {} Message: {}".format(e.returncode, str(e)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -31,10 +31,10 @@ def delete_erasure_profile():
|
||||
try:
|
||||
remove_erasure_profile(service='admin', profile_name=name)
|
||||
except CalledProcessError as e:
|
||||
log("Remove erasure profile failed with error {}".format(e.message),
|
||||
log("Remove erasure profile failed with error {}".format(str(e)),
|
||||
level="ERROR")
|
||||
action_fail("Remove erasure profile failed with error: {}".format(
|
||||
e.message))
|
||||
action_fail("Remove erasure profile failed with error: {}"
|
||||
.format(str(e)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -32,5 +32,5 @@ if __name__ == '__main__':
|
||||
action_set({'message': out})
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Listing erasure profiles failed with error: {}".format(
|
||||
e.message))
|
||||
action_fail("Listing erasure profiles failed with error: {}"
|
||||
.format(str(e)))
|
||||
|
@ -28,4 +28,4 @@ if __name__ == '__main__':
|
||||
action_set({'message': out})
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("List pools failed with error: {}".format(e.message))
|
||||
action_fail("List pools failed with error: {}".format(str(e)))
|
||||
|
@ -30,4 +30,4 @@ if __name__ == '__main__':
|
||||
action_set({'message': out})
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Pool get failed with message: {}".format(e.message))
|
||||
action_fail("Pool get failed with message: {}".format(str(e)))
|
||||
|
@ -34,6 +34,6 @@ if __name__ == '__main__':
|
||||
try:
|
||||
handle_set_pool_value(service='admin', request=request)
|
||||
except CalledProcessError as e:
|
||||
log(e.message)
|
||||
log(str(e))
|
||||
action_fail("Setting pool key: {} and value: {} failed with "
|
||||
"message: {}".format(key, value, e.message))
|
||||
"message: {}".format(key, value, str(e)))
|
||||
|
@ -27,4 +27,4 @@ if __name__ == '__main__':
|
||||
action_set({'message': out})
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("ceph df failed with message: {}".format(e.message))
|
||||
action_fail("ceph df failed with message: {}".format(str(e)))
|
||||
|
@ -46,10 +46,9 @@ def delete_cache_tier():
|
||||
try:
|
||||
pool.remove_cache_tier(cache_pool=cache_pool)
|
||||
except CalledProcessError as err:
|
||||
log("Removing the cache tier failed with message: {}".format(
|
||||
err.message))
|
||||
log("Removing the cache tier failed with message: {}".format(str(err)))
|
||||
action_fail("remove-cache-tier failed. Removing the cache tier failed "
|
||||
"with message: {}".format(err.message))
|
||||
"with message: {}".format(str(err)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -30,5 +30,5 @@ if __name__ == '__main__':
|
||||
snapshot_name=snapname)
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Remove pool snapshot failed with message: {}".format(
|
||||
e.message))
|
||||
action_fail("Remove pool snapshot failed with message: {}"
|
||||
.format(str(e)))
|
||||
|
@ -28,4 +28,4 @@ if __name__ == '__main__':
|
||||
rename_pool(service='admin', old_name=name, new_name=new_name)
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Renaming pool failed with message: {}".format(e.message))
|
||||
action_fail("Renaming pool failed with message: {}".format(str(e)))
|
||||
|
@ -28,4 +28,4 @@ if __name__ == '__main__':
|
||||
set_pool_quota(service='admin', pool_name=name, max_bytes=max_bytes)
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Set pool quota failed with message: {}".format(e.message))
|
||||
action_fail("Set pool quota failed with message: {}".format(str(e)))
|
||||
|
@ -28,5 +28,4 @@ if __name__ == '__main__':
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail(
|
||||
"ceph osd df tree failed with message: {}".format(e.message)
|
||||
)
|
||||
"ceph osd df tree failed with message: {}".format(str(e)))
|
||||
|
@ -30,4 +30,4 @@ if __name__ == '__main__':
|
||||
snapshot_name=snapname)
|
||||
except CalledProcessError as e:
|
||||
log(e)
|
||||
action_fail("Snapshot pool failed with message: {}".format(e.message))
|
||||
action_fail("Snapshot pool failed with message: {}".format(str(e)))
|
||||
|
@ -377,12 +377,12 @@ def get_mon_map(service):
|
||||
try:
|
||||
return json.loads(mon_status)
|
||||
except ValueError as v:
|
||||
log("Unable to parse mon_status json: {}. Error: {}".format(
|
||||
mon_status, v.message))
|
||||
log("Unable to parse mon_status json: {}. Error: {}"
|
||||
.format(mon_status, str(v)))
|
||||
raise
|
||||
except CalledProcessError as e:
|
||||
log("mon_status command failed with message: {}".format(
|
||||
e.message))
|
||||
log("mon_status command failed with message: {}"
|
||||
.format(str(e)))
|
||||
raise
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user