From 952940272b9107e9e4f6e8be23a6f72e8ec13d43 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 3 Apr 2012 15:56:36 -0700 Subject: [PATCH] nuke: don't run umount when no xargs args Gets rid of this noise: INFO:teuthology.nuke:Unmount any osd data directories... INFO:teuthology.orchestra.run.err:Usage: umount -h | -V INFO:teuthology.orchestra.run.err: umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts] INFO:teuthology.orchestra.run.err: umount [-d] [-f] [-r] [-n] [-v] special | node... INFO:teuthology.orchestra.run.err:Usage: umount -h | -V INFO:teuthology.orchestra.run.err: umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts] INFO:teuthology.orchestra.run.err: umount [-d] [-f] [-r] [-n] [-v] special | node... ... --- teuthology/nuke.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index bac300c4a3783..43b40e46a62f8 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -120,7 +120,8 @@ def remove_kernel_mounts(ctx, kernel_mounts, log): 'grep', 'ceph', '/etc/mtab', run.Raw('|'), 'grep', '-o', "on /.* type", run.Raw('|'), 'grep', '-o', "/.* ", run.Raw('|'), - 'xargs', 'sudo', 'umount', '-f', run.Raw(';'), + 'xargs', '-r', + 'sudo', 'umount', '-f', run.Raw(';'), 'fi' ], wait=False @@ -139,7 +140,8 @@ def remove_osd_mounts(ctx, log): args=[ 'grep', '/tmp/cephtest/data/', '/etc/mtab', run.Raw('|'), 'awk', '{print $2}', run.Raw('|'), - 'xargs', 'sudo', 'umount', run.Raw(';'), + 'xargs', '-r', + 'sudo', 'umount', run.Raw(';'), 'true' ], ) -- 2.39.5