diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-29 13:54:46 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-29 13:54:46 +0000 |
| commit | b6a0571500060b5bee5164e76d288b000147c08d (patch) | |
| tree | a8e5cece171f4dc30e3753935fd4928b87e38c0f /qpid/cpp/src | |
| parent | b18a94dc67b0ab7efb9f353b8c7546180b09fcfe (diff) | |
| download | qpid-python-b6a0571500060b5bee5164e76d288b000147c08d.tar.gz | |
Raise ClusterTimer lateness threshold to reduce noisy warnings.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@928779 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/Cluster.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/ClusterTimer.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp index f8a875a30c..6bb597d21f 100644 --- a/qpid/cpp/src/qpid/cluster/Cluster.cpp +++ b/qpid/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/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp index 4068a4783c..baeaafb478 100644 --- a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp +++ b/qpid/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() {} |