NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit3db5770

committed

use toxiproxy instead of blockade

1 parentdee86bd commit3db5770Copy full SHA for 3db5770

File tree

3 files changed

+23

-14

lines changed

tests2

3 files changed

+23

-14

lines changed

`‎tests2/lib/bank_client.py‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,17 +111,16 @@ def status(self):`
`111`	`111`	`whileself.running:`
`112`	`112`	`msg=yieldfromself.child_pipe.coro_recv()`
`113`	`113`	`ifmsg=='status':`
`114`		`-print('evloop: got status request')`
	`114`	`+#print('evloop: got status request')`
`115`	`115`	`serialized_aggs= {}`
`116`	`116`	`forname,aggregateinself.aggregates.items():`
`117`	`117`	`serialized_aggs[name]=aggregate.as_dict()`
`118`	`118`	`aggregate.clear_values()`
`119`	`119`	`self.child_pipe.send(serialized_aggs)`
`120`		`-print('evloop: sent status response')`
	`120`	`+#print('evloop: sent status response')`
`121`	`121`	`else:`
`122`	`122`	`print('evloop: unknown message')`
`123`	`123`
`124`		`-`
`125`	`124`	`@asyncio.coroutine`
`126`	`125`	`defexec_tx(self,tx_block,aggname_prefix,conn_i):`
`127`	`126`	`aggname="%s_%i"% (aggname_prefix,conn_i)`
`@@ -194,11 +193,11 @@ def bgrun(self):`
`194`	`193`	`self.evloop_process.start()`
`195`	`194`
`196`	`195`	`defget_status(self):`
`197`		`-print('test: sending status request')`
	`196`	`+#print('test: sending status request')`
`198`	`197`	`self.parent_pipe.send('status')`
`199`		`-print('test: awaitng status response')`
	`198`	`+#print('test: awaitng status response')`
`200`	`199`	`resp=self.parent_pipe.recv()`
`201`		`-print('test: got status response')`
	`200`	`+#print('test: got status response')`
`202`	`201`	`returnresp`
`203`	`202`
`204`	`203`	`defstop(self):`

`‎tests2/requirements.txt‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`psycopg2`
`2`	`2`	`aiopg`
`3`	`3`	`aioprocessing`
	`4`	`+git+git://github.com/douglas/toxiproxy-python.git`

`‎tests2/test_recovery.py‎`

Lines changed: 17 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,30 @@`
`1`	`1`	`importunittest`
`2`	`2`	`importtime`
`3`	`3`	`importsubprocess`
`4`		`-fromlib.bank_clientimportMtmClient`
`5`	`4`	`importdatetime`
`6`	`5`
	`6`	`+fromtoxiproxyimportToxiproxy`
	`7`	`+fromlib.bank_clientimportMtmClient`
	`8`	`+`
	`9`	`+`
`7`	`10`	`classRecoveryTest(unittest.TestCase):`
`8`	`11`	`@classmethod`
`9`	`12`	`defsetUpClass(self):`
`10`	`13`	`subprocess.check_call(['docker-compose','up',`
`11`	`14`	`'--force-recreate',`
`12`	`15`	`'-d'])`
	`16`	`+`
	`17`	`+# XXX: add normal wait here`
`13`	`18`	`time.sleep(30)`
`14`	`19`	`self.client=MtmClient([`
`15`	`20`	`"dbname=regression user=postgres host=127.0.0.1 port=15432",`
`16`	`21`	`"dbname=regression user=postgres host=127.0.0.1 port=15433",`
`17`	`22`	`"dbname=regression user=postgres host=127.0.0.1 port=15434"`
`18`	`23`	`],n_accounts=1000)`
`19`	`24`	`self.client.bgrun()`
`20`		`-time.sleep(5)`
	`25`	`+`
	`26`	`+self.toxiproxy=Toxiproxy()#Toxiproxy(server_host="toxi")`
	`27`	`+`
`21`	`28`
`22`	`29`	`@classmethod`
`23`	`30`	`deftearDownClass(self):`
`@@ -38,13 +45,14 @@ def test_normal_operations(self):`
`38`	`45`	`deftest_node_partition(self):`
`39`	`46`	`print('### nodePartitionTest ###')`
`40`	`47`
`41`		`-subprocess.check_call(['blockade','partition','node3'])`
`42`		`-print('### blockade node3 ###')`
	`48`	`+print('### split node3 ###')`
	`49`	`+forproxyin ['rep31','rep32','rep23','rep13','arb31','arb32','arb23','arb13']:`
	`50`	`+self.toxiproxy.get_proxy(proxy).disable()`
`43`	`51`
`44`	`52`	`# clear tx history`
`45`	`53`	`self.client.get_status()`
`46`	`54`
`47`		`-foriinrange(3):`
	`55`	`+foriinrange(5):`
`48`	`56`	`print(i,datetime.datetime.now())`
`49`	`57`	`time.sleep(3)`
`50`	`58`	`aggs=self.client.get_status()`
`@@ -54,13 +62,14 @@ def test_node_partition(self):`
`54`	`62`	`# self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )`
`55`	`63`	`self.assertTrue(aggs['sumtotal_0']['isolation']+aggs['sumtotal_1']['isolation']+aggs['sumtotal_2']['isolation']==0 )`
`56`	`64`
`57`		`-subprocess.check_call(['blockade','join'])`
`58`		`-print('### deblockade node3 ###')`
	`65`	`+print('### join node3 ###')`
	`66`	`+forproxyin ['rep31','rep32','rep23','rep13','arb31','arb32','arb23','arb13']:`
	`67`	`+self.toxiproxy.get_proxy(proxy).enable()`
`59`	`68`
`60`	`69`	`# clear tx history`
`61`	`70`	`self.client.get_status()`
`62`	`71`
`63`		`-foriinrange(20):`
	`72`	`+foriinrange(5):`
`64`	`73`	`print(i,datetime.datetime.now())`
`65`	`74`	`time.sleep(3)`
`66`	`75`	`aggs=self.client.get_status()`

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!

Commit3db5770

File tree

3 files changed

3 files changed

`‎tests2/lib/bank_client.py‎`

`‎tests2/requirements.txt‎`

`‎tests2/test_recovery.py‎`

0 commit comments