From 82c3d36b3a1fdc507841dd6ae7dfee1216e3e25d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 18 Feb 2019 15:02:25 -0600 Subject: [PATCH] qa/standalone/osd/osd-markdown: disable CLI command dups 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 (cherry picked from commit c6a7b2cbd1430849ee92c627ff870f181697282d) --- qa/standalone/osd/osd-markdown.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qa/standalone/osd/osd-markdown.sh b/qa/standalone/osd/osd-markdown.sh index ca59ef47b26cf..f2bfd83a89868 100755 --- a/qa/standalone/osd/osd-markdown.sh +++ b/qa/standalone/osd/osd-markdown.sh @@ -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 } -- 2.39.5