From: Samuel Just Date: Wed, 1 May 2013 20:13:52 +0000 (-0700) Subject: ceph.py: the journal component does not current work with restart X-Git-Tag: 1.1.0~2159^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0382aa60e95c0e02331246f3e3421c0c9063dfa8;p=teuthology.git ceph.py: the journal component does not current work with restart Removing for the time being. Signed-off-by: Samuel Just --- diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py index 1ad8b9067..1669bc9f9 100644 --- a/teuthology/task/ceph.py +++ b/teuthology/task/ceph.py @@ -227,7 +227,6 @@ def mount_osd_data(ctx, remote, osd): log.debug('Mounting data for osd.{o} on {r}'.format(o=osd, r=remote)) if remote in ctx.disk_config.remote_to_roles_to_dev and osd in ctx.disk_config.remote_to_roles_to_dev[remote]: dev = ctx.disk_config.remote_to_roles_to_dev[remote][osd] - journal = ctx.disk_config.remote_to_roles_to_journals[remote][osd] mount_options = ctx.disk_config.remote_to_roles_to_dev_mount_options[remote][osd] fstype = ctx.disk_config.remote_to_roles_to_dev_fstype[remote][osd] mnt = os.path.join('/var/lib/ceph/osd', 'ceph-{id}'.format(id=osd)) @@ -246,12 +245,6 @@ def mount_osd_data(ctx, remote, osd): ] ) - if journal == ('/mnt/osd.%s' % osd): - tmpfs = '/mnt/osd.%s' % osd - log.info('Creating journal file on tmpfs at {t}'.format(t=tmpfs)) - remote.run( args=[ 'sudo', 'mount', '-t', 'tmpfs', 'tmpfs', '/mnt' ] ) - remote.run( args=[ 'truncate', '-s', '1500M', tmpfs ] ) - def make_admin_daemon_dir(ctx, remote): remote.run( args=[