use toxiproxy instead of blockade

kelvich · kelvich · commit 3e6de01ac645 · 2016-10-25T15:08:04.000+03:00
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -111,17 +111,16 @@ def status(self):
         while self.running:
             msg = yield from self.child_pipe.coro_recv()
             if msg == 'status':
-                print('evloop: got status request')
+                # print('evloop: got status request')
                 serialized_aggs = {}
                 for name, aggregate in self.aggregates.items():
                     serialized_aggs[name] = aggregate.as_dict() 
                     aggregate.clear_values()
                 self.child_pipe.send(serialized_aggs)
-                print('evloop: sent status response')
+                # print('evloop: sent status response')
             else:
                 print('evloop: unknown message')
 
-
     @asyncio.coroutine
     def exec_tx(self, tx_block, aggname_prefix, conn_i):
         aggname = "%s_%i" % (aggname_prefix, conn_i)
@@ -194,11 +193,11 @@ def bgrun(self):
         self.evloop_process.start()
 
     def get_status(self):
-        print('test: sending status request')
+        # print('test: sending status request')
         self.parent_pipe.send('status')
-        print('test: awaitng status response')
+        # print('test: awaitng status response')
         resp = self.parent_pipe.recv()
-        print('test: got status response')
+        # print('test: got status response')
         return resp
 
     def stop(self):
diff --git a/contrib/mmts/tests2/requirements.txt b/contrib/mmts/tests2/requirements.txt
@@ -1,3 +1,4 @@
 psycopg2
 aiopg
 aioprocessing
+git+git://github.com/douglas/toxiproxy-python.git
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -1,23 +1,30 @@
 import unittest
 import time
 import subprocess
-from lib.bank_client import MtmClient
 import datetime
 
+from toxiproxy import Toxiproxy
+from lib.bank_client import MtmClient
+
+
 class RecoveryTest(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         subprocess.check_call(['docker-compose','up',
             '--force-recreate',
             '-d'])
+
+        # XXX: add normal wait here
         time.sleep(30)
         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()
-        time.sleep(5)
+
+        self.toxiproxy = Toxiproxy() #Toxiproxy(server_host="toxi")
+
 
     @classmethod
     def tearDownClass(self):
@@ -38,13 +45,14 @@ def test_normal_operations(self):
     def test_node_partition(self):
         print('### nodePartitionTest ###')
 
-        subprocess.check_call(['blockade','partition','node3'])
-        print('### blockade node3 ###')
+        print('### split node3 ###')
+        for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
+            self.toxiproxy.get_proxy(proxy).disable()
 
         # clear tx history
         self.client.get_status()
 
-        for i in range(3):
+        for i in range(5):
             print(i, datetime.datetime.now())
             time.sleep(3)
             aggs = self.client.get_status()
@@ -54,13 +62,14 @@ def test_node_partition(self):
             # 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 ###')
+        print('### join node3 ###')
+        for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
+            self.toxiproxy.get_proxy(proxy).enable()
 
         # clear tx history
         self.client.get_status()
 
-        for i in range(20):
+        for i in range(5):
             print(i, datetime.datetime.now())
             time.sleep(3)
             aggs = self.client.get_status()
