id_ = name[len(prefix):]
yield id_
+def all_roles_of_type(cluster, type_):
+ prefix = '{type}.'.format(type=type_)
+ for _, roles_for_host in cluster.remotes.iteritems():
+ for name in roles_for_host:
+ if not name.startswith(prefix):
+ continue
+ id_ = name[len(prefix):]
+ yield id_
+
def is_type(type_):
"""
Returns a matcher function for whether role is of type given.
log = logging.getLogger(__name__)
+def get_clients(ctx, roles):
+ for role in roles:
+ assert isinstance(role, basestring)
+ PREFIX = 'client.'
+ assert role.startswith(PREFIX)
+ id_ = role[len(PREFIX):]
+ (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ yield (id_, remote)
+
+
@contextlib.contextmanager
def task(ctx, config):
"""
Mount/unmount a ``cfuse`` client.
- The config is expected to be a list of clients to do this
- operation on. This lets you e.g. set up one client with ``cfuse``
- and another with ``kclient``.
+ The config is optional and defaults to mounting on all clients. If
+ a config is given, it is expected to be a list of clients to do
+ this operation on. This lets you e.g. set up one client with
+ ``cfuse`` and another with ``kclient``.
+
+ Example that mounts all clients::
+
+ tasks:
+ - ceph:
+ - cfuse:
+ - interactive:
+
+ Example that uses both ``kclient` and ``cfuse``::
tasks:
- ceph:
- cfuse: [client.0]
+ - kclient: [client.1]
- interactive:
"""
log.info('Mounting cfuse clients...')
- assert isinstance(config, list), \
- "task fuse automatic configuration not supported yet, list all clients"
+ assert config is None or isinstance(config, list), \
+ "task cfuse got invalid config"
cfuse_daemons = {}
- for role in config:
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ if config is None:
+ config = ['client.{id}'.format(id=id_)
+ for id_ in teuthology.all_roles_of_type(ctx.cluster, 'client')]
+ clients = list(get_clients(ctx=ctx, roles=config))
+
+ for id_, remote in clients:
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
remote.run(
args=[
)
cfuse_daemons[id_] = proc
- for role in config:
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ for id_, remote in clients:
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
teuthology.wait_until_fuse_mounted(
remote=remote,
yield
finally:
log.info('Unmounting cfuse clients...')
- for role in config:
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ for id_, remote in clients:
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
remote.run(
args=[
)
run.wait(cfuse_daemons.itervalues())
- for role in config:
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ for id_, remote in clients:
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
remote.run(
args=[
log = logging.getLogger(__name__)
+def get_clients(ctx, roles):
+ for role in roles:
+ assert isinstance(role, basestring)
+ PREFIX = 'client.'
+ assert role.startswith(PREFIX)
+ id_ = role[len(PREFIX):]
+ (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ yield (id_, remote)
+
+
@contextlib.contextmanager
def task(ctx, config):
"""
Mount/unmount a ``kernel`` client.
- The config is expected to be a list of clients to do this
- operation on. This lets you e.g. set up one client with ``cfuse``
- and another with ``kclient``.
+ The config is optional and defaults to mounting on all clients. If
+ a config is given, it is expected to be a list of clients to do
+ this operation on. This lets you e.g. set up one client with
+ ``cfuse`` and another with ``kclient``.
tasks:
- ceph:
- interactive:
"""
log.info('Mounting kernel clients...')
- assert isinstance(config, list), \
- "task kclient automatic configuration not supported yet, list all clients"
+ assert config is None or isinstance(config, list), \
+ "task kclient got invalid config"
- for role in config:
- log.debug('Mounting client {role}...'.format(role=role))
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ if config is None:
+ config = ['client.{id}'.format(id=id_)
+ for id_ in teuthology.all_roles_of_type(ctx.cluster, 'client')]
+ clients = list(get_clients(ctx=ctx, roles=config))
+
+ for id_, remote in clients:
+ log.debug('Mounting client client.{id}...'.format(id=id_))
remotes_and_roles = ctx.cluster.remotes.items()
roles = [roles for (remote, roles) in remotes_and_roles]
ips = [host for (host, port) in (remote.ssh.get_transport().getpeername() for (remote, roles) in remotes_and_roles)]
mons = teuthology.get_mons(roles, ips).values()
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
- secret = '/tmp/cephtest/data/{role}.secret'.format(role=role)
- teuthology.write_secret_file(remote, role, secret)
+ secret = '/tmp/cephtest/data/client.{id}.secret'.format(id=id_)
+ teuthology.write_secret_file(remote, 'client.{id}'.format(id=id_), secret)
remote.run(
args=[
yield
finally:
log.info('Unmounting kernel clients...')
- for role in config:
- log.debug('Unmounting client {role}...'.format(role=role))
- assert isinstance(role, basestring)
- PREFIX = 'client.'
- assert role.startswith(PREFIX)
- id_ = role[len(PREFIX):]
- (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+ for id_, remote in clients:
+ log.debug('Unmounting client client.{id}...'.format(id=id_))
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
remote.run(
args=[
projects / ceph.git / commitdiff