NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commite8d34a8

committed

Merge branch 'master' ofhttps://github.com/postgrespro/postgres_cluster

2 parents0395d7b +4a07b0b commite8d34a8Copy full SHA for e8d34a8

File tree

3 files changed

+43

-19

lines changed

contrib
- mmts
  - Dockerfile
  - tests2/lib
    - bank_client.py
- raftable
  - worker.c

3 files changed

+43

-19

lines changed

`‎contrib/mmts/Dockerfile‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ USER postgres`
`31`	`31`	`ENV CFLAGS -O0`
`32`	`32`	`WORKDIR /pg`
`33`	`33`
	`34`	`+ENV REBUILD false`
	`35`	`+`
`34`	`36`	`RUN cd /pg && \`
`35`	`37`	`git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \`
`36`	`38`	`cd /pg/postgres_cluster && \`
`@@ -40,9 +42,6 @@ RUN cd /pg && \`
`40`	`42`	`ENV PATH /pg/install/bin:$PATH`
`41`	`43`	`ENV PGDATA /pg/data`
`42`	`44`
`43`		`-`
`44`		`-# Here we can insert some ENV var to invalidate subsequent layers`
`45`		`-`
`46`	`45`	`RUN cd /pg/postgres_cluster/contrib/raftable && make install`
`47`	`46`
`48`	`47`	`RUN mkdir /pg/mmts`

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

Lines changed: 38 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,41 +67,65 @@ def print_error(self, arg, comment=''):`
`67`	`67`
`68`	`68`	`defcheck_total(self):`
`69`	`69`	`conn,cur=self.connect()`
	`70`	`+i=0`
`70`	`71`
`71`	`72`	`whileself.run.value:`
	`73`	`+i+=1`
	`74`	`+`
`72`	`75`	`event_id=self.history.register_start('total')`
`73`	`76`
	`77`	`+ifnotconn.closed:`
	`78`	`+try :`
	`79`	`+conn=psycopg2.connect(self.connstr)`
	`80`	`+cur=conn.cursor()`
	`81`	`+except :`
	`82`	`+self.history.register_finish(event_id,'CantConnect')`
	`83`	`+next`
	`84`	`+`
	`85`	`+amount=1`
	`86`	`+from_uid=random.randrange(1,self.accounts+1)`
	`87`	`+to_uid=random.randrange(1,self.accounts+1)`
	`88`	`+`
`74`	`89`	`try:`
`75`	`90`	`cur.execute('select sum(amount) from bank_test')`
`76`	`91`	`res=cur.fetchone()`
`77`	`92`	`ifres[0]!=0:`
`78`	`93`	`print("Isolation error, total = %d"% (res[0],))`
`79`	`94`	`raiseBaseException`
	`95`	`+exceptBaseException:`
	`96`	`+raiseBaseException`
`80`	`97`	`exceptpsycopg2.InterfaceError:`
`81`		`-conn,cur=self.connect(reconnect=True)`
`82`		`-except:`
`83`		`-self.print_error(sys.exc_info(),'3')`
`84`		`-self.history.register_finish(event_id,'rollback')`
`85`		`-else:`
	`98`	`+self.history.register_finish(event_id,'InterfaceError')`
	`99`	`+except :`
	`100`	`+self.history.register_finish(event_id,'OtherError')`
	`101`	`+else :`
`86`	`102`	`self.history.register_finish(event_id,'commit')`
`87`	`103`
`88`	`104`	`cur.close()`
`89`	`105`	`conn.close()`
`90`	`106`
`91`	`107`	`deftransfer_money(self):`
`92`		`-#conn = psycopg2.connect(self.connstr)`
`93`		`-#cur = conn.cursor()`
`94`	`108`	`conn,cur=self.connect()`
`95`	`109`
`96`	`110`	`i=0`
	`111`	`+`
`97`	`112`	`whileself.run.value:`
`98`	`113`	`i+=1`
	`114`	`+`
	`115`	`+event_id=self.history.register_start('transfer')`
	`116`	`+`
	`117`	`+ifnotconn.closed:`
	`118`	`+try :`
	`119`	`+conn=psycopg2.connect(self.connstr)`
	`120`	`+cur=conn.cursor()`
	`121`	`+except :`
	`122`	`+self.history.register_finish(event_id,'CantConnect')`
	`123`	`+next`
	`124`	`+`
`99`	`125`	`amount=1`
`100`	`126`	`from_uid=random.randrange(1,self.accounts+1)`
`101`	`127`	`to_uid=random.randrange(1,self.accounts+1)`
`102`	`128`
`103`		`-event_id=self.history.register_start('transfer')`
`104`		`-`
`105`	`129`	`try:`
`106`	`130`	`cur.execute('''update bank_test`
`107`	`131`	`set amount = amount - %s`
`@@ -111,14 +135,13 @@ def transfer_money(self):`
`111`	`135`	`set amount = amount + %s`
`112`	`136`	`where uid = %s''',`
`113`	`137`	`(amount,to_uid))`
`114`		`-`
`115`	`138`	`conn.commit()`
	`139`	`+`
`116`	`140`	`exceptpsycopg2.InterfaceError:`
`117`		`-conn,cur=self.connect(reconnect=True)`
`118`		`-except:`
`119`		`-self.print_error(sys.exc_info(),'1')`
`120`		`-self.history.register_finish(event_id,'rollback')`
`121`		`-else:`
	`141`	`+self.history.register_finish(event_id,'InterfaceError')`
	`142`	`+except :`
	`143`	`+self.history.register_finish(event_id,'OtherError')`
	`144`	`+else :`
`122`	`145`	`self.history.register_finish(event_id,'commit')`
`123`	`146`
`124`	`147`	`cur.close()`

`‎contrib/raftable/worker.c‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,9 @@ static bool accept_client(void)`
`241`	`241`	`staticboolpull_from_socket(Client*c)`
`242`	`242`	`{`
`243`	`243`	`void*dst;`
`244`		`-size_tavail,recved;`
	`244`	`+size_tavail;`
	`245`	`+ssize_trecved;`
	`246`	`+`
`245`	`247`	`if (!c->good)return false;`
`246`	`248`	`Assert(c->sock >=0);`
`247`	`249`	`Assert(c->bufrecved <=BUFLEN);`

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!

Commite8d34a8

File tree

3 files changed

3 files changed

`‎contrib/mmts/Dockerfile‎`

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

`‎contrib/raftable/worker.c‎`

0 commit comments