add rebuild option to dockerfile

kelvich · kelvich · commit e2867f022011 · 2016-06-23T20:01:40.000+03:00
diff --git a/contrib/mmts/Dockerfile b/contrib/mmts/Dockerfile
@@ -31,6 +31,8 @@ USER postgres
 ENV CFLAGS -O0
 WORKDIR /pg
 
+ENV REBUILD false
+
 RUN cd /pg && \
 	git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \
 	cd /pg/postgres_cluster && \
@@ -40,9 +42,6 @@ RUN cd /pg && \
 ENV PATH /pg/install/bin:$PATH
 ENV PGDATA /pg/data
 
-
-# Here we can insert some ENV var to invalidate subsequent layers
-
 RUN cd /pg/postgres_cluster/contrib/raftable && make install
 
 RUN mkdir /pg/mmts
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -67,41 +67,65 @@ def print_error(self, arg, comment=''):
 
     def check_total(self):
         conn, cur = self.connect()
+        i = 0
 
         while self.run.value:
+            i += 1
+
             event_id = self.history.register_start('total')
 
+            if not conn.closed:
+                try :
+                    conn = psycopg2.connect(self.connstr)
+                    cur = conn.cursor()
+                except :
+                    self.history.register_finish(event_id, 'CantConnect')
+                    next
+
+            amount = 1
+            from_uid = random.randrange(1, self.accounts + 1)
+            to_uid = random.randrange(1, self.accounts + 1)
+
             try:
                 cur.execute('select sum(amount) from bank_test')
                 res = cur.fetchone()
                 if res[0] != 0:
                     print("Isolation error, total = %d" % (res[0],))
                     raise BaseException
+            except BaseException:
+                raise BaseException
             except psycopg2.InterfaceError:
-                conn, cur = self.connect(reconnect=True)
-            except:
-                self.print_error(sys.exc_info(),'3')
-                self.history.register_finish(event_id, 'rollback')
-            else:
+                self.history.register_finish(event_id, 'InterfaceError')
+            except :
+                self.history.register_finish(event_id, 'OtherError')
+            else :
                 self.history.register_finish(event_id, 'commit')
 
         cur.close()
         conn.close()
 
     def transfer_money(self):
-        #conn = psycopg2.connect(self.connstr)
-        #cur = conn.cursor()
         conn, cur = self.connect()
 
         i = 0
+
         while self.run.value:
             i += 1
+
+            event_id = self.history.register_start('transfer')
+
+            if not conn.closed:
+                try :
+                    conn = psycopg2.connect(self.connstr)
+                    cur = conn.cursor()
+                except :
+                    self.history.register_finish(event_id, 'CantConnect')
+                    next
+
             amount = 1
             from_uid = random.randrange(1, self.accounts + 1)
             to_uid = random.randrange(1, self.accounts + 1)
 
-            event_id = self.history.register_start('transfer')
-
             try:
                 cur.execute('''update bank_test
                     set amount = amount - %s
@@ -111,14 +135,13 @@ def transfer_money(self):
                     set amount = amount + %s
                     where uid = %s''',
                     (amount, to_uid))
-
                 conn.commit()
+
             except psycopg2.InterfaceError:
-                conn, cur = self.connect(reconnect=True)
-            except:
-                self.print_error(sys.exc_info(),'1')
-                self.history.register_finish(event_id, 'rollback')
-            else:
+                self.history.register_finish(event_id, 'InterfaceError')
+            except :
+                self.history.register_finish(event_id, 'OtherError')
+            else :
                 self.history.register_finish(event_id, 'commit')
 
         cur.close()
