From: Sage Weil <sage@newdream.net>
Date: Tue, 22 Sep 2009 16:58:07 +0000 (-0700)
Subject: monclient: avoid dup subscribe messages
X-Git-Tag: v0.15~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88fd1615237c53262a97ac341dbf116dc81d1129;p=ceph.git

monclient: avoid dup subscribe messages
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index ac84ebc930c7..52568d57b3a9 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -368,15 +368,16 @@ void MonClient::_renew_subs()
   }
 
   dout(10) << "renew_subs" << dendl;
-
-  if (sub_renew_sent == utime_t())
-    sub_renew_sent = g_clock.now();
-
-  MMonSubscribe *m = new MMonSubscribe;
-  m->what = sub_have;
   if (cur_mon < 0)
     _reopen_session();
-  _send_mon_message(m);
+  else {
+    if (sub_renew_sent == utime_t())
+      sub_renew_sent = g_clock.now();
+
+    MMonSubscribe *m = new MMonSubscribe;
+    m->what = sub_have;
+    _send_mon_message(m);
+  }
 }
 
 void MonClient::handle_subscribe_ack(MMonSubscribeAck *m)