Raise ClusterTimer lateness threshold to reduce noisy warnings.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@928779 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 1 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index f8a875a30c..6bb597d21f 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -668,7 +668,7 @@ void Cluster::configChange(const MemberId&, const std::string& configStr, Lock&
     QPID_LOG(debug, "Config sequence " << map.getConfigSeq());
     store.setConfigSeq(map.getConfigSeq());
 
-    // Update initital status for new members joining.
+    // Update initital status for members joining or leaving.
     initMap.configChange(config);
     if (initMap.isResendNeeded()) {
         mcast.mcastControl(
@@ -757,6 +757,8 @@ void Cluster::initialStatus(const MemberId& member, uint32_t version, bool activ
         leave(l);
         return;
     }
+    QPID_LOG_IF(debug, state == PRE_INIT, *this
+                << " received initial status from " << member);
     initMap.received(
         member,
         ClusterInitialStatusBody(ProtocolVersion(), version, active, id,
diff --git a/cpp/src/qpid/cluster/ClusterTimer.cpp b/cpp/src/qpid/cluster/ClusterTimer.cpp
index 4068a4783c..baeaafb478 100644
--- a/cpp/src/qpid/cluster/ClusterTimer.cpp
+++ b/cpp/src/qpid/cluster/ClusterTimer.cpp
@@ -38,6 +38,7 @@ ClusterTimer::ClusterTimer(Cluster& c) : cluster(c) {
     // Allow more generous overrun threshold with cluster as we
     // have to do a CPG round trip before executing the task.
     overran = 10*sys::TIME_MSEC;
+    late = 100*sys::TIME_MSEC;
 }
 
 ClusterTimer::~ClusterTimer() {}