qa/workunits/cephtool/test.sh: fix 'quorum enter' caller

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index beaa008cf55317a73d112617fb9d0db0d656e601..4470cacffc45a1608ecc02c18724917d1aa5643b 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -53,8 +53,6 @@ Synopsis
 
 | **ceph** **pg** [ *debug* \| *deep-scrub* \| *dump* \| *dump_json* \| *dump_pools_json* \| *dump_stuck* \| *getmap* \| *ls* \| *ls-by-osd* \| *ls-by-pool* \| *ls-by-primary* \| *map* \| *repair* \| *scrub* \| *stat* ] ...
 
-| **ceph** **quorum** [ *enter* \| *exit* ]
-
 | **ceph** **quorum_status**
 
 | **ceph** **report** { *<tags>* [ *<tags>...* ] }
@@ -1464,15 +1462,10 @@ Usage::
 quorum
 ------
 
-Cause MON to enter or exit quorum.
+Cause a specific MON to enter or exit quorum.
 
 Usage::
 
-       ceph quorum enter|exit
-
-Note: this only works on the MON to which the ``ceph`` command is connected.
-If you want a specific MON to enter or exit quorum, use this syntax::
-
        ceph tell mon.<id> quorum enter|exit
 
 quorum_status

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index da4ad429fefd5fe35fa77de6113191f29757e3e4..8cdf1ed5d327bdd89193c3ec5174070b3ebb8699 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2121,7 +2121,8 @@ function test_mon_pg()
   ceph pg stat | grep 'pgs:'
   ceph pg 1.0 query
   ceph tell 1.0 query
-  ceph quorum enter
+  first=$(ceph mon dump -f json | jq -r '.mons[0].name')
+  ceph tell mon.$first quorum enter
   ceph quorum_status
   ceph report | grep osd_stats
   ceph status