Commit917d875

authored and

committed

Check update status in xcheck

1 parent7a50383 commit917d875Copy full SHA for 917d875

File tree

-3

lines changed

-3

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -517,8 +517,6 @@ MtmAdjustOldestXid(TransactionId xid)`
`517`	`517`	`MTM_LOG2("%d: MtmAdjustOldestXid(%d): snapshot=%ld, csn=%ld, status=%d",MyProcPid,xid,ts!=NULL ?ts->snapshot :0,ts!=NULL ?ts->csn :0,ts!=NULL ?ts->status :-1);`
`518`	`518`	`Mtm->gcCount=0;`
`519`	`519`
`520`		`-//return FirstNormalTransactionId;`
`521`		`-`
`522`	`520`	`if (ts!=NULL) {`
`523`	`521`	`oldestSnapshot=ts->snapshot;`
`524`	`522`	`Assert(oldestSnapshot!=INVALID_CSN);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@`
`71`	`71`	`diag("starting node 2");`
`72`	`72`	`$cluster->{nodes}->[2]->start;`
`73`	`73`
	`74`	`+sleep(5);# Wait until node is started`
	`75`	`+`
`74`	`76`	`diag("inserting 6 on node 1 (can fail)");`
`75`	`77`	`$cluster->psql(0,'postgres',"insert into t values(6, 60);");`
`76`	`78`	`diag("inserting 7 on node 2 (can fail)");`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,12 @@ def transfer_tx(self, conn, cur, agg):`
`150`	`150`	`set amount = amount - %s`
`151`	`151`	`where uid = %s''',`
`152`	`152`	`(amount,from_uid))`
	`153`	`+assert(cur.rowcount==1)`
`153`	`154`	`yieldfromcur.execute('''update bank_test`
`154`	`155`	`set amount = amount + %s`
`155`	`156`	`where uid = %s''',`
`156`	`157`	`(amount,to_uid))`
	`158`	`+assert(cur.rowcount==1)`
`157`	`159`	`yieldfromcur.execute('commit')`
`158`	`160`
`159`	`161`	`@asyncio.coroutine`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ if [ "$1" = 'postgres' ]; then`
`88`	`88`	`multimaster.conn_strings = '$CONNSTRS'`
`89`	`89`	`multimaster.heartbeat_recv_timeout = 1000`
`90`	`90`	`multimaster.heartbeat_send_timeout = 250`
`91`		`-multimaster.twopc_min_timeout =5000`
	`91`	`+multimaster.twopc_min_timeout =2000`
`92`	`92`	`EOF`
`93`	`93`
`94`	`94`	`tail -n 20$PGDATA/postgresql.conf`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ def test_node_partition(self):`
`48`	`48`	`self.assertTrue(aggs['transfer_0']['finish']['commit']>0 )`
`49`	`49`	`self.assertTrue(aggs['transfer_1']['finish']['commit']>0 )`
`50`	`50`	`# self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )`
	`51`	`+self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )`
`51`	`52`
`52`	`53`	`subprocess.check_call(['blockade','join'])`
`53`	`54`	`print('### deblockade node3 ###')`
`@@ -60,6 +61,7 @@ def test_node_partition(self):`
`60`	`61`	`time.sleep(3)`
`61`	`62`	`aggs=self.client.get_status()`
`62`	`63`	`MtmClient.print_aggregates(aggs)`
	`64`	`+self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )`
`63`	`65`
`64`	`66`	`# check that during last aggregation all nodes were working`
`65`	`67`	`self.assertTrue(aggs['transfer_0']['finish']['commit']>0 )`

Comments

(0)