RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 15:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: handle /dev/foo/bar devices throughout

Browse Source 
Assume the last component is the unique device name, even if it appears
under a subdir of /dev.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-06-18 16:21:48 -07:00
parent e082f1247f
commit cb97338b11
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ceph-disk
View File

@ -288,7 +288,7 @@ def is_held(dev):
"""
assert os.path.exists(dev)
dev = os.path.realpath(dev)
base = dev[5:]
base = dev.split('/')[-1]
# full disk?
directory = '/sys/block/{base}/holders'.format(base=base)
@ -2003,7 +2003,7 @@ def is_suppressed(path):
try:
if not disk.startswith('/dev/') or not stat.S_ISBLK(os.lstat(path).st_mode):
return False
base = disk[5:]
base = disk.split('/')[-1]
while len(base):
if os.path.exists(SUPPRESS_PREFIX + base):
return True
@ -2017,7 +2017,7 @@ def set_suppress(path):
raise Error('does not exist', path)
if not stat.S_ISBLK(os.lstat(path).st_mode):
raise Error('not a block device', path)
base = disk[5:]
base = disk.split('/')[-1]
with file(SUPPRESS_PREFIX + base, 'w') as f:
pass
@ -2030,7 +2030,7 @@ def unset_suppress(path):
if not stat.S_ISBLK(os.lstat(path).st_mode):
raise Error('not a block device', path)
assert disk.startswith('/dev/')
base = disk[5:]
base = disk.split('/')[-1]
fn = SUPPRESS_PREFIX + base
if not os.path.exists(fn):