From 409014ecd7c221ad7e916cac364bfd9356871acb Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 6 Jan 2017 11:17:10 -0500 Subject: [PATCH] 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 (cherry picked from commit 9242a2e4e1a5a9fcea48d8135b1589493fc28242) --- src/librados/RadosClient.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 2300f62058bf..e0fc6f507b76 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -789,6 +789,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; } -- 2.47.3