Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbf32a65

Browse files
committed
Merge branch 'master' into more_tests
2 parentsd26d915 +9d743ba commitbf32a65

File tree

7 files changed

+192
-201
lines changed

7 files changed

+192
-201
lines changed

‎contrib/mmts/arbiter.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -898,14 +898,13 @@ static void MtmReceiver(Datum arg)
898898
msg->status=TRANSACTION_STATUS_ABORTED;
899899
}else {
900900
msg->status=tm->state->status;
901-
msg->csn=tm->state->csn;
901+
msg->csn=tm->state->csn;
902902
MTM_LOG1("Send response %d for transaction %s to node %d",msg->status,msg->gid,msg->node);
903903
}
904904
msg->disabledNodeMask=Mtm->disabledNodeMask;
905905
msg->connectivityMask=Mtm->connectivityMask;
906906
msg->oldestSnapshot=Mtm->nodes[MtmNodeId-1].oldestSnapshot;
907907
msg->code=MSG_POLL_STATUS;
908-
msg->csn=ts->csn;
909908
MtmSendMessage(msg);
910909
continue;
911910
caseMSG_POLL_STATUS:
@@ -918,11 +917,11 @@ static void MtmReceiver(Datum arg)
918917
BIT_SET(ts->votedMask,node-1);
919918
if (ts->status==TRANSACTION_STATUS_UNKNOWN) {
920919
if (msg->status==TRANSACTION_STATUS_IN_PROGRESS||msg->status==TRANSACTION_STATUS_ABORTED) {
921-
elog(LOG,"Abort transaction %s because it is in state %d at node %d",
922-
msg->gid,ts->status,node);
920+
elog(LOG,"Abortpreparedtransaction %s because it is in state %s at node %d",
921+
msg->gid,MtmNodeStatusMnem[msg->status],node);
923922
MtmFinishPreparedTransaction(ts, false);
924923
}
925-
elseif (msg->status==TRANSACTION_STATUS_COMMITTED||msg->status==TRANSACTION_STATUS_UNKNOWN)
924+
elseif (msg->status==TRANSACTION_STATUS_COMMITTED||msg->status==TRANSACTION_STATUS_UNKNOWN)
926925
{
927926
if (msg->csn>ts->csn) {
928927
ts->csn=msg->csn;
@@ -933,17 +932,17 @@ static void MtmReceiver(Datum arg)
933932
MtmFinishPreparedTransaction(ts, true);
934933
}
935934
}else {
936-
elog(LOG,"Receive response %d for transaction %s for node %d, votedMask=%llx, participantsMask=%llx",
937-
msg->status,msg->gid,node, (long long)ts->votedMask, (long long)(ts->participantsMask& ~Mtm->disabledNodeMask));
935+
elog(LOG,"Receive response %s for transaction %s for node %d, votedMask%llx, participantsMask%llx",
936+
MtmNodeStatusMnem[msg->status],msg->gid,node, (long long)ts->votedMask, (long long)(ts->participantsMask& ~Mtm->disabledNodeMask));
938937
continue;
939938
}
940939
}elseif (ts->status==TRANSACTION_STATUS_ABORTED&&msg->status==TRANSACTION_STATUS_COMMITTED) {
941940
elog(WARNING,"Transaction %s is aborted at node %d but committed at node %d",msg->gid,MtmNodeId,node);
942941
}elseif (msg->status==TRANSACTION_STATUS_ABORTED&&ts->status==TRANSACTION_STATUS_COMMITTED) {
943942
elog(WARNING,"Transaction %s is committed at node %d but aborted at node %d",msg->gid,MtmNodeId,node);
944943
}else {
945-
elog(LOG,"Receive response %d for transaction %s status %d for node %d, votedMask=%llx, participantsMask=%llx",
946-
msg->status,msg->gid,ts->status,node, (long long)ts->votedMask, (long long)(ts->participantsMask& ~Mtm->disabledNodeMask) );
944+
elog(LOG,"Receive response %s for transaction %s status %s for node %d, votedMask%llx, participantsMask%llx",
945+
MtmNodeStatusMnem[msg->status],msg->gid,MtmNodeStatusMnem[ts->status],node, (long long)ts->votedMask, (long long)(ts->participantsMask& ~Mtm->disabledNodeMask) );
947946
}
948947
}
949948
continue;
@@ -983,8 +982,8 @@ static void MtmReceiver(Datum arg)
983982
if ((~msg->disabledNodeMask&Mtm->disabledNodeMask)!=0) {
984983
/* Coordinator's disabled mask is wider than of this node: so reject such transaction to avoid
985984
commit on smaller subset of nodes */
986-
elog(WARNING,"Coordinator of distributed transaction see less nodes than node %d: %lx instead of %lx",
987-
node, (long)Mtm->disabledNodeMask, (long)msg->disabledNodeMask);
985+
elog(WARNING,"Coordinator of distributed transaction see less nodes than node %d: %llx instead of %llx",
986+
node, (long long)Mtm->disabledNodeMask, (longlong)msg->disabledNodeMask);
988987
MtmAbortTransaction(ts);
989988
}
990989
if ((ts->participantsMask& ~Mtm->disabledNodeMask& ~ts->votedMask)==0) {
@@ -993,7 +992,7 @@ static void MtmReceiver(Datum arg)
993992
MtmWakeUpBackend(ts);
994993
}else {
995994
Assert(ts->status==TRANSACTION_STATUS_IN_PROGRESS);
996-
MTM_LOG1("Transaction %s is prepared (status=%d participants=%lx disabled=%lx, voted=%lx)",
995+
MTM_LOG2("Transaction %s is prepared (status=%d participants=%lx disabled=%lx, voted=%lx)",
997996
ts->gid,ts->status,ts->participantsMask,Mtm->disabledNodeMask,ts->votedMask);
998997
ts->isPrepared= true;
999998
if (ts->isTwoPhase) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp