From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Mar 2013 18:43:21 +0000 (-0800)
Subject: mon/Paxos: make old clock skew message more/less suggestive
X-Git-Tag: v0.60~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a9107d1b86da08ddffab79a324cfd9fe7112bb3;p=ceph.git

mon/Paxos: make old clock skew message more/less suggestive

There is a separate clock skew check now, and more often than not this
suggests laggy messages, and not necessarily skew.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index e8c0ca9342c8..927029d19486 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -849,11 +849,10 @@ void Paxos::handle_lease(MMonPaxos *lease)
   if (lease_expire < lease->lease_timestamp) {
     lease_expire = lease->lease_timestamp;
 
-    // check for extreme clock skew.
     utime_t now = ceph_clock_now(g_ceph_context);
     if (lease_expire < now) {
       utime_t diff = now - lease_expire;
-      derr << "lease_expire from " << lease->get_source_inst() << " is " << diff << " seconds in the past; mons are laggy or clocks are too skewed" << dendl;
+      derr << "lease_expire from " << lease->get_source_inst() << " is " << diff << " seconds in the past; mons are probably laggy (or possibly clocks are too skewed)" << dendl;
     }
   }