From 0ad55b360423ef4b16d04e4c271b18b4744853f8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 16 Feb 2013 23:53:23 -0800 Subject: [PATCH] cfuse -> ceph-fuse --- teuthology/misc.py | 4 ++-- teuthology/task/autotest.py | 4 ++-- teuthology/task/lockfile.py | 2 +- teuthology/task/locktest.py | 4 ++-- teuthology/task/workunit.py | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 35f640ee2e8bb..bbd2b5e34e2be 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -500,13 +500,13 @@ def wait_until_fuse_mounted(remote, fuse, mountpoint): fstype = proc.stdout.getvalue().rstrip('\n') if fstype == 'fuseblk': break - log.debug('cfuse not yet mounted, got fs type {fstype!r}'.format(fstype=fstype)) + log.debug('ceph-fuse not yet mounted, got fs type {fstype!r}'.format(fstype=fstype)) # it shouldn't have exited yet; exposes some trivial problems assert not fuse.exitstatus.ready() time.sleep(5) - log.info('cfuse is mounted on %s', mountpoint) + log.info('ceph-fuse is mounted on %s', mountpoint) def reconnect(ctx, timeout): """ diff --git a/teuthology/task/autotest.py b/teuthology/task/autotest.py index 0999fc4dd782e..d1b22c6a4fd9c 100644 --- a/teuthology/task/autotest.py +++ b/teuthology/task/autotest.py @@ -21,7 +21,7 @@ def task(ctx, config): tasks: - ceph: - - cfuse: [client.0, client.1] + - ceph-fuse: [client.0, client.1] - autotest: client.0: [dbench] client.1: [bonnie] @@ -30,7 +30,7 @@ def task(ctx, config): tasks: - ceph: - - cfuse: + - ceph-fuse: - autotest: all: [dbench] """ diff --git a/teuthology/task/lockfile.py b/teuthology/task/lockfile.py index b60bb28ac996c..ebb14de52c26a 100644 --- a/teuthology/task/lockfile.py +++ b/teuthology/task/lockfile.py @@ -25,7 +25,7 @@ def task(ctx, config): An example: tasks: - ceph: - - cfuse: [client.0, client.1] + - ceph-fuse: [client.0, client.1] - lockfile: [{client:client.0, file:testfile, holdtime:10}, {client:client.1, file:testfile, holdtime:0, maxwait:0, expectfail:true}, diff --git a/teuthology/task/locktest.py b/teuthology/task/locktest.py index e5f479338cea6..06c8451258042 100755 --- a/teuthology/task/locktest.py +++ b/teuthology/task/locktest.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) def task(ctx, config): """ Run locktests, from the xfstests suite, on the given - clients. Whether the clients are cfuse or kernel does not + clients. Whether the clients are ceph-fuse or kernel does not matter, and the two clients can refer to the same mount. The config is a list of two clients to run the locktest on. The @@ -17,7 +17,7 @@ def task(ctx, config): For example: tasks: - ceph: - - cfuse: [client.0, client.1] + - ceph-fuse: [client.0, client.1] - locktest: [client.0, client.1] diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py index 21aa2de9caf5d..147700e0983e1 100644 --- a/teuthology/task/workunit.py +++ b/teuthology/task/workunit.py @@ -16,7 +16,7 @@ def task(ctx, config): tasks: - ceph: - - cfuse: [client.0] + - ceph-fuse: [client.0] - workunit: clients: client.0: [direct_io, xattrs.sh] @@ -26,7 +26,7 @@ def task(ctx, config): You can also run a list of workunits on all clients: tasks: - ceph: - - cfuse: + - ceph-fuse: - workunit: tag: v0.47 clients: @@ -40,7 +40,7 @@ def task(ctx, config): tasks: - ceph: - - cfuse: + - ceph-fuse: - workunit: sha1: 9b28948635b17165d17c1cf83d4a870bd138ddf6 clients: -- 2.39.5