From fab205d45ac21e496a4eabf2eb0967bbe6180c68 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 11 Oct 2019 23:06:42 -0500 Subject: [PATCH] qa/workunits/cephtool/test.sh: fix 'quorum enter' caller Signed-off-by: Sage Weil --- doc/man/8/ceph.rst | 9 +-------- qa/workunits/cephtool/test.sh | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index beaa008cf55..4470cacffc4 100644 --- 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** { ** [ *...* ] } @@ -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. quorum enter|exit quorum_status diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index da4ad429fef..8cdf1ed5d32 100755 --- 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 -- 2.39.5