Commit3df08c0

committed

Fix XactLogAbortRecord

1 parent40e46be commit3df08c0Copy full SHA for 3df08c0

File tree

+16

-7

lines changed

+16

-7

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3320,6 +3320,8 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`3320`	`3320`	`MTM_LOG1("Recovered position of node %d is %lx",MtmReplicationNodeId,recoveredLSN);`
`3321`	`3321`	`if (Mtm->nodes[MtmReplicationNodeId-1].restartLSN<recoveredLSN) {`
`3322`	`3322`	`MTM_LOG2("[restartlsn] node %d: %lx -> %lx (MtmReplicationStartupHook)",MtmReplicationNodeId,Mtm->nodes[MtmReplicationNodeId-1].restartLSN,recoveredLSN);`
	`3323`	`+Assert(Mtm->nodes[MtmReplicationNodeId-1].restartLSN==InvalidXLogRecPtr`
	`3324`	`+\|\|recoveredLSN<Mtm->nodes[MtmReplicationNodeId-1].restartLSN+MtmMaxRecoveryLag);`
`3323`	`3325`	`Mtm->nodes[MtmReplicationNodeId-1].restartLSN=recoveredLSN;`
`3324`	`3326`	`}`
`3325`	`3327`	`}else {`
`@@ -3533,7 +3535,8 @@ bool MtmFilterTransaction(char* record, int size)`
`3533`	`3535`	`}`
`3534`	`3536`	`restart_lsn=origin_node==MtmReplicationNodeId ?end_lsn :origin_lsn;`
`3535`	`3537`	`if (Mtm->nodes[origin_node-1].restartLSN<restart_lsn) {`
`3536`		`-Assert(restart_lsn!=InvalidXLogRecPtr);`
	`3538`	`+Assert(Mtm->nodes[origin_node-1].restartLSN==InvalidXLogRecPtr`
	`3539`	`+\|\|restart_lsn<Mtm->nodes[origin_node-1].restartLSN+MtmMaxRecoveryLag);`
`3537`	`3540`	`MTM_LOG2("[restartlsn] node %d: %lx -> %lx (MtmFilterTransaction)",MtmReplicationNodeId,Mtm->nodes[MtmReplicationNodeId-1].restartLSN,restart_lsn);`
`3538`	`3541`	`Mtm->nodes[origin_node-1].restartLSN=restart_lsn;`
`3539`	`3542`	`}else {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def setUpClass(self):`
`15`	`15`	`@classmethod`
`16`	`16`	`deftearDownClass(self):`
`17`	`17`	`print('tearDown')`
`18`		`-#subprocess.check_call(['docker-compose','down'])`
	`18`	`+subprocess.check_call(['docker-compose','down'])`
`19`	`19`
`20`	`20`	`deftest_regression(self):`
`21`	`21`	`# XXX: make smth clever here`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`staticvoid`
`255`		`-xact_desc_abort(StringInfobuf,uint8info,xl_xact_abort*xlrec)`
	`255`	`+xact_desc_abort(StringInfobuf,uint8info,xl_xact_abort*xlrec,RepOriginIdorigin_id)`
`256`	`256`	`{`
`257`	`257`	`xl_xact_parsed_abortparsed;`
`258`	`258`	`inti;`
`@@ -282,6 +282,14 @@ xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort *xlrec)`
`282`	`282`	`for (i=0;i<parsed.nsubxacts;i++)`
`283`	`283`	`appendStringInfo(buf," %u",parsed.subxacts[i]);`
`284`	`284`	`}`
	`285`	`+if (parsed.xinfo&XACT_XINFO_HAS_ORIGIN)`
	`286`	`+{`
	`287`	`+appendStringInfo(buf,"; origin: node %u, lsn %X/%X, at %s",`
	`288`	`+origin_id,`
	`289`	`+ (uint32) (parsed.origin_lsn >>32),`
	`290`	`+ (uint32)parsed.origin_lsn,`
	`291`	`+timestamptz_to_str(parsed.origin_timestamp));`
	`292`	`+}`
`285`	`293`	`}`
`286`	`294`
`287`	`295`	`staticvoid`
`@@ -312,7 +320,8 @@ xact_desc(StringInfo buf, XLogReaderState *record)`
`312`	`320`	`{`
`313`	`321`	`xl_xact_abortxlrec= (xl_xact_abort)rec;`
`314`	`322`
`315`		`-xact_desc_abort(buf,XLogRecGetInfo(record),xlrec);`
	`323`	`+xact_desc_abort(buf,XLogRecGetInfo(record),xlrec,`
	`324`	`+XLogRecGetOrigin(record));`
`316`	`325`	`}`
`317`	`326`	`elseif (info==XLOG_XACT_ASSIGNMENT)`
`318`	`327`	`{`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5358,9 +5358,6 @@ XactLogAbortRecord(TimestampTz abort_time,`
`5358`	`5358`	`XLogRegisterData((char*)twophase_gid,xl_twophase.gidlen);`
`5359`	`5359`	`}`
`5360`	`5360`
`5361`		`-if (xl_xinfo.xinfo&XACT_XINFO_HAS_DBINFO)`
`5362`		`-XLogRegisterData((char*) (&xl_dbinfo),sizeof(xl_dbinfo));`
`5363`		`-`
`5364`	`5361`	`if (xl_xinfo.xinfo&XACT_XINFO_HAS_ORIGIN)`
`5365`	`5362`	`XLogRegisterData((char*) (&xl_origin),sizeof(xl_xact_origin));`
`5366`	`5363`

Comments

(0)