msgr: fix rebind() race

stop the accepter and mark all pipes down before rebind to avoid race

Fixes: #6992
Signed-off-by: Xihui He xihuihe@gmail.com
(cherry picked from commit f8e413f9c79a3a2a12801f5f64a2f612de3f06a0)

diff --git a/src/msg/Accepter.cc b/src/msg/Accepter.cc
index d6e94d1cc515c4adff90a0d608148017e691c965..5eebb2eec61f69d25ad5b3313204c00933d9aebf 100644 (file)
--- a/src/msg/Accepter.cc
+++ b/src/msg/Accepter.cc
@@ -155,8 +155,6 @@ int Accepter::rebind(const set<int>& avoid_ports)
 {
   ldout(msgr->cct,1) << "accepter.rebind avoid " << avoid_ports << dendl;
   
-  stop();
-
   // invalidate our previously learned address.
   msgr->unlearn_addr();
 

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 441ed432af00bf57c085482cde46a8290262c110..024c965ff9590316d758828e0014c13191cb6518 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -277,9 +277,9 @@ int SimpleMessenger::rebind(const set<int>& avoid_ports)
 {
   ldout(cct,1) << "rebind avoid " << avoid_ports << dendl;
   assert(did_bind);
-  int r = accepter.rebind(avoid_ports);
+  accepter.stop();
   mark_down_all();
-  return r;
+  return accepter.rebind(avoid_ports);
 }
 
 int SimpleMessenger::start()