RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: fix stat errors with new suppress code

Browse Source 
Broken by 225fefe5e7.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-21 12:52:03 -07:00
parent bfb08ee4b2
commit bcc8bfdb67
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

@ -1820,9 +1820,9 @@ SUPPRESS_PREFIX='/var/lib/ceph/tmp/suppress-activate.'
def is_suppressed(path):
disk = os.path.realpath(path)
if not disk.startswith('/dev/') or not stat.S_ISBLK(os.lstat(path)):
return False
try:
if not disk.startswith('/dev/') or not stat.S_ISBLK(os.lstat(path).st_mode):
return False
base = disk[5:]
while len(base):
if os.path.exists(SUPPRESS_PREFIX + base):
@ -1835,7 +1835,7 @@ def set_suppress(path):
disk = os.path.realpath(path)
if not os.path.exists(disk):
raise Error('does not exist', path);
if not stat.S_ISBLK(os.lstat(path)):
if not stat.S_ISBLK(os.lstat(path).st_mode):
raise Error('not a block device', path)
base = disk[5:]
@ -1847,7 +1847,7 @@ def unset_suppress(path):
disk = os.path.realpath(path)
if not os.path.exists(disk):
raise Error('does not exist', path);
if not stat.S_ISBLK(os.lstat(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:]