From: Ramana Raja <rraja@redhat.com>
Date: Wed, 14 Jun 2023 20:17:09 +0000 (-0400)
Subject: mgr/rbd_support: add user-friendly stderr message
X-Git-Tag: v16.2.14~11^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c9571ddf466d3affbe8daac9491356ce7eb7a04;p=ceph.git

mgr/rbd_support: add user-friendly stderr message

... when the rbd_support module is not ready.

Fixes: https://tracker.ceph.com/issues/61688
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 6351ef5c8e691e359b1bf913dde4dbc8a441be1d)

Conflicts:
	src/pybind/mgr/rbd_support/module.py
 - Above conflict was due to commit dcb51b0
   ("mgr/rbd_support: define commands using CLICommand") not in pacific
---

diff --git a/src/pybind/mgr/rbd_support/module.py b/src/pybind/mgr/rbd_support/module.py
index f7f2101cfb3c..79944a1d82c5 100644
--- a/src/pybind/mgr/rbd_support/module.py
+++ b/src/pybind/mgr/rbd_support/module.py
@@ -212,7 +212,8 @@ class Module(MgrModule):
 
     def handle_command(self, inbuf, cmd):
         if not self.module_ready:
-            return -errno.EAGAIN, "", ""
+            return (-errno.EAGAIN, "",
+                    "rbd_support module is not ready, try again")
         # ensure we have latest pools available
         self.rados.wait_for_latest_osdmap()