From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 21 Feb 2020 02:36:14 +0000 (-0500)
Subject: pybind/mgr/rbd_support: wait for latest OSD map prior to handling commands
X-Git-Tag: v15.1.1~299^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c08e1b1c4ab342f6d74f1c4298f08d36d2c98570;p=ceph.git

pybind/mgr/rbd_support: wait for latest OSD map prior to handling commands

The permissions test creates and deletes pools which might result in a
race with an out-of-sync OSD map.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/pybind/mgr/rbd_support/module.py b/src/pybind/mgr/rbd_support/module.py
index a59a13aac2e6..88e07db488f8 100644
--- a/src/pybind/mgr/rbd_support/module.py
+++ b/src/pybind/mgr/rbd_support/module.py
@@ -134,6 +134,9 @@ class Module(MgrModule):
         self.task = TaskHandler(self)
 
     def handle_command(self, inbuf, cmd):
+        # ensure we have latest pools available
+        self.rados.wait_for_latest_osdmap()
+
         prefix = cmd['prefix']
         try:
             try: