diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-12-23 16:57:56 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-12-23 16:57:56 +0000 |
| commit | daabda5eff2a7e37a5669219d949f7ad646f6442 (patch) | |
| tree | 136253be9f15c0a1a1aa78c149dd086a88ad0909 /cpp/src/qpid/linearstore/MessageStoreImpl.cpp | |
| parent | 770fe5e291b1d3892cce32dc45a0fa23ea6987df (diff) | |
| download | qpid-python-daabda5eff2a7e37a5669219d949f7ad646f6442.tar.gz | |
QPID-5444: Recovering from qpid-txtest fails with "Inconsisntent TPL 2PC count" error message
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1553148 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/linearstore/MessageStoreImpl.cpp')
| -rw-r--r-- | cpp/src/qpid/linearstore/MessageStoreImpl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp b/cpp/src/qpid/linearstore/MessageStoreImpl.cpp index dd4198c6fd..ca71d1b780 100644 --- a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp +++ b/cpp/src/qpid/linearstore/MessageStoreImpl.cpp @@ -641,7 +641,7 @@ void MessageStoreImpl::recover(qpid::broker::RecoveryManager& registry_) ++tpcCnt; } } - if (tpcCnt > 0 && tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("Inconsistent TPL 2PC count"); + if (tpcCnt > 0 && tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("MessageStoreImpl::recover(): Inconsistent TPL 2PC count"); bool commitFlag = abortCnt == 0; // If a record is found that is dequeued but not committed/aborted from tplStore, then a complete() call @@ -963,7 +963,7 @@ void MessageStoreImpl::recoverMessages(TxnCtxt& /*txn*/, ++tpcCnt; } } - if (tpcCnt > 0 && tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("Inconsistent TPL 2PC count"); + if (tpcCnt > 0 && tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("MessageStoreImpl::recoverMessages(): Inconsistent TPL 2PC count"); if (deqCnt > 0 || tpcCnt == 0) { if (jc->is_enqueued(rid, true)) { // Enqueue is non-tx, dequeue tx @@ -1120,7 +1120,7 @@ void MessageStoreImpl::collectPreparedXids(std::set<std::string>& xids) } } if (tpcCnt > 0) { - if (tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("Inconsistent TPL 2PC count"); + if (tpcCnt != tdl.size()) THROW_STORE_EXCEPTION("MessageStoreImpl::collectPreparedXids: Inconsistent TPL 2PC count"); if (enqCnt - deqCnt > 0) { xids.insert(*i); } |