@@ -67,41 +67,65 @@ def print_error(self, arg, comment=''):
6767
6868def check_total (self ):
6969conn ,cur = self .connect ()
70+ i = 0
7071
7172while self .run .value :
73+ i += 1
74+
7275event_id = self .history .register_start ('total' )
7376
77+ if not conn .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+
7489try :
7590cur .execute ('select sum(amount) from bank_test' )
7691res = cur .fetchone ()
7792if res [0 ]!= 0 :
7893print ("Isolation error, total = %d" % (res [0 ],))
7994raise BaseException
95+ except BaseException :
96+ raise BaseException
8097except psycopg2 .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 :
86102self .history .register_finish (event_id ,'commit' )
87103
88104cur .close ()
89105conn .close ()
90106
91107def transfer_money (self ):
92- #conn = psycopg2.connect(self.connstr)
93- #cur = conn.cursor()
94108conn ,cur = self .connect ()
95109
96110i = 0
111+
97112while self .run .value :
98113i += 1
114+
115+ event_id = self .history .register_start ('transfer' )
116+
117+ if not conn .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+
99125amount = 1
100126from_uid = random .randrange (1 ,self .accounts + 1 )
101127to_uid = random .randrange (1 ,self .accounts + 1 )
102128
103- event_id = self .history .register_start ('transfer' )
104-
105129try :
106130cur .execute ('''update bank_test
107131 set amount = amount - %s
@@ -111,14 +135,13 @@ def transfer_money(self):
111135 set amount = amount + %s
112136 where uid = %s''' ,
113137 (amount ,to_uid ))
114-
115138conn .commit ()
139+
116140except psycopg2 .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 :
122145self .history .register_finish (event_id ,'commit' )
123146
124147cur .close ()