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

Commit2aa3ca1

Browse files
committed
merge
2 parents3aab7f4 +f437110 commit2aa3ca1

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

‎contrib/mmts/multimaster.c‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -702,10 +702,12 @@ MtmCreateTransState(MtmCurrentTrans* x)
702702
if (TransactionIdIsValid(x->gtid.xid)) {
703703
Assert(x->gtid.node!=MtmNodeId);
704704
ts->gtid=x->gtid;
705+
strcpy(ts->gid,x->gid);
705706
}else {
706707
/* I am coordinator of transaction */
707708
ts->gtid.xid=x->xid;
708709
ts->gtid.node=MtmNodeId;
710+
ts->gid[0]='\0';
709711
}
710712
}
711713
returnts;
@@ -1062,6 +1064,7 @@ void MtmWakeUpBackend(MtmTransState* ts)
10621064
voidMtmAbortTransaction(MtmTransState*ts)
10631065
{
10641066
if (ts->status!=TRANSACTION_STATUS_ABORTED) {
1067+
MTM_LOG1("Rollback active transaction %d:%d",ts->gtid.node,ts->gtid.xid);
10651068
ts->status=TRANSACTION_STATUS_ABORTED;
10661069
MtmAdjustSubtransactions(ts);
10671070
Mtm->nActiveTransactions-=1;
@@ -1337,7 +1340,7 @@ MtmBuildConnectivityMatrix(nodemask_t* matrix, bool nowait)
13371340
*/
13381341
boolMtmRefreshClusterStatus(boolnowait)
13391342
{
1340-
nodemask_tmask,clique;
1343+
nodemask_tmask,clique,disabled;
13411344
nodemask_tmatrix[MAX_NODES];
13421345
MtmTransState*ts;
13431346
intclique_size;
@@ -1363,7 +1366,9 @@ bool MtmRefreshClusterStatus(bool nowait)
13631366

13641367
MTM_LOG1("Find clique %lx, disabledNodeMask %lx", (long)clique, (long)Mtm->disabledNodeMask);
13651368
MtmLock(LW_EXCLUSIVE);
1366-
mask= ~clique& (((nodemask_t)1 <<Mtm->nAllNodes)-1)& ~Mtm->disabledNodeMask;/* new disabled nodes mask */
1369+
disabled= ~clique& (((nodemask_t)1 <<Mtm->nAllNodes)-1)& ~Mtm->disabledNodeMask;/* new disabled nodes mask */
1370+
1371+
mask=disabled;
13671372
for (i=0;mask!=0;i++,mask >>=1) {
13681373
if (mask&1) {
13691374
MtmDisableNode(i+1);
@@ -1378,12 +1383,17 @@ bool MtmRefreshClusterStatus(bool nowait)
13781383
MtmCheckQuorum();
13791384
/* Interrupt voting for active transaction and abort them */
13801385
for (ts=Mtm->transListHead;ts!=NULL;ts=ts->next) {
1381-
if (!ts->votingCompleted&&MtmIsCoordinator(ts)) {
1386+
if (MtmIsCoordinator(ts)) {
1387+
if (!ts->votingCompleted&&ts->status!=TRANSACTION_STATUS_ABORTED) {
1388+
MtmAbortTransaction(ts);
1389+
MtmWakeUpBackend(ts);
1390+
}
1391+
}elseif (BIT_CHECK(disabled,ts->gtid.node-1)) {// coordinator of transaction is on disabled node
13821392
if (ts->status!=TRANSACTION_STATUS_ABORTED) {
13831393
MTM_LOG1("1) Rollback active transaction %d:%d:%d",ts->gtid.node,ts->gtid.xid,ts->xid);
13841394
MtmAbortTransaction(ts);
1385-
}
1386-
MtmWakeUpBackend(ts);
1395+
FinishPreparedTransaction(ts->gid, false);
1396+
}
13871397
}
13881398
}
13891399
MtmUnlock();
@@ -1444,12 +1454,17 @@ void MtmOnNodeDisconnect(int nodeId)
14441454
MtmCheckQuorum();
14451455
/* Interrupt voting for active transaction and abort them */
14461456
for (ts=Mtm->transListHead;ts!=NULL;ts=ts->next) {
1447-
if (!ts->votingCompleted&&MtmIsCoordinator(ts)) {
1457+
if (MtmIsCoordinator(ts)) {
1458+
if (!ts->votingCompleted&&ts->status!=TRANSACTION_STATUS_ABORTED) {
1459+
MtmAbortTransaction(ts);
1460+
MtmWakeUpBackend(ts);
1461+
}
1462+
}elseif (ts->gtid.node==nodeId) {//coordinator of transaction is on disabled node
14481463
if (ts->status!=TRANSACTION_STATUS_ABORTED) {
14491464
MTM_LOG1("2) Rollback active transaction %d:%d",ts->gtid.node,ts->gtid.xid);
14501465
MtmAbortTransaction(ts);
1451-
}
1452-
MtmWakeUpBackend(ts);
1466+
FinishPreparedTransaction(ts->gid, false);
1467+
}
14531468
}
14541469
}
14551470
}

‎contrib/mmts/multimaster.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ typedef struct MtmTransState
140140
{
141141
TransactionIdxid;
142142
XidStatusstatus;
143-
GlobalTransactionIdgtid;
143+
chargid[MULTIMASTER_MAX_GID_SIZE];/* Global transaction ID (used for 2PC) */
144+
GlobalTransactionIdgtid;/* Transaction id at coordinator */
144145
csn_tcsn;/* commit serial number */
145146
csn_tsnapshot;/* transaction snapshot, or INVALID_CSN for local transactions */
146147
intnVotes;/* number of votes received from replcas for this transaction:
@@ -153,7 +154,7 @@ typedef struct MtmTransState
153154
structMtmTransState*next;/* Next element in L1 list of all finished transaction present in xid2state hash */
154155
boolvotingCompleted;/* 2PC voting is completed */
155156
boolisLocal;/* Transaction is either replicated, either doesn't contain DML statements, so it shoudl be ignored by pglogical replication */
156-
TransactionIdxids[1];/* [Mtm->nAllNodes]: transaction ID at replicas */
157+
TransactionIdxids[1];/* [Mtm->nAllNodes]: transaction ID at replicas */
157158
}MtmTransState;
158159

159160
typedefstruct

0 commit comments

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