fix a few archive/log stragglers

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 8198f7b34015416bf20f6d38c863fcef1e7fac74..2bc4426725083db85565e2f6b484f75f41d5d774 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -302,7 +302,7 @@ def valgrind_post(ctx, config):
         yield
     finally:
         lookup_procs = list()
-        val_path = '{tdir}/archive/log/valgrind'.format(tdir=testdir)
+        val_path = '/var/log/ceph/valgrind'.format(tdir=testdir)
         log.info('Checking for errors in any valgrind logs...');
         for remote in ctx.cluster.remotes.iterkeys():
             #look at valgrind logs for each node
@@ -838,7 +838,7 @@ def cluster(ctx, config):
         def first_in_ceph_log(pattern, excludes):
             args = [
                 'egrep', pattern,
-                '%s/archive/log/cluster.%s.log' % (testdir, firstmon),
+                '/var/log/ceph/ceph.log',
                 ]
             for exclude in excludes:
                 args.extend([run.Raw('|'), 'egrep', '-v', exclude])
@@ -998,7 +998,7 @@ def run_daemon(ctx, config, type_):
                 run_cmd.extend(teuthology.get_valgrind_args(testdir, name, valgrind_args))
 
             if type_ in config.get('cpu_profile', []):
-                profile_path = '%s/archive/log/%s.%s.prof' % (testdir, type_, id_)
+                profile_path = '/var/log/ceph/profiling-logger/%s.%s.prof' % (type_, id_)
                 run_cmd.extend([ 'env', 'CPUPROFILE=%s' % profile_path ])
 
             run_cmd.extend(run_cmd_tail)

diff --git a/teuthology/task/die_on_err.py b/teuthology/task/die_on_err.py
index b7ee269213780977adb70601bf983073add53573..959f4b6b99e30f14c1880ba15a59b9832937a6fe 100644 (file)
--- a/teuthology/task/die_on_err.py
+++ b/teuthology/task/die_on_err.py
@@ -32,7 +32,6 @@ def task(ctx, config):
         time.sleep(10)
 
     testdir = teuthology.get_testdir(ctx)
-    log_path = '{tdir}/archive/log'.format(tdir=testdir)
 
     while True:
         for i in range(num_osds):
@@ -48,7 +47,7 @@ def task(ctx, config):
                 log.info("osd %d has an error" % i)
                 raise Exception("osd %d error" % i)
 
-            log_path = '%s/archive/log/osd.%d.log' % (testdir, i)
+            log_path = '/var/log/ceph/osd.%d.log' % (i)
 
             p = osd_remote.run(
                 args = [

diff --git a/teuthology/task/pexec.py b/teuthology/task/pexec.py
index 0cb520149653f3785c23ecb4a0fd12c608cf8c17..72d9e3f3944a0d70cd34274048b018060684190e 100644 (file)
--- a/teuthology/task/pexec.py
+++ b/teuthology/task/pexec.py
@@ -89,7 +89,7 @@ def task(ctx, config):
         tasks:
         - pexec:
             all:
-              - grep FAIL {testdir}/archive/log/*
+              - grep FAIL /var/log/ceph/*
 
     Or if you want to run in parallel on all clients:
 

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 95f391bf9eaa626bac908a5afa1c69715020ea9d..4021c8bd89f33383720e1b9fc90d8686e45c3fbf 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -120,12 +120,14 @@ def start_rgw(ctx, config):
                 'radosgw',
                 # authenticate as client.admin and use system keyring
                 '-k', '/etc/ceph/ceph.keyring',
-                '--log-file', '{tdir}/archive/log/rgw.log'.format(tdir=testdir),
+                '--log-file', '/var/log/ceph/rgw.log',
                 '--rgw_ops_log_socket_path', '{tdir}/rgw.opslog.sock'.format(tdir=testdir),
                 '{tdir}/apache/apache.conf'.format(tdir=testdir),
                 '--foreground',
-                run.Raw('>'),
-                '{tdir}/archive/log/rgw.stdout'.format(tdir=testdir),
+                run.Raw('|'),
+                'sudo',
+                'tee',
+                '/var/log/ceph/rgw.stdout'.format(tdir=testdir),
                 run.Raw('2>&1'),
             ]