Check update status in xcheck

knizhnik · kelvich · commit 917d875173cd · 2017-11-13T02:17:30.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -517,8 +517,6 @@ MtmAdjustOldestXid(TransactionId xid)
 	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);
 	Mtm->gcCount = 0;
 
-	//return FirstNormalTransactionId;
-
 	if (ts != NULL) { 
 		oldestSnapshot = ts->snapshot;
 		Assert(oldestSnapshot != INVALID_CSN);
diff --git a/t/001_basic_recovery.pl b/t/001_basic_recovery.pl
@@ -71,6 +71,8 @@
 diag("starting node 2");
 $cluster->{nodes}->[2]->start;
 
+sleep(5); # Wait until node is started
+
 diag("inserting 6 on node 1 (can fail)");
 $cluster->psql(0, 'postgres', "insert into t values(6, 60);"); 
 diag("inserting 7 on node 2 (can fail)");
diff --git a/tests2/client2.py b/tests2/client2.py
@@ -150,10 +150,12 @@ def transfer_tx(self, conn, cur, agg):
             set amount = amount - %s
             where uid = %s''',
             (amount, from_uid))
+        assert(cur.rowcount == 1)
         yield from cur.execute('''update bank_test
             set amount = amount + %s
             where uid = %s''',
             (amount, to_uid))
+        assert(cur.rowcount == 1)
         yield from cur.execute('commit')
 
     @asyncio.coroutine
diff --git a/tests2/docker-entrypoint.sh b/tests2/docker-entrypoint.sh
@@ -88,7 +88,7 @@ if [ "$1" = 'postgres' ]; then
 			multimaster.conn_strings = '$CONNSTRS'
 			multimaster.heartbeat_recv_timeout = 1000
 			multimaster.heartbeat_send_timeout = 250
-			multimaster.twopc_min_timeout = 5000
+			multimaster.twopc_min_timeout = 2000
 		EOF
 
 		tail -n 20 $PGDATA/postgresql.conf
diff --git a/tests2/test_recovery.py b/tests2/test_recovery.py
@@ -48,6 +48,7 @@ def test_node_partition(self):
             self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
             self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
             # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
+            self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
 
         subprocess.check_call(['blockade','join'])
         print('### deblockade node3 ###')
@@ -60,6 +61,7 @@ def test_node_partition(self):
             time.sleep(3)
             aggs = self.client.get_status()
             MtmClient.print_aggregates(aggs)
+            self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
 
         # check that during last aggregation all nodes were working
         self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
