QPID-4327: HA TX transactions, blocking wait for prepare

Backups send prepare messages to primary, primary delays completion of prepare
till all are prepared (or there is a failure).

This is NOT the production solution - blocking could cause a deadlock. We need
to introduce asynchronous completion of prepare without blocking. This
interim solution allows testing on other aspects of TX support.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1509424 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 2 deletions

diff --git a/cpp/src/qpid/ha/Primary.cpp b/cpp/src/qpid/ha/Primary.cpp
index 5fd7814d62..4208147ff4 100644
--- a/cpp/src/qpid/ha/Primary.cpp
+++ b/cpp/src/qpid/ha/Primary.cpp
@@ -390,12 +390,16 @@ void Primary::setCatchupQueues(const RemoteBackupPtr& backup, bool createGuards)
 
 void Primary::startTx(const boost::shared_ptr<broker::TxBuffer>& tx) {
     QPID_LOG(trace, logPrefix << "Started TX transaction");
-    tx->setObserver(make_shared<PrimaryTxObserver>(boost::ref(haBroker)));
+    shared_ptr<PrimaryTxObserver> observer(new PrimaryTxObserver(haBroker));
+    observer->initialize();
+    tx->setObserver(observer);
 }
 
 void Primary::startDtx(const boost::shared_ptr<broker::DtxBuffer>& dtx) {
     QPID_LOG(trace, logPrefix << "Started DTX transaction");
-    dtx->setObserver(make_shared<PrimaryTxObserver>(boost::ref(haBroker)));
+    shared_ptr<PrimaryTxObserver> observer(new PrimaryTxObserver(haBroker));
+    observer->initialize();
+    dtx->setObserver(observer);
 }
 
 }} // namespace qpid::ha