You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/03/05 19:02:33 UTC
svn commit: r919523 - in /qpid/trunk/qpid/cpp/src/qpid: cluster/Cluster.cpp
cluster/Cluster.h management/ManagementAgent.cpp management/ManagementAgent.h
Author: aconway
Date: Fri Mar 5 18:02:32 2010
New Revision: 919523
URL: http://svn.apache.org/viewvc?rev=919523&view=rev
Log:
Don't generate debug snapshot messages unless debug logging enabled.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=919523&r1=919522&r2=919523&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Fri Mar 5 18:02:32 2010
@@ -673,15 +673,13 @@
// Log a snapshot of broker state, used for debugging inconsistency problems.
// May only be called in deliver thread.
-void Cluster::debugSnapshot(const char* prefix, Connection* connection) {
+std::string Cluster::debugSnapshot() {
assertClusterSafe();
std::ostringstream msg;
- msg << prefix;
- if (connection) msg << " " << connection->getId();
- msg << " snapshot " << map.getFrameSeq() << ":";
+ msg << "queue snapshot at " << map.getFrameSeq() << ":";
AppendQueue append(msg);
broker.getQueues().eachQueue(append);
- QPID_LOG(trace, msg.str());
+ return msg.str();
}
// Called from Broker::~Broker when broker is shut down. At this
@@ -767,8 +765,9 @@
deliverEventQueue.start(); // Not involved in update.
}
if (updatee != self && url) {
- debugSnapshot("join");
+ QPID_LOG(debug, debugSnapshot());
if (mAgent) mAgent->clusterUpdate();
+ // Updatee will call clusterUpdate when update completes
}
}
@@ -841,7 +840,7 @@
if (mAgent) mAgent->suppress(false); // Enable management output.
discarding = false; // ok to set, we're stalled for update.
QPID_LOG(notice, *this << " update complete, starting catch-up.");
- debugSnapshot("initial");
+ QPID_LOG(debug, debugSnapshot());
if (mAgent) mAgent->clusterUpdate();
deliverEventQueue.start();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h?rev=919523&r1=919522&r2=919523&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h Fri Mar 5 18:02:32 2010
@@ -120,8 +120,8 @@
bool isElder() const;
- // For debugging only. Can only be called in deliver thread.
- void debugSnapshot(const char*, Connection* =0);
+ // Generates a log message for debugging purposes.
+ std::string debugSnapshot();
private:
typedef sys::Monitor::ScopedLock Lock;
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=919523&r1=919522&r2=919523&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Fri Mar 5 18:02:32 2010
@@ -295,7 +295,7 @@
// Set clientWasAdded so that on the next periodicProcessing we will do
// a full update on all cluster members.
clientWasAdded = true;
- debugSnapshot("update");
+ QPID_LOG(debug, "cluster update " << debugSnapshot());
}
void ManagementAgent::encodeHeader (Buffer& buf, uint8_t opcode, uint32_t seq)
@@ -525,7 +525,7 @@
sendBuffer (msgBuffer, contentSize, mExchange, routingKey);
QPID_LOG(trace, "SEND HeartbeatInd to=" << routingKey);
}
- debugSnapshot("periodic");
+ QPID_LOG(debug, "periodic update " << debugSnapshot());
}
void ManagementAgent::deleteObjectNowLH(const ObjectId& oid)
@@ -1506,14 +1506,14 @@
}
}
-void ManagementAgent::debugSnapshot(const char* type) {
+std::string ManagementAgent::debugSnapshot() {
std::ostringstream msg;
- msg << type << " snapshot, agents:";
+ msg << " management snapshot:";
for (RemoteAgentMap::const_iterator i=remoteAgents.begin();
i != remoteAgents.end(); ++i)
msg << " " << i->second->routingKey;
msg << " packages: " << packages.size();
msg << " objects: " << managementObjects.size();
msg << " new objects: " << newManagementObjects.size();
- QPID_LOG(trace, msg.str());
+ return msg.str();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=919523&r1=919522&r2=919523&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Fri Mar 5 18:02:32 2010
@@ -306,7 +306,7 @@
size_t validateTableSchema(framing::Buffer&);
size_t validateEventSchema(framing::Buffer&);
ManagementObjectMap::iterator numericFind(const ObjectId& oid);
- void debugSnapshot(const char*);
+ std::string debugSnapshot();
};
}}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org