mon: subscribe duration in units of seconds, not ms

diff --git a/src/include/types.h b/src/include/types.h
index 84a63b6aa012edc317619591d642cf9722b55e36..e3655aed5aa33c851e36e108f6e59a596551c175 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -387,7 +387,7 @@ inline ostream& operator<<(ostream& out, const kb_t& kb)
 
 inline ostream& operator<<(ostream& out, const ceph_mon_subscribe_item& i)
 {
-  return out << i.have << (i.onetime ? "(onetime)" : "");
+  return out << i.have << (i.onetime ? "" : "+");
 }
 
 #endif

diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index 3ad4254860e75602a6cb88f2966bd9135d1a6128..ab8889bc3b98f3951d813c086b3146aed8562e94 100644 (file)
--- a/src/messages/MMonSubscribeAck.h
+++ b/src/messages/MMonSubscribeAck.h
@@ -18,22 +18,22 @@
 #include "msg/Message.h"
 
 struct MMonSubscribeAck : public Message {
-  __u32 interval_ms;
+  __u32 interval;
   
   MMonSubscribeAck(int i = 0) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
-                               interval_ms(i) {}
+                               interval(i) {}
   
   const char *get_type_name() { return "mon_subscribe_ack"; }
   void print(ostream& o) {
-    o << "mon_subscribe_ack(" << interval_ms << "ms)";
+    o << "mon_subscribe_ack(" << interval << "s)";
   }
 
   void decode_payload() {
     bufferlist::iterator p = payload.begin();
-    ::decode(interval_ms, p);
+    ::decode(interval, p);
   }
   void encode_payload() {
-    ::encode(interval_ms, payload);
+    ::encode(interval, payload);
   }
 };
 

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index a0abf13f71375d9ac0bb9a39ee7058896dedc300..8c69ee8ffb68dafa45996be148ab73a2f6bf347e 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -311,7 +311,7 @@ void MonClient::handle_subscribe_ack(MMonSubscribeAck *m)
 {
   if (sub_renew_sent != utime_t()) {
     sub_renew_after = sub_renew_sent;
-    sub_renew_after += m->interval_ms / 1000.0 / 2.0;
+    sub_renew_after += m->interval / 2.0;
     dout(10) << "handle_subscribe_ack sent " << sub_renew_sent << " renew after " << sub_renew_after << dendl;
     sub_renew_sent = utime_t();
   } else {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 76fde7263bb850e22d27b25718331d22190f657a..f8360d2795117a4e1c36daa9a496fb969d8f290d 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -514,7 +514,7 @@ void Monitor::handle_subscribe(MMonSubscribe *m)
   }
 
   if (reply)
-    messenger->send_message(new MMonSubscribeAck(g_conf.mon_subscribe_interval * 1000),
+    messenger->send_message(new MMonSubscribeAck(g_conf.mon_subscribe_interval),
                            m->get_source_inst());
 
   delete m;