From e16556e377ea747a21eac29af704c56b6be86437 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Thu, 30 Jun 2011 11:26:20 -0700
Subject: [PATCH] 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.
---
 teuthology/task/internal.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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):
-- 
2.39.5