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/journal/RecoveryManager.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/journal/RecoveryManager.cpp')
| -rw-r--r-- | cpp/src/qpid/linearstore/journal/RecoveryManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp index 16ca1e0994..6050d6e899 100644 --- a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp +++ b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp @@ -598,7 +598,7 @@ bool RecoveryManager::getNextRecordHeader() throw jexception(jerrno::JERR_RCVM_NULLXID, "ENQ", "RecoveryManager", "getNextRecordHeader"); } std::string xid((char*)xidp, er.xid_size()); - transactionMapRef_.insert_txn_data(xid, txn_data_t(h._rid, 0, start_fid, file_pos, true, false /*tpcFlag*/)); + transactionMapRef_.insert_txn_data(xid, txn_data_t(h._rid, 0, start_fid, file_pos, true, false, false)); if (transactionMapRef_.set_aio_compl(xid, h._rid) < txn_map::TMAP_OK) { // fail - xid or rid not found std::ostringstream oss; oss << std::hex << "_tmap.set_aio_compl: txn_enq xid=\"" << xid << "\" rid=0x" << h._rid; @@ -637,7 +637,7 @@ bool RecoveryManager::getNextRecordHeader() } std::string xid((char*)xidp, dr.xid_size()); transactionMapRef_.insert_txn_data(xid, txn_data_t(dr.rid(), dr.deq_rid(), start_fid, file_pos, - false, dr.is_txn_coml_commit())); + false, false, dr.is_txn_coml_commit())); if (transactionMapRef_.set_aio_compl(xid, dr.rid()) < txn_map::TMAP_OK) { // fail - xid or rid not found std::ostringstream oss; oss << std::hex << "_tmap.set_aio_compl: txn_deq xid=\"" << xid << "\" rid=0x" << dr.rid(); |