Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 5760d42c01f7 · 2016-06-20T15:39:24.000+03:00
diff --git a/contrib/mmts/tests2/blockade.yml b/contrib/mmts/tests2/blockade.yml
@@ -29,4 +29,6 @@ containers:
     ports:
       5434: 5432
 
+network:
+    driver: udn
 
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -71,14 +71,18 @@ if [ "$1" = 'postgres' ]; then
 			max_replication_slots = 10
 			max_wal_senders = 10
 			shared_preload_libraries = 'raftable,multimaster'
+
 			raftable.id = $NODE_ID
 			raftable.peers = '$RAFT_PEERS'
-			multimaster.workers=4
-			multimaster.use_raftable=true
+
+			multimaster.workers = 4
+			multimaster.use_raftable = true
 			multimaster.queue_size=52857600
-			multimaster.ignore_tables_without_pk=1
+			multimaster.ignore_tables_without_pk = 1
 			multimaster.node_id = $NODE_ID
 			multimaster.conn_strings = '$CONNSTRS'
+			multimaster.heartbeat_recv_timeout = 1000
+			multimaster.heartbeat_send_timeout = 250
 		EOF
 
 		tail -n 20 $PGDATA/postgresql.conf
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -27,9 +27,7 @@ def start(self):
             client.start()
 
     def stop(self):
-        print('collection stop called', self._clients)
         for client in self._clients:
-            print('stop coll')
             client.stop()
 
 
@@ -160,8 +158,8 @@ def start(self):
     def stop(self):
         print('Stopping!');
         self.run.value = False
-        self.total_process.join()
-        self.transfer_process.join()
+        self.total_process.terminate()
+        self.transfer_process.terminate()
         return
 
     def cleanup(self):
diff --git a/contrib/mmts/tests2/requirements.txt b/contrib/mmts/tests2/requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/kelvich/blockade.git
+git+https://github.com/kelvich/blockade.git@user-defined-network
 psycopg2
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -36,27 +36,27 @@ def test_1_node_disconnect(self):
         subprocess.check_call(['blockade','partition','node3'])
         print('Node3 disconnected')
 
-        print('Waiting 12s to discover failure')
-        time.sleep(12)
+        print('Waiting 20s to discover failure')
+        time.sleep(20)
         for client in self.clients:
             agg = client.history.aggregate()
             print(agg)
 
-        print('Waiting 3s to check operability')
-        time.sleep(3)
-        for client in self.clients:
-            agg = client.history.aggregate()
-            print(agg)
-
-        subprocess.check_call(['blockade','join'])
-        print('Node3 connected back')
-
-        print('Waiting 12s for catch-up')
-        time.sleep(12)
-
-        for client in self.clients:
-            agg = client.history.aggregate()
-            print(agg)
+#        print('Waiting 3s to check operability')
+#        time.sleep(3)
+#        for client in self.clients:
+#            agg = client.history.aggregate()
+#            print(agg)
+#
+#        subprocess.check_call(['blockade','join'])
+#        print('Node3 connected back')
+#
+#        print('Waiting 12s for catch-up')
+#        time.sleep(12)
+#
+#        for client in self.clients:
+#            agg = client.history.aggregate()
+#            print(agg)
 
 
 if __name__ == '__main__':
diff --git a/contrib/raftable/tests/test_recovery.py b/contrib/raftable/tests/test_recovery.py
@@ -44,6 +44,35 @@ def test_1_node_disconnect(self):
             # check we didn't stuck in set op
             self.assertTrue(agg['setkey']['running_latency'] < 3)
 
+    def test_1_node_in_node_out(self):
+        print('### InOutTest ###')
+
+        subprocess.check_call(['blockade','partition','node3'])
+        print('Node3 disconnected')
+
+        print('Waiting 5s')
+        time.sleep(5)
+
+        for client in self.clients:
+            agg = client.history.aggregate()
+            print(agg)
+            # check we didn't stuck in set op
+            self.assertTrue(agg['setkey']['running_latency'] < 3)
+
+        subprocess.check_call(['blockade','join'])
+        print('Node3 connected')
+
+        print('Waiting 5s')
+        time.sleep(5)
+
+        for client in self.clients:
+            agg = client.history.aggregate()
+            print(agg)
+            # check we didn't stuck in set op
+            self.assertTrue(agg['setkey']['running_latency'] < 3)
+
+
+
 if __name__ == '__main__':
     unittest.main()
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-git+https://github.com/kelvich/blockade.git`
	`1`	`+git+https://github.com/kelvich/blockade.git@user-defined-network`
`2`	`2`	`psycopg2`