Call SetPreparedTransactionState inside transaction

knizhnik · knizhnik · commit 6e98228dc08e · 2017-01-10T16:35:08.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -1065,7 +1065,10 @@ static void MtmReceiver(Datum arg)
 										Assert(replorigin_session_origin == InvalidRepOriginId);
 										MTM_LOG2("SetPreparedTransactionState for %s", ts->gid);
 										MtmUnlock();
+										MtmResetTransaction();
+										StartTransactionCommand();
 										SetPreparedTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);	
+										CommitTransactionCommand();
 										MtmLock(LW_EXCLUSIVE);						
 									} else { 
 										ts->status = TRANSACTION_STATUS_UNKNOWN;
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -956,7 +956,14 @@ void MtmPrecommitTransaction(char const* gid)
 				}
 				MtmUnlock();
 				Assert(replorigin_session_origin != InvalidRepOriginId);
-				SetPreparedTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);
+				if (!IsTransactionState()) {
+					MtmResetTransaction();
+					StartTransactionCommand();
+					SetPreparedTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);
+					CommitTransactionCommand();
+				} else { 
+					SetPreparedTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);
+				}
 			} else {
 				elog(WARNING, "MtmPrecommitTransaction: transaction '%s' is already in %s state", gid, MtmTxnStatusMnem[ts->status]);
 				MtmUnlock();
diff --git a/contrib/mmts/tests2/support/docker-regress.sh b/contrib/mmts/tests2/support/docker-regress.sh
@@ -17,9 +17,9 @@ SQL
 
 STATUS=$?
 
-if [ -f "regression.diffs" ]
-then
-	cat regression.diffs
-fi
+#if [ -f "regression.diffs" ]
+#then
+#	cat regression.diffs
+#fi
 
 exit $STATUS
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -12,8 +12,10 @@
 from lib.bank_client import MtmClient
 from lib.failure_injector import *
 
+TEST_WARMING_TIME = 5
 TEST_DURATION = 10
-TEST_RECOVERY_TIME = 20
+TEST_RECOVERY_TIME = 30
+TEST_SETUP_TIME = 20
 
 class TestHelper(object):
 
@@ -39,6 +41,11 @@ def assertNoCommits(self, aggs):
             raise AssertionError('There are commits during aggregation interval')
 
     def performFailure(self, failure):
+
+        time.sleep(TEST_WARMING_TIME)
+         
+        print('Simulate failure at ',datetime.datetime.utcnow())
+
         failure.start()
 
         self.client.clean_aggregates()
@@ -47,6 +54,8 @@ def performFailure(self, failure):
 
         failure.stop()
 
+        print('Eliminate failure at ',datetime.datetime.utcnow())
+
         self.client.clean_aggregates()
         time.sleep(TEST_RECOVERY_TIME)
         aggs = self.client.get_aggregates()
@@ -60,11 +69,12 @@ class RecoveryTest(unittest.TestCase, TestHelper):
     def setUpClass(self):
         subprocess.check_call(['docker-compose','up',
             '--force-recreate',
+            '--build',
             '-d'])
 
         # XXX: add normal wait here
-        time.sleep(20)
-        print('started')
+        time.sleep(TEST_SETUP_TIME)
+
         self.client = MtmClient([
             "dbname=regression user=postgres host=127.0.0.1 port=15432",
             "dbname=regression user=postgres host=127.0.0.1 port=15433",
@@ -81,6 +91,11 @@ def tearDownClass(self):
 
     def setUp(self):
         warnings.simplefilter("ignore", ResourceWarning)
+        time.sleep(20)
+        print('Start new test at ',datetime.datetime.utcnow())
+
+    def tearDown(self):
+        print('Finish test at ',datetime.datetime.utcnow())
 
     def test_normal_operations(self):
         print('### test_normal_operations ###')
@@ -122,8 +137,6 @@ def test_edge_partition(self):
     def test_node_restart(self):
         print('### test_node_restart ###')
 
-        time.sleep(3)
-
         aggs_failure, aggs = self.performFailure(RestartNode('node3'))
 
         self.assertCommits(aggs_failure[:2])
diff --git a/contrib/mmts/tests2/test_recovery_up.py b/contrib/mmts/tests2/test_recovery_up.py
@@ -64,21 +64,27 @@ def performFailure(self, failure):
 
 class RecoveryTest(unittest.TestCase, TestHelper):
 
-    def setUp(self):
-        time.sleep(20)
-        print('Start new test at ',datetime.datetime.utcnow())
-        warnings.simplefilter("ignore", ResourceWarning)
+    @classmethod
+    def setUpClass(self):
         self.client = MtmClient([
             "dbname=regression user=postgres host=127.0.0.1 port=15432",
             "dbname=regression user=postgres host=127.0.0.1 port=15433",
             "dbname=regression user=postgres host=127.0.0.1 port=15434"
         ], n_accounts=1000)
         self.client.bgrun()
 
-    def tearDown(self):
-        print('Finish test at ',datetime.datetime.utcnow())
+    @classmethod
+    def tearDownClass(self):
+        print('tearDown')
         self.client.stop()
 
+    def setUp(self):
+        warnings.simplefilter("ignore", ResourceWarning)
+        time.sleep(20)
+        print('Start new test at ',datetime.datetime.utcnow())
+
+    def tearDown(self):
+        print('Finish test at ',datetime.datetime.utcnow())
 
     def test_normal_operations(self):
         print('### test_normal_operations ###')
diff --git a/contrib/mmts/tests2/test_regression.py b/contrib/mmts/tests2/test_regression.py
@@ -6,14 +6,16 @@ class RecoveryTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(self):
-        subprocess.check_call(['docker-compose','up',
-            '--force-recreate',
-            '--build',
-            '-d'])
+        print('setUp')
+#        subprocess.check_call(['docker-compose','up',
+#            '--force-recreate',
+#            '--build',
+#            '-d'])
 
     @classmethod
     def tearDownClass(self):
-        subprocess.check_call(['docker-compose','down'])
+        print('tearDown')
+#        subprocess.check_call(['docker-compose','down'])
 
     def test_regression(self):
         # XXX: make smth clever here
