From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Sep 2019 15:56:54 +0000 (-0500)
Subject: do not use 'ceph tell mgr'
X-Git-Tag: v15.1.0~1323^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81280455112b1c8f4495ef63b9a5e236e5c65465;p=ceph.git

do not use 'ceph tell mgr'

This is now for a daemon/asok command, not a module command.

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

diff --git a/doc/mgr/administrator.rst b/doc/mgr/administrator.rst
index ccffe8072d08..0aebfbd644ab 100644
--- a/doc/mgr/administrator.rst
+++ b/doc/mgr/administrator.rst
@@ -125,19 +125,12 @@ Calling module commands
 -----------------------
 
 Where a module implements command line hooks, the commands will
-be accessible as ordinary Ceph commands::
+be accessible as ordinary Ceph commands.  Ceph will automatically incorporate
+module commands into the standard CLI interface and route them appropriately to
+the module.::
 
     ceph <command | help>
 
-If you would like to see the list of commands handled by the
-manager (where normal ``ceph help`` would show all mon and mgr commands),
-you can send a command directly to the manager daemon::
-
-    ceph tell mgr help
-
-Note that it is not necessary to address a particular mgr instance,
-simply ``mgr`` will pick the current active daemon.
-
 Configuration
 -------------
 
diff --git a/doc/mgr/influx.rst b/doc/mgr/influx.rst
index eab9494a96f0..9a770530ac94 100644
--- a/doc/mgr/influx.rst
+++ b/doc/mgr/influx.rst
@@ -70,7 +70,7 @@ To make use of the debugging option in the module:
     [mgr]
         debug_mgr = 20  
 
-- Use this command ``ceph tell mgr.<mymonitor> influx self-test``.
+- Use this command ``ceph influx self-test``.
 - Check the log files. Users may find it easier to filter the log files using *mgr[influx]*.
 
 --------------------
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 01ddacc28c28..7936b0b82388 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2737,9 +2737,7 @@ function test_mds_tell_help_command()
 
 function test_mgr_tell()
 {
-  ceph tell mgr help
-  #ceph tell mgr fs status   # see http://tracker.ceph.com/issues/20761
-  ceph tell mgr osd status
+  ceph tell mgr version
 }
 
 function test_per_pool_scrub_status()
diff --git a/src/test/mgr/mgr-dashboard-smoke.sh b/src/test/mgr/mgr-dashboard-smoke.sh
index 582909a6ed54..3a4bbff3fe89 100755
--- a/src/test/mgr/mgr-dashboard-smoke.sh
+++ b/src/test/mgr/mgr-dashboard-smoke.sh
@@ -51,7 +51,7 @@ function TEST_dashboard() {
         tries=$((tries+1))
         sleep 1
     done
-    ceph_adm tell mgr dashboard set-login-credentials admin admin
+    ceph_adm dashboard set-login-credentials admin admin
 
     tries=0
     while [[ $tries < 30 ]] ; do
diff --git a/src/vstart.sh b/src/vstart.sh
index 5eb4e723feb1..3b86f243ef49 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -932,20 +932,26 @@ EOF
         run 'mgr' $name $CEPH_BIN/ceph-mgr -i $name $ARGS
     done
 
-    # use tell mgr here because the first mgr might not have activated yet
-    # to register the python module commands.
     if [ "$new" -eq 1 ]; then
         # setting login credentials for dashboard
         if $with_mgr_dashboard; then
-            ceph_adm tell mgr dashboard ac-user-create admin admin administrator
+            while ! ceph_adm -h | grep -c -q ^dashboard ; do
+                echo 'waiting for mgr dashboard module to start'
+                sleep 1
+            done
+            ceph_adm dashboard ac-user-create admin admin administrator
             if [ "$ssl" != "0" ]; then
-                if ! ceph_adm tell mgr dashboard create-self-signed-cert;  then
+                if ! ceph_adm dashboard create-self-signed-cert;  then
                     echo dashboard module not working correctly!
                 fi
             fi
         fi
 
-        if ceph_adm tell mgr restful create-self-signed-cert; then
+        while ! ceph_adm -h | grep -c -q ^restful ; do
+            echo 'waiting for mgr restful module to start'
+            sleep 1
+        done
+        if ceph_adm restful create-self-signed-cert; then
             SF=`mktemp`
             ceph_adm restful create-key admin -o $SF
             RESTFUL_SECRET=`cat $SF`