Skip to content

Commit b2747d6

Browse files
authored
Merge pull request ceph#64709 from dparmar18/fix-qa-fuse-mount-infinite-loop
qa/tasks/cephfs: raise exception if incorrect fstype found Reviewed-by: Igor Golikov <[email protected]> Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents 4bf6e72 + f76f6a0 commit b2747d6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

qa/tasks/cephfs/fuse_mount.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,12 @@ def check_mounted_state(self):
263263
return False
264264

265265
fstype = proc.stdout.getvalue().rstrip('\n')
266-
if fstype == 'fuseblk':
266+
if fstype in ('fuseblk', 'fuse'):
267267
log.info('ceph-fuse is mounted on %s', self.hostfs_mntpt)
268268
return True
269269
else:
270-
log.debug('ceph-fuse not mounted, got fs type {fstype!r}'.format(
271-
fstype=fstype))
272-
return False
270+
raise RuntimeError('fstype expected fuseblk or fuse but found '
271+
f'{fstype}')
273272

274273
def wait_until_mounted(self):
275274
"""

0 commit comments

Comments
 (0)