Commit2d68cf1

committed

Check for prepared transactions in MtmRollbackPreparedTransaction

1 parent3df08c0 commit2d68cf1Copy full SHA for 2d68cf1

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3106,9 +3106,11 @@ void MtmReleaseRecoverySlot(int nodeId)`
`3106`	`3106`	`*/`
`3107`	`3107`	`voidMtmRollbackPreparedTransaction(intnodeId,charconst*gid)`
`3108`	`3108`	`{`
	`3109`	`+charstate3pc[MAX_3PC_STATE_SIZE];`
`3109`	`3110`	`XidStatusstatus=MtmExchangeGlobalTransactionStatus(gid,TRANSACTION_STATUS_ABORTED);`
`3110`	`3111`	`MTM_LOG1("Abort prepared transaction %s status %s from node %d originId=%d",gid,MtmTxnStatusMnem[status],nodeId,Mtm->nodes[nodeId-1].originId);`
`3111`		`-if (status==TRANSACTION_STATUS_UNKNOWN) {`
	`3112`	`+if (status==TRANSACTION_STATUS_UNKNOWN\|\| (status==TRANSACTION_STATUS_IN_PROGRESS&&GetPreparedTransactionState(gid,state3pc)))`
	`3113`	`+{`
`3112`	`3114`	`MTM_LOG1("PGLOGICAL_ABORT_PREPARED commit: gid=%s #2",gid);`
`3113`	`3115`	`MtmResetTransaction();`
`3114`	`3116`	`StartTransactionCommand();`
`@@ -3118,8 +3120,6 @@ void MtmRollbackPreparedTransaction(int nodeId, char const* gid)`
`3118`	`3120`	`CommitTransactionCommand();`
`3119`	`3121`	`MtmEndSession(nodeId, true);`
`3120`	`3122`	`}elseif (status==TRANSACTION_STATUS_IN_PROGRESS) {`
`3121`		`-charstate3pc[MAX_3PC_STATE_SIZE];`
`3122`		`-Assert(!GetPreparedTransactionState(gid,state3pc));`
`3123`	`3123`	`MtmBeginSession(nodeId);`
`3124`	`3124`	`MtmLogAbortLogicalMessage(nodeId,gid);`
`3125`	`3125`	`MtmEndSession(nodeId, true);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ if [ "$1" = 'postgres' ]; then`
`68`	`68`	`multimaster.conn_strings = '$CONNSTRS'`
`69`	`69`	`multimaster.heartbeat_recv_timeout = 1100`
`70`	`70`	`multimaster.heartbeat_send_timeout = 250`
`71`		`-multimaster.min_2pc_timeout =2000`
	`71`	`+multimaster.min_2pc_timeout =100000`
`72`	`72`	`EOF`
`73`	`73`
`74`	`74`	`cat$PGDATA/postgresql.conf`

Comments

(0)