Commit9eb1afb

committed

simplify mmts test

1 parente2eaa0c commit9eb1afbCopy full SHA for 9eb1afb

File tree

+29

-25

lines changed

+29

-25

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,18 @@ if [ "$1" = 'postgres' ]; then`
`71`	`71`	`max_replication_slots = 10`
`72`	`72`	`max_wal_senders = 10`
`73`	`73`	`shared_preload_libraries = 'raftable,multimaster'`
	`74`	`+`
`74`	`75`	`raftable.id =$NODE_ID`
`75`	`76`	`raftable.peers = '$RAFT_PEERS'`
`76`		`-multimaster.workers=4`
`77`		`-multimaster.use_raftable=true`
	`77`	`+`
	`78`	`+multimaster.workers = 4`
	`79`	`+multimaster.use_raftable = true`
`78`	`80`	`multimaster.queue_size=52857600`
`79`		`-multimaster.ignore_tables_without_pk=1`
	`81`	`+multimaster.ignore_tables_without_pk =1`
`80`	`82`	`multimaster.node_id =$NODE_ID`
`81`	`83`	`multimaster.conn_strings = '$CONNSTRS'`
	`84`	`+multimaster.heartbeat_recv_timeout = 1000`
	`85`	`+multimaster.heartbeat_send_timeout = 250`
`82`	`86`	`EOF`
`83`	`87`
`84`	`88`	`tail -n 20$PGDATA/postgresql.conf`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,7 @@ def start(self):`
`27`	`27`	`client.start()`
`28`	`28`
`29`	`29`	`defstop(self):`
`30`		`-print('collection stop called',self._clients)`
`31`	`30`	`forclientinself._clients:`
`32`		`-print('stop coll')`
`33`	`31`	`client.stop()`
`34`	`32`
`35`	`33`
`@@ -160,8 +158,8 @@ def start(self):`
`160`	`158`	`defstop(self):`
`161`	`159`	`print('Stopping!');`
`162`	`160`	`self.run.value=False`
`163`		`-self.total_process.join()`
`164`		`-self.transfer_process.join()`
	`161`	`+self.total_process.terminate()`
	`162`	`+self.transfer_process.terminate()`
`165`	`163`	`return`
`166`	`164`
`167`	`165`	`defcleanup(self):`

Lines changed: 1 addition & 1 deletion

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`

Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,27 +36,27 @@ def test_1_node_disconnect(self):`
`36`	`36`	`subprocess.check_call(['blockade','partition','node3'])`
`37`	`37`	`print('Node3 disconnected')`
`38`	`38`
`39`		`-print('Waiting12s to discover failure')`
`40`		`-time.sleep(12)`
	`39`	`+print('Waiting20s to discover failure')`
	`40`	`+time.sleep(20)`
`41`	`41`	`forclientinself.clients:`
`42`	`42`	`agg=client.history.aggregate()`
`43`	`43`	`print(agg)`
`44`	`44`
`45`		`-print('Waiting 3s to check operability')`
`46`		`-time.sleep(3)`
`47`		`-forclientinself.clients:`
`48`		`-agg=client.history.aggregate()`
`49`		`-print(agg)`
`50`		`-`
`51`		`-subprocess.check_call(['blockade','join'])`
`52`		`-print('Node3 connected back')`
`53`		`-`
`54`		`-print('Waiting 12s for catch-up')`
`55`		`-time.sleep(12)`
`56`		`-`
`57`		`-forclientinself.clients:`
`58`		`-agg=client.history.aggregate()`
`59`		`-print(agg)`
	`45`	`+# print('Waiting 3s to check operability')`
	`46`	`+# time.sleep(3)`
	`47`	`+# for client in self.clients:`
	`48`	`+# agg = client.history.aggregate()`
	`49`	`+# print(agg)`
	`50`	`+#`
	`51`	`+# subprocess.check_call(['blockade','join'])`
	`52`	`+# print('Node3 connected back')`
	`53`	`+#`
	`54`	`+# print('Waiting 12s for catch-up')`
	`55`	`+# time.sleep(12)`
	`56`	`+#`
	`57`	`+# for client in self.clients:`
	`58`	`+# agg = client.history.aggregate()`
	`59`	`+# print(agg)`
`60`	`60`
`61`	`61`
`62`	`62`	`if__name__=='__main__':`

Comments

(0)