]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/osd/osd-markdown: disable CLI command dups
authorSage Weil <sage@redhat.com>
Mon, 18 Feb 2019 21:02:25 +0000 (15:02 -0600)
committerNathan Cutler <ncutler@suse.com>
Wed, 1 May 2019 15:47:42 +0000 (17:47 +0200)
The markdown test is based on marking down a specific number of times, but
the duplicate commands from the CLI may not get absorbed/batched by the
mon, breaking the test.  Override the default qa/tasks/workunit.py
behavior of sending dups.

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

qa/standalone/osd/osd-markdown.sh

index ca59ef47b26cf0dd2a3133ec7661cd617468a1bf..f2bfd83a89868fadd2b4e83ac8253e1df20a439a 100755 (executable)
@@ -45,7 +45,10 @@ function markdown_N_impl() {
     ceph osd tree
     ceph osd tree | grep osd.0 |grep up || return 1
     # mark the OSD down.
-    ceph osd down 0
+    # 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
     sleep $sleeptime
   done
 }