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 2014/08/21 22:55:51 UTC
svn commit: r1619581 - in /qpid/trunk/qpid/cpp/src/qpid/ha: Primary.cpp
PrimaryTxObserver.cpp RemoteBackup.cpp types.cpp
Author: aconway
Date: Thu Aug 21 20:55:51 2014
New Revision: 1619581
URL: http://svn.apache.org/r1619581
Log:
QPID-6020: HA logging improvements - log prefix with status and ID.
Fix log prefix for RemoteBackup and PrimaryTxObserver objects.
Use short UUIDs for showing UUID sets in logs.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp?rev=1619581&r1=1619580&r2=1619581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp Thu Aug 21 20:55:51 2014
@@ -158,7 +158,7 @@ Primary::Primary(HaBroker& hb, const Bro
// the QueueGuards are created.
QPID_LOG(notice, logPrefix << "Recovering backups: " << expect);
for (BrokerInfo::Set::const_iterator i = expect.begin(); i != expect.end(); ++i) {
- boost::shared_ptr<RemoteBackup> backup(new RemoteBackup(*i, 0, logPrefix));
+ boost::shared_ptr<RemoteBackup> backup(new RemoteBackup(*i, 0, haBroker.logPrefix));
backups[i->getSystemId()] = backup;
if (!backup->isReady()) expectedBackups.insert(backup);
setCatchupQueues(backup, true); // Create guards
@@ -361,7 +361,7 @@ void Primary::exchangeDestroy(const Exch
shared_ptr<RemoteBackup> Primary::backupConnect(
const BrokerInfo& info, broker::Connection& connection, Mutex::ScopedLock&)
{
- shared_ptr<RemoteBackup> backup(new RemoteBackup(info, &connection, logPrefix));
+ shared_ptr<RemoteBackup> backup(new RemoteBackup(info, &connection, haBroker.logPrefix));
queueLimits.addBackup(backup);
backups[info.getSystemId()] = backup;
return backup;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp?rev=1619581&r1=1619580&r2=1619581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp Thu Aug 21 20:55:51 2014
@@ -136,7 +136,6 @@ void PrimaryTxObserver::initialize() {
txQueue = result.first;
txQueue->markInUse(); // Prevent auto-delete till we are done.
txQueue->deliver(TxBackupsEvent(backups).message());
-
}
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp?rev=1619581&r1=1619580&r2=1619581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp Thu Aug 21 20:55:51 2014
@@ -70,7 +70,7 @@ void RemoteBackup::catchupQueue(const Qu
QPID_LOG(debug, logPrefix << "Catch-up queue"
<< (createGuard ? " and guard" : "") << ": " << q->getName());
catchupQueues.insert(q);
- if (createGuard) guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix));
+ if (createGuard) guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix.prePrefix));
}
}
@@ -91,7 +91,7 @@ void RemoteBackup::ready(const QueuePtr&
// Called via BrokerObserver::queueCreate and from catchupQueue
void RemoteBackup::queueCreate(const QueuePtr& q) {
if (replicationTest.getLevel(*q) == ALL)
- guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix));
+ guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix.prePrefix));
}
// Called via BrokerObserver
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp?rev=1619581&r1=1619580&r2=1619581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/types.cpp Thu Aug 21 20:55:51 2014
@@ -90,7 +90,8 @@ istream& operator>>(istream& i, EnumBase
ostream& operator<<(ostream& o, const UuidSet& ids) {
ostream_iterator<qpid::types::Uuid> out(o, " ");
o << "{ ";
- copy(ids.begin(), ids.end(), out);
+ for (UuidSet::const_iterator i = ids.begin(); i != ids.end(); ++i)
+ o << shortStr(*i) << " ";
o << "}";
return o;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org