RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup latest commits that use /tmp/cephtest.

Browse Source 
Signed-off-by: Sam Lang <sam.lang@inktank.com>
This commit is contained in:
Sam Lang 2013-02-02 11:00:17 -06:00
parent d9fff40f6b
commit 7280980f34
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
teuthology/task/ceph_manager.py
View File

@ -247,13 +247,14 @@ class CephManager:
return proc.stdout.getvalue()
def do_rados(self, remote, cmd):
testdir = teuthology.get_testdir(self.ctx)
pre = [
'LD_LIBRARY_PATH=/tmp/cephtest/binary/usr/local/lib',
'/tmp/cephtest/enable-coredump',
'/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
'/tmp/cephtest/archive/coverage',
'/tmp/cephtest/binary/usr/local/bin/rados',
'-c', '/tmp/cephtest/ceph.conf',
'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir),
'{tdir}/enable-coredump'.format(tdir=testdir),
'{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir),
'{tdir}/archive/coverage'.format(tdir=testdir),
'{tdir}/binary/usr/local/bin/rados'.format(tdir=testdir),
'-c', '{tdir}/ceph.conf'.format(tdir=testdir),
];
pre.extend(cmd)
proc = remote.run(
@ -263,6 +264,7 @@ class CephManager:
return proc
def osd_admin_socket(self, osdnum, command, check_status=True):
testdir = teuthology.get_testdir(self.ctx)
remote = None
for _remote, roles_for_host in self.ctx.cluster.remotes.iteritems():
for id_ in teuthology.roles_of_type(roles_for_host, 'osd'):
@ -270,15 +272,15 @@ class CephManager:
remote = _remote
assert remote is not None
args=[
'LD_LIBRARY_PRELOAD=/tmp/cephtest/binary/usr/local/lib',
'/tmp/cephtest/enable-coredump',
'/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
'/tmp/cephtest/archive/coverage',
'/tmp/cephtest/binary/usr/local/bin/ceph',
'-k', '/tmp/cephtest/ceph.keyring',
'-c', '/tmp/cephtest/ceph.conf',
'LD_LIBRARY_PRELOAD={tdir}/binary/usr/local/lib'.format(tdir=testdir),
'{tdir}/enable-coredump'.format(tdir=testdir),
'{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir),
'{tdir}/archive/coverage'.format(tdir=testdir),
'{tdir}/binary/usr/local/bin/ceph'.format(tdir=testdir),
'-k', '{tdir}/ceph.keyring'.format(tdir=testdir),
'-c', '{tdir}/ceph.conf'.format(tdir=testdir),
'--admin-daemon',
"/tmp/cephtest/asok.osd.%s"%(str(osdnum),)]
"%s/asok.osd.%s"%(testdir,str(osdnum),)]
args.extend(command)
return remote.run(
args=args,

3
teuthology/task/workunit.py
View File

@ -104,9 +104,10 @@ def task(ctx, config):
def _delete_dir(ctx, role, subdir):
PREFIX = 'client.'
testdir = teuthology.get_testdir(ctx)
id_ = role[len(PREFIX):]
(remote,) = ctx.cluster.only(role).remotes.iterkeys()
mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
mnt = os.path.join(testdir, 'mnt.{id}'.format(id=id_))
client = os.path.join(mnt, 'client.{id}'.format(id=id_))
try:
remote.run(