enable asserts in test; more detailed info on isolation errors

kelvich · kelvich · commit 170469d41a63 · 2017-11-13T02:17:30.000+03:00
diff --git a/tests2/client2.py b/tests2/client2.py
@@ -51,6 +51,34 @@ def __init__(self, dsns, n_accounts=100000):
         self.aggregates = {}
         self.initdb()
         self.running = True
+        self.nodes_state_fields = ["id", "disabled", "disconnected", "catchUp", "slotLag",
+            "avgTransDelay", "lastStatusChange", "oldestSnapshot", "SenderPid",
+            "SenderStartTime ", "ReceiverPid", "ReceiverStartTime", "connStr"]
+        self.oops = '''
+                        . . .                         
+                         \|/                          
+                       `--+--'                        
+                         /|\                          
+                        ' | '                         
+                          |                           
+                          |                           
+                      ,--'#`--.                       
+                      |#######|                       
+                   _.-'#######`-._                    
+                ,-'###############`-.                 
+              ,'#####################`,               
+             /#########################\              
+            |###########################|             
+           |#############################|            
+           |#############################|            
+           |#############################|            
+           |#############################|            
+            |###########################|             
+             \#########################/              
+              `.#####################,'               
+                `._###############_,'                 
+                   `--..#####..--'      
+'''
 
     def initdb(self):
         conn = psycopg2.connect(self.dsns[0])
@@ -94,14 +122,14 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):
             agg.start_tx()
             try:
                 yield from cur.execute('commit')
-                yield from tx_block(conn, cur)
+                yield from tx_block(conn, cur, agg)
                 agg.finish_tx('commit')
             except psycopg2.Error as e:
                 agg.finish_tx(e.pgerror)
         print("We've count to infinity!")
 
     @asyncio.coroutine
-    def transfer_tx(self, conn, cur):
+    def transfer_tx(self, conn, cur, agg):
         amount = 1
         # to avoid deadlocks:
         from_uid = random.randint(1, self.n_accounts - 2)
@@ -118,12 +146,21 @@ def transfer_tx(self, conn, cur):
         yield from cur.execute('commit')
 
     @asyncio.coroutine
-    def total_tx(self, conn, cur):
+    def total_tx(self, conn, cur, agg):
         yield from cur.execute('select sum(amount) from bank_test')
         total = yield from cur.fetchone()
         if total[0] != 0:
-            print('Isolation error, totel = ', total[0])
-            self.isolation += 1
+            agg.isolation += 1
+            print(self.oops)
+            print('Isolation error, total = ', total[0])
+            yield from cur.execute('select * from mtm.get_nodes_state()')
+            nodes_state = yield from cur.fetchall()
+            for i, col in enumerate(self.nodes_state_fields):
+                print("%17s" % col, end="\t")
+                for j in range(3):
+                     print("%19s" % nodes_state[j][i], end="\t")
+                print("\n")
+
 
     def run(self):
         # asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
diff --git a/tests2/test_recovery.py b/tests2/test_recovery.py
@@ -40,27 +40,33 @@ def test_node_partition(self):
         # clear tx history
         self.client.get_status()
 
-        for i in range(10):
+        for i in range(3):
             print(i, datetime.datetime.now())
             time.sleep(3)
             aggs = self.client.get_status()
             MtmClient.print_aggregates(aggs)
-            #self.assertTrue( aggs[0]['transfer']['finish']['Commit'] > 0 )
-            #self.assertTrue( aggs[1]['transfer']['finish']['Commit'] > 0 )
-            #self.assertTrue( 'Commit' not in aggs[2]['transfer']['finish'] )
+            self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
+            self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
+            # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
 
         subprocess.check_call(['blockade','join'])
         print('### deblockade node3 ###')
 
         # clear tx history
         self.client.get_status()
 
-        for i in range(30):
+        for i in range(20):
             print(i, datetime.datetime.now())
             time.sleep(3)
             aggs = self.client.get_status()
             MtmClient.print_aggregates(aggs)
 
+        # check that during last aggregation all nodes were working
+        self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
+        self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
+        self.assertTrue( aggs['transfer_2']['finish']['commit'] > 0 )
+
+
 
         subprocess.check_call(['blockade','join'])
         print("Node3 joined back")
