From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Thu, 30 Jun 2011 18:26:20 +0000 (-0700)
Subject: Archive dir removal has to be unconditional.
X-Git-Tag: 1.1.0~2963
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e16556e377ea747a21eac29af704c56b6be86437;p=teuthology.git

Archive dir removal has to be unconditional.

Even when ctx.archive is False, ceph logging
need the destination directory exist, so
/tmp/cephtest/archive has to be created (and
thus removed) unconditionally.
---

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index 23c0e77675..305bf11163 100644
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -124,18 +124,18 @@ def archive(ctx, config):
                         continue
                 proc.exitstatus.get()
 
-            log.info('Removing archived files...')
-            run.wait(
-                ctx.cluster.run(
-                    args=[
-                        'rm',
-                        '-rf',
-                        '--',
-                        '/tmp/cephtest/archive',
-                        ],
-                    wait=False,
-                    ),
-                )
+        log.info('Removing archive directory...')
+        run.wait(
+            ctx.cluster.run(
+                args=[
+                    'rm',
+                    '-rf',
+                    '--',
+                    '/tmp/cephtest/archive',
+                    ],
+                wait=False,
+                ),
+            )
 
 @contextlib.contextmanager
 def coredump(ctx, config):