From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 6 Jan 2017 16:17:10 +0000 (-0500)
Subject: librados: blacklist_add should wait for latest OSD map
X-Git-Tag: v10.2.6~66^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0c12edc52d45a0e429e0d4cca78f8724e39e926;p=ceph.git

librados: blacklist_add should wait for latest OSD map

This ensures that future operations against the OSDs force
a OSD map update to notice the blacklisted client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9242a2e4e1a5a9fcea48d8135b1589493fc28242)
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 38dcb092dfa8..51bc0be3d1bf 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -758,6 +758,12 @@ int librados::RadosClient::blacklist_add(const string& client_address,
   cmds.push_back(cmd.str());
   bufferlist inbl;
   int r = mon_command(cmds, inbl, NULL, NULL);
+  if (r < 0) {
+    return r;
+  }
+
+  // ensure we have the latest osd map epoch before proceeding
+  r = wait_for_latest_osdmap();
   return r;
 }