@@ -320,6 +320,11 @@ static void MtmSetSocketOptions(int sd)
320320
321321static void MtmCheckResponse (MtmArbiterMessage * resp )
322322{
323+ if (resp -> lockReq ) {
324+ BIT_SET (Mtm -> globalLockerMask ,resp -> node - 1 );
325+ }else {
326+ BIT_CLEAR (Mtm -> globalLockerMask ,resp -> node - 1 );
327+ }
323328if (BIT_CHECK (resp -> disabledNodeMask ,MtmNodeId - 1 )
324329&& !BIT_CHECK (Mtm -> disabledNodeMask ,resp -> node - 1 )
325330&& Mtm -> status != MTM_RECOVERY
@@ -358,6 +363,7 @@ static void MtmSendHeartbeat()
358363msg .disabledNodeMask = Mtm -> disabledNodeMask ;
359364msg .connectivityMask = SELF_CONNECTIVITY_MASK ;
360365msg .oldestSnapshot = Mtm -> nodes [MtmNodeId - 1 ].oldestSnapshot ;
366+ msg .lockReq = Mtm -> nodeLockerMask != 0 ;
361367msg .node = MtmNodeId ;
362368msg .csn = now ;
363369if (last_sent_heartbeat != 0 && last_sent_heartbeat + MSEC_TO_USEC (MtmHeartbeatSendTimeout )* 2 < now ) {
@@ -1073,6 +1079,7 @@ static void MtmReceiver(Datum arg)
10731079StartTransactionCommand ();
10741080SetPreparedTransactionState (ts -> gid ,MULTIMASTER_PRECOMMITTED );
10751081CommitTransactionCommand ();
1082+ Assert (!MtmTransIsActive ());
10761083MtmLock (LW_EXCLUSIVE );
10771084}else {
10781085ts -> status = TRANSACTION_STATUS_UNKNOWN ;
@@ -1088,7 +1095,7 @@ static void MtmReceiver(Datum arg)
10881095continue ;
10891096}
10901097if (ts -> status != TRANSACTION_STATUS_ABORTED ) {
1091- MTM_LOG1 ("Arbiter receive abort message for transaction %s (%llu)" ,ts -> gid , (long64 )ts -> xid );
1098+ MTM_LOG1 ("Arbiter receive abort message for transaction %s (%llu) from node %d " ,ts -> gid , (long64 )ts -> xid , node );
10921099Assert (ts -> status == TRANSACTION_STATUS_IN_PROGRESS );
10931100MtmAbortTransaction (ts );
10941101}