From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 30 Dec 2014 10:03:32 +0000 (+0200)
Subject: qa: add test_tell, which currently is used only for testing 'ceph tell mon version'.
X-Git-Tag: v0.92~63^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5c24e45a92c25857af0d45da391dc0be692a1a5;p=ceph.git

qa: add test_tell, which currently is used only for testing 'ceph tell mon version'.

The test requires at least two monitors run.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 7b9f756fbdc0..048ae113b66d 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1324,6 +1324,22 @@ function test_osd_bench()
   ceph tell osd.0 bench 104857600 2097152
 }
 
+function test_mon_tell()
+{
+  ceph tell mon.a version
+  ceph tell mon.b version
+  expect_false ceph tell mon.foo version
+
+  sleep 1
+
+  ceph_watch_start debug
+  ceph tell mon.a version
+  ceph_watch_wait 'mon.0 \[DBG\] from.*cmd=\[{"prefix": "version"}\]: dispatch'
+
+  ceph_watch_start debug
+  ceph tell mon.b version
+  ceph_watch_wait 'mon.1 \[DBG\] from.*cmd=\[{"prefix": "version"}\]: dispatch'
+}
 
 #
 # New tests should be added to the TESTS array below
@@ -1358,6 +1374,7 @@ MON_TESTS+=" mon_osd_tiered_pool_set"
 MON_TESTS+=" mon_osd_erasure_code"
 MON_TESTS+=" mon_osd_misc"
 MON_TESTS+=" mon_heap_profiler"
+MON_TESTS+=" mon_tell"
 
 OSD_TESTS+=" osd_bench"
 
diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh
index 09ac99ba197d..d24f774ae63e 100755
--- a/src/test/cephtool-test-mon.sh
+++ b/src/test/cephtool-test-mon.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
+MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
     ../qa/workunits/cephtool/test.sh \
     --test-mon \
     --asok-does-not-need-root