]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
monclient: avoid dup subscribe messages
authorSage Weil <sage@newdream.net>
Tue, 22 Sep 2009 16:58:07 +0000 (09:58 -0700)
committerSage Weil <sage@newdream.net>
Tue, 22 Sep 2009 16:58:07 +0000 (09:58 -0700)
src/mon/MonClient.cc

index ac84ebc930c740f62322ac0821d4b2edf8247302..52568d57b3a94b0375cda04f90c73b74320048da 100644 (file)
@@ -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)