mirror of
https://github.com/ceph/ceph
synced 2025-02-20 17:37:29 +00:00
ceph-disk: fix except to catch OSError
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
This commit is contained in:
parent
0ada43f79d
commit
9daf6cfce2
@ -786,7 +786,7 @@ def prepare_dir(
|
||||
else:
|
||||
try:
|
||||
os.unlink(os.path.join(path, 'journal_dmcrypt'))
|
||||
except:
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
write_one_line(path, 'ceph_fsid', cluster_uuid)
|
||||
@ -1273,7 +1273,7 @@ def mount_activate(
|
||||
parent_dev = os.stat('/var/lib/ceph/osd').st_dev
|
||||
if dst_dev != parent_dev:
|
||||
other = True
|
||||
except:
|
||||
except OSError:
|
||||
pass
|
||||
if active:
|
||||
log.info('%s osd.%s already mounted in position; unmounting ours.' % (cluster, osd_id))
|
||||
@ -1429,7 +1429,7 @@ def activate(
|
||||
if other != init:
|
||||
try:
|
||||
os.unlink(os.path.join(path, other))
|
||||
except:
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
if not os.path.exists(os.path.join(path, 'active')):
|
||||
|
Loading…
Reference in New Issue
Block a user