From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Apr 2019 21:44:38 +0000 (-0500)
Subject: qa/standalone/osd/osd-markdown: fix dup command disabling
X-Git-Tag: v14.2.1~25^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f29e0f140ac720ea91f43335bd33185aee13026c;p=ceph.git

qa/standalone/osd/osd-markdown: fix dup command disabling

The ceph cli tool checks for the presence of the variable, not its value.

Fixes: http://tracker.ceph.com/issues/38359
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f7216d0b2c3a08d0f6e6106e838f84a7af29d396)
---

diff --git a/qa/standalone/osd/osd-markdown.sh b/qa/standalone/osd/osd-markdown.sh
index 4c4fd767f65a..6dc1f883b4e2 100755
--- a/qa/standalone/osd/osd-markdown.sh
+++ b/qa/standalone/osd/osd-markdown.sh
@@ -48,7 +48,7 @@ function markdown_N_impl() {
     # override any dup setting in the environment to ensure we do this
     # exactly once (modulo messenger failures, at least; we can't *actually*
     # provide exactly-once semantics for mon commands).
-    CEPH_CLI_TEST_DUP_COMMAND=0 ceph osd down 0
+    ( unset CEPH_CLI_TEST_DUP_COMMAND ; ceph osd down 0 )
     sleep $sleeptime
   done
 }