From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 12 Nov 2014 17:49:54 +0000 (+0100)
Subject: qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create
X-Git-Tag: v0.90~104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2902%2Fhead;p=ceph.git

qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create

If CEPH_CLI_TEST_DUP_COMMAND is set when ceph osd create is called, it
will create two osd. They must be cleaned up afterwards instead of
assuming only one is going to be created.

http://tracker.ceph.com/issues/10083 Fixes: #10083

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 6daadfc7001..04b7138ec43 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -882,10 +882,14 @@ function test_mon_osd()
 
   ceph osd rm 0 2>&1 | grep 'EBUSY'
 
+  local old_osds=$(echo $(ceph osd ls))
   id=`ceph osd create`
   ceph osd lost $id --yes-i-really-mean-it
   expect_false ceph osd setmaxosd $id
-  ceph osd rm $id
+  local new_osds=$(echo $(ceph osd ls))
+  for id in $(echo $new_osds | sed -e "s/$old_osds//") ; do
+      ceph osd rm $id
+  done
 
   uuid=`uuidgen`
   id=`ceph osd create $uuid`