Commit59befec

committed

Add actual asserts to mmts recovery test

1 parent646f16c commit59befecCopy full SHA for 59befec

File tree

5 files changed

+37

-84

lines changed

contrib/mmts
- Dockerfile
- tests2

5 files changed

+37

-84

lines changed

`‎contrib/mmts/Dockerfile`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ USER postgres`
`31`	`31`	`ENV CFLAGS -O0`
`32`	`32`	`WORKDIR /pg`
`33`	`33`
`34`		`-ENV REBUILD2`
	`34`	`+ENV REBUILD5`
`35`	`35`
`36`	`36`	`RUN cd /pg && \`
`37`	`37`	`git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \`

`‎contrib/mmts/tests2/docker-entrypoint.sh`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,15 @@ if [ "$1" = 'postgres' ]; then`
`68`	`68`	`listen_addresses='*'`
`69`	`69`	`max_prepared_transactions = 100`
`70`	`70`	`synchronous_commit = off`
	`71`	`+fsync = off`
`71`	`72`	`wal_level = logical`
`72`	`73`	`max_worker_processes = 30`
`73`	`74`	`max_replication_slots = 10`
`74`	`75`	`max_wal_senders = 10`
`75`	`76`	`shared_preload_libraries = 'raftable,multimaster'`
`76`		`-default_transaction_isolation = 'repeatable read'`
	`77`	`+default_transaction_isolation = 'repeatable read'`
`77`	`78`	`log_checkpoints = on`
	`79`	`+checkpoint_timeout = 30`
`78`	`80`	`log_autovacuum_min_duration = 0`
`79`	`81`
`80`	`82`	`raftable.id =$NODE_ID`

`‎contrib/mmts/tests2/lib/bank_client.py`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,14 @@ def stop(self):`
`33`	`33`	`forclientinself._clients:`
`34`	`34`	`client.stop()`
`35`	`35`
`36`		`-defprint_agg(self):`
	`36`	`+defaggregate(self,echo=True):`
`37`	`37`	`aggs= []`
`38`	`38`	`forclientinself._clients:`
`39`	`39`	`aggs.append(client.history.aggregate())`
`40`	`40`
	`41`	`+ifnotecho:`
	`42`	`+returnaggs`
	`43`	`+`
`41`	`44`	`columns= ['running','running_latency','max_latency','finish']`
`42`	`45`
`43`	`46`	`print("\t\t",end="")`
`@@ -61,10 +64,7 @@ def print_agg(self):`
`61`	`64`
`62`	`65`	`print("")`
`63`	`66`
`64`		`-defset_acc_to_tx(self,max_acc):`
`65`		`-forclientinself._clients:`
`66`		`-client.set_acc_to_tx(max_acc)`
`67`		`-`
	`67`	`+returnaggs`
`68`	`68`
`69`	`69`	`classBankClient(object):`
`70`	`70`
`@@ -141,7 +141,7 @@ def exec_tx(self, name, tx_block):`
`141`	`141`	`tx_block(conn,cur)`
`142`	`142`	`self.history.register_finish(event_id,'Commit')`
`143`	`143`	`exceptpsycopg2.Errorase:`
`144`		`-print("=== node%d: %s"% (self.node_id,e.pgerror))`
	`144`	`+#print("=== node%d: %s" % (self.node_id, e.pgerror))`
`145`	`145`	`self.history.register_finish(event_id,e.pgerror)`
`146`	`146`	`#time.sleep(0.2)`
`147`	`147`

`‎contrib/mmts/tests2/lib/event_history.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ def aggregate(self):`
`85`	`85`	`self.events= []`
`86`	`86`
`87`	`87`	`forvalueinself.running_events.itervalues():`
`88`		`-print(value)`
	`88`	`+#print(value)`
`89`	`89`
`90`	`90`	`ifvalue['name']notinagg:`
`91`	`91`	`agg[value['name']]=copy.deepcopy(self.agg_template)`

`‎contrib/mmts/tests2/test_recovery.py`

Lines changed: 26 additions & 75 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,105 +6,56 @@`
`6`	`6`	`classRecoveryTest(unittest.TestCase):`
`7`	`7`	`@classmethod`
`8`	`8`	`defsetUpClass(self):`
`9`		`-#subprocess.check_call(['blockade','up'])`
`10`	`9`	`self.clients=ClientCollection([`
`11`	`10`	`"dbname=postgres host=127.0.0.1 user=postgres",`
`12`	`11`	`"dbname=postgres host=127.0.0.1 user=postgres port=5433",`
`13`	`12`	`"dbname=postgres host=127.0.0.1 user=postgres port=5434"`
`14`	`13`	`])`
	`14`	`+self.clients.start()`
	`15`	`+time.sleep(5)`
`15`	`16`
`16`	`17`	`@classmethod`
`17`	`18`	`deftearDownClass(self):`
`18`	`19`	`print('tearDown')`
`19`		`-#subprocess.check_call(['blockade','join'])`
`20`		`-`
`21`		`-# in case of error`
`22`	`20`	`self.clients.stop()`
`23`		`-#self.clients[0].cleanup()`
`24`	`21`
`25`		`-deftest_0_0_0(self):`
`26`		`-print('### normalOpsTest ###')`
	`22`	`+# def test_normal_operations(self):`
	`23`	`+# print('### normalOpsTest ###')`
	`24`	`+`
	`25`	`+# for i in range(3):`
	`26`	`+# time.sleep(3)`
	`27`	`+# aggs = self.clients.aggregate()`
	`28`	`+# for agg in aggs:`
	`29`	`+# # there were some commits`
	`30`	`+# self.assertTrue( agg['transfer'] > 0 )`
	`31`	`+`
	`32`	`+deftest_node_prtition(self):`
	`33`	`+print('### nodePartitionTest ###')`
`27`	`34`
`28`		`-time.sleep(10)`
`29`	`35`	`subprocess.check_call(['blockade','partition','node3'])`
`30`	`36`	`print('### blockade node3 ###')`
`31`	`37`
`32`		`-self.clients.set_acc_to_tx(10000)`
`33`		`-self.clients.start()`
	`38`	`+# clear tx history`
	`39`	`+self.clients.aggregate(echo=False)`
`34`	`40`
`35`		`-foriinrange(10):`
	`41`	`+foriinrange(3):`
`36`	`42`	`time.sleep(3)`
`37`		`-self.clients.print_agg()`
`38`		`-print("\n")`
	`43`	`+aggs=self.clients.aggregate()`
	`44`	`+self.assertTrue(aggs[0]['transfer']['finish']['Commit']>0 )`
	`45`	`+self.assertTrue(aggs[1]['transfer']['finish']['Commit']>0 )`
	`46`	`+self.assertTrue('Commit'notinaggs[2]['transfer'] )`
`39`	`47`
`40`	`48`	`subprocess.check_call(['blockade','join'])`
`41`	`49`	`print('### deblockade node3 ###')`
`42`	`50`
	`51`	`+# clear tx history`
	`52`	`+self.clients.aggregate(echo=False)`
	`53`	`+`
`43`	`54`	`foriinrange(1000):`
`44`	`55`	`time.sleep(3)`
`45`		`-t=datetime.datetime.now()`
`46`		`-self.clients.print_agg()`
`47`		`-print("took %f seconds"% ( (datetime.datetime.now()-t).total_seconds(),))`
`48`		`-print("\n")`
`49`		`-`
`50`		`-self.clients.stop()`
`51`		`-`
`52`		`-`
	`56`	`+aggs=self.clients.aggregate()`
	`57`	`+print(i,aggs)`
`53`	`58`
`54`		`-# def test_0_normal_operation(self):`
`55`		`-# print('### normalOpsTest ###')`
`56`		`-#`
`57`		`-# self.clients.set_acc_to_tx(10000)`
`58`		`-# self.clients.start()`
`59`		`-#`
`60`		`-# for i in range(5):`
`61`		`-# time.sleep(3)`
`62`		`-# for client in self.clients:`
`63`		`-# agg = client.history.aggregate()`
`64`		`-# print(agg)`
`65`		`-# self.assertTrue(agg['transfer']['finish']['Commit'] > 0)`
`66`		`-# print("\n")`
`67`		`-#`
`68`		`-# self.clients.stop()`
`69`		`-#`
`70`		`-# def test_1_distributed_deadlock(self):`
`71`		`-# print('### DDD test ###')`
`72`		`-#`
`73`		`-# self.clients.set_acc_to_tx(10)`
`74`		`-# self.clients.start()`
`75`		`-#`
`76`		`-# for i in range(5):`
`77`		`-# time.sleep(3)`
`78`		`-# for client in self.clients:`
`79`		`-# agg = client.history.aggregate()`
`80`		`-# print(agg)`
`81`		`-# self.assertTrue(agg['transfer']['finish']['Commit'] > 0)`
`82`		`-# print("\n")`
`83`		`-#`
`84`		`-# self.clients.stop()`
`85`		`-#`
`86`		`-# def test_2_node_disconnect(self):`
`87`		`-# print('### disconnectTest ###')`
`88`		`-#`
`89`		`-# self.clients.set_acc_to_tx(10000)`
`90`		`-# self.clients.start()`
`91`		`-#`
`92`		`-# subprocess.check_call(['blockade','partition','node3'])`
`93`		`-# print('Node3 disconnected')`
`94`		`-#`
`95`		`-# # give cluster some time to discover problem`
`96`		`-# time.sleep(3)`
`97`		`-#`
`98`		`-# for i in range(5):`
`99`		`-# time.sleep(3)`
`100`		`-# for client in self.clients:`
`101`		`-# agg = client.history.aggregate()`
`102`		`-# print(agg)`
`103`		`-# self.assertTrue(agg['transfer']['finish']['Commit'] > 0)`
`104`		`-# print("\n")`
`105`		`-#`
`106`		`-# subprocess.check_call(['blockade','join'])`
`107`		`-# self.clients.stop()`
`108`	`59`
`109`	`60`	`if__name__=='__main__':`
`110`	`61`	`unittest.main()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit59befec

File tree

5 files changed

5 files changed

`‎contrib/mmts/Dockerfile`

`‎contrib/mmts/tests2/docker-entrypoint.sh`

`‎contrib/mmts/tests2/lib/bank_client.py`

`‎contrib/mmts/tests2/lib/event_history.py`

`‎contrib/mmts/tests2/test_recovery.py`

0 commit comments