Commite9f38f8

committed

Merge branch 'master' into more_tests

2 parentsb63f9c5 +01e7631 commite9f38f8Copy full SHA for e9f38f8

File tree

+13

-7

lines changed

+13

-7

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ typedef enum`
`101`	`101`	`#defineMTM_MAP_SIZE MTM_HASH_SIZE`
`102`	`102`	`#defineMIN_WAIT_TIMEOUT 1000`
`103`	`103`	`#defineMAX_WAIT_TIMEOUT 100000`
`104`		`-#defineMAX_WAIT_LOOPS100 // 1000000`
	`104`	`+#defineMAX_WAIT_LOOPS10000 // 1000000`
`105`	`105`	`#defineSTATUS_POLL_DELAY USECS_PER_SEC`
`106`	`106`
`107`	`107`	`void_PG_init(void);`
`@@ -2915,6 +2915,7 @@ void MtmDropNode(int nodeId, bool dropSlot)`
`2915`	`2915`
`2916`	`2916`	`MtmUnlock();`
`2917`	`2917`	`}`
	`2918`	`+`
`2918`	`2919`	`staticvoid`
`2919`	`2920`	`MtmOnProcExit(intcode,Datumarg)`
`2920`	`2921`	`{`
`@@ -3078,9 +3079,7 @@ void MtmSetupReplicationHooks(struct PGLogicalHooks* hooks)`
`3078`	`3079`
`3079`	`3080`	`voidMtmBeginSession(intnodeId)`
`3080`	`3081`	`{`
`3081`		`-charslot_name[MULTIMASTER_MAX_SLOT_NAME_SIZE];`
`3082`	`3082`	`MtmLockNode(nodeId,LW_EXCLUSIVE);`
`3083`		`-sprintf(slot_name,MULTIMASTER_SLOT_PATTERN,nodeId);`
`3084`	`3083`	`Assert(replorigin_session_origin==InvalidRepOriginId);`
`3085`	`3084`	`replorigin_session_origin=Mtm->nodes[nodeId-1].originId;`
`3086`	`3085`	`Assert(replorigin_session_origin!=InvalidRepOriginId);`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,14 @@ process_remote_commit(StringInfo in)`
`602`	`602`
`603`	`603`	`origin_node=pq_getmsgbyte(in);`
`604`	`604`	`origin_lsn=pq_getmsgint64(in);`
`605`		`-Mtm->nodes[origin_node-1].restartLsn=origin_lsn;`
	`605`	`+`
	`606`	`+if (Mtm->nodes[origin_node-1].restartLsn<origin_lsn) {`
	`607`	`+Mtm->nodes[origin_node-1].restartLsn=origin_lsn;`
	`608`	`+}`
	`609`	`+if (origin_node!=MtmReplicationNodeId) {`
	`610`	`+replorigin_advance(Mtm->nodes[origin_node-1].originId,origin_lsn,GetXLogInsertRecPtr(),`
	`611`	`+ false/* backward / , false/ WAL */ );`
	`612`	`+}`
`606`	`613`
`607`	`614`	`Assert(replorigin_session_origin==InvalidRepOriginId);`
`608`	`615`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`./dtmbench \`
`2`		`--c"dbname=postgres host=localhost port=5432 sslmode=disable" \`
`3`		`--c"dbname=postgres host=localhost port=5433 sslmode=disable" \`
`4`		`--c"dbname=postgres host=localhost port=5434 sslmode=disable" \`
	`2`	`+-c"dbname=regression host=localhost port=5432 sslmode=disable" \`
	`3`	`+-c"dbname=regression host=localhost port=5433 sslmode=disable" \`
	`4`	`+-c"dbname=regression host=localhost port=5434 sslmode=disable" \`
`5`	`5`	`-n 1000 -a 1000 -w 10 -r 1$*`

Comments

(0)