Changeset 5932

Timestamp:

Sep 26, 2017, 1:42:45 PM (2 years ago)

Author:

mabarracus

Message:

Fixed initialization

Location:

lliurex-analytics-server/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-analytics-server/usr/sbin/analyticsd (modified) (5 diffs)

lliurex-analytics-server/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-analytics-server (0.2.2) xenial; urgency=medium
+
+  * Fixed initialization
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Tue, 26 Sep 2017 12:37:00 +0200
+
 lliurex-analytics-server (0.2.1) xenial; urgency=medium
 

lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/sbin/analyticsd

@@ -150 +150 @@
     def __init__(self,mon,t='main'):
         self.t=t
+        self.reconnect=1
         self.empty = False
         self.conn=None
@@ -448 +449 @@
 
     def worker(self):
+        printea("Starting worker {} processing".format(self.t),'info')
         while not (self.mon.terminate and self.empty):
             if self.mon.paused or self.empty:
@@ -461 +463 @@
             else:
                 try:
-                    self.conn.begin()
+                    if self.conn == None:
+                        raise Exception('Connection not available, probably it\'s a first run')
+                    else:
+                        self.conn.begin()
                     if self.process():
                         self.conn.commit()
@@ -470 +475 @@
                 except Exception as e:
                     try:
-                        self.conn.rollback()
+                        if self.conn != None:
+                            self.conn.rollback()
                     except:
                         printea("Can't rollback last actions",'info')
                         pass
                     if e[0] != 2006:
-                        printea("Exception processing: {}".format(e))
+                        printea("Exception processing worker({}): {}".format(self.t,e))
+                    if e[0] == 2006: # SERVER GONE AWAY
+                        printea("Worker ({}) detected server gone away !!!: {}".format(self.t,e))
+                    printea("Trying to recover connection ({})".format(self.t))
+                    if self.reconnect == 100:
+                        printea("Worker ({}) says: lost connection to database, reconnection not possible, terminating all processes".format(self.t))
+                        self.mon.term()
                     else:
-                        if self.reconnect == 100:
-                            printea("Lost connection to database")
-                            self.mon.term()
-                        else:
-                            self.reconnect+=1
-                            printea('Reconnect to mysql({}) sleeping({})'.format(self.reconnect,self.reconnect*self.reconnect))
-                            time.sleep(self.reconnect*self.reconnect)
-                            try:
-                                self.init_db()
-                            except:
-                                printea('Unable to initialize worker {}'.format(self.t))
-                                pass
+                        self.reconnect+=1
+                        printea('Reconnect({}) to mysql sleeping({})'.format(self.reconnect,self.reconnect*self.reconnect))
+                        time.sleep(self.reconnect*self.reconnect)
+                        try:
+                            self.init_db()
+                            printea("Recovered worker {} connection".format(self.t),'info')
+                        except:
+                            printea('Unable to initialize worker {}'.format(self.t))
+                            pass
 
 
@@ -515 +524 @@
         for x in THREADS:
             self.db[x] = DB(self,x)
-            try:
-                self.db[x].init_db()
-            except Exception as e:
-                printea('Error initializing database connections: {}'.format(str(e)))
-                sys.exit(1)
+            #try:
+            #    self.db[x].init_db()
+            #except Exception as e:
+            #    printea('Error initializing database connections: {}'.format(str(e)))
+            #    sys.exit(1)
         printea("Monitor initialized with {} threads".format(len(THREADS)),'info')