From 88fd1615237c53262a97ac341dbf116dc81d1129 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 22 Sep 2009 09:58:07 -0700
Subject: [PATCH] monclient: avoid dup subscribe messages

---
 src/mon/MonClient.cc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index ac84ebc930c..52568d57b3a 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)