]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Archive dir removal has to be unconditional.
authorTommi Virtanen <tommi.virtanen@dreamhost.com>
Thu, 30 Jun 2011 18:26:20 +0000 (11:26 -0700)
committerTommi Virtanen <tommi.virtanen@dreamhost.com>
Thu, 30 Jun 2011 18:26:20 +0000 (11:26 -0700)
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

index 23c0e776758d0f26ca4d3b1e16d66acbae73c20c..305bf11163e41d579365d98f98f0b011ef1268de 100644 (file)
@@ -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):