@@ -9,8 +9,8 @@ class ClientCollection(object):
99def __init__ (self ,connstrs ):
1010self ._clients = []
1111
12- for cs in connstrs :
13- b = BankClient (cs )
12+ for i , cs in enumerate ( connstrs ) :
13+ b = BankClient (cs , i )
1414self ._clients .append (b )
1515
1616self ._clients [0 ].initialize ()
@@ -27,17 +27,21 @@ def start(self):
2727client .start ()
2828
2929def stop (self ):
30+ print ('collection stop called' ,self ._clients )
3031for client in self ._clients :
32+ print ('stop coll' )
3133client .stop ()
3234
3335
3436class BankClient (object ):
3537
36- def __init__ (self ,connstr ):
38+ def __init__ (self ,connstr , node_id ):
3739self .connstr = connstr
40+ self .node_id = node_id
3841self .run = Value ('b' ,True )
3942self ._history = EventHistory ()
4043self .accounts = 10000
44+ self .show_errors = True
4145
4246def initialize (self ):
4347conn = psycopg2 .connect (self .connstr )
@@ -59,6 +63,10 @@ def initialize(self):
5963def history (self ):
6064return self ._history
6165
66+ def print_error (self ,arg ,comment = '' ):
67+ if self .show_errors :
68+ print ('Node' ,self .node_id ,'got error' ,arg ,comment )
69+
6270def check_total (self ):
6371conn ,cur = self .connect ()
6472
@@ -72,16 +80,13 @@ def check_total(self):
7280print ("Isolation error, total = %d" % (res [0 ],))
7381raise BaseException
7482except psycopg2 .InterfaceError :
75- print ("Got error: " ,sys .exc_info ())
76- print ("Reconnecting" )
7783conn ,cur = self .connect (reconnect = True )
7884except :
79- print ( "Got error: " , sys .exc_info ())
85+ self . print_error ( sys .exc_info (), '3' )
8086self .history .register_finish (event_id ,'rollback' )
8187else :
8288self .history .register_finish (event_id ,'commit' )
8389
84-
8590cur .close ()
8691conn .close ()
8792
@@ -110,14 +115,10 @@ def transfer_money(self):
110115 (amount ,to_uid ))
111116
112117conn .commit ()
113- except psycopg2 .DatabaseError :
114- print ("Got error: " ,sys .exc_info ())
115- print ("Reconnecting" )
116-
117- self .history .register_finish (event_id ,'rollback' )
118+ except psycopg2 .InterfaceError :
118119conn ,cur = self .connect (reconnect = True )
119120except :
120- print ( "Got error: " , sys .exc_info ())
121+ self . print_error ( sys .exc_info (), '1' )
121122self .history .register_finish (event_id ,'rollback' )
122123else :
123124self .history .register_finish (event_id ,'commit' )
@@ -127,16 +128,17 @@ def transfer_money(self):
127128
128129def connect (self ,reconnect = False ):
129130
130- while self . run . value :
131+ while True :
131132try :
132133conn = psycopg2 .connect (self .connstr )
133134cur = conn .cursor ()
135+ return conn ,cur
134136except :
135- print ( "Got error: " , sys .exc_info ())
137+ self . print_error ( sys .exc_info (), '2' )
136138if not reconnect :
137139raise
138- else :
139- return conn , cur
140+ if not self . run . value :
141+ raise
140142
141143# def watchdog(self):
142144# while self.run.value:
@@ -156,7 +158,10 @@ def start(self):
156158return
157159
158160def stop (self ):
161+ print ('Stopping!' );
159162self .run .value = False
163+ self .total_process .join ()
164+ self .transfer_process .join ()
160165return
161166
162167def cleanup (self ):