Ticket #855: mysql-timeout-bcfg2-0-9-6.patch

src/lib/Server/Reports/importscript.py

@@ -1 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
 '''Imports statistics.xml and clients.xml files in to database backend for new statistics engine'''
 __revision__ = '$Revision$'
 
@@ -56 +56 @@
 def load_stats(cdata, sdata, vlevel, quick=False, location=''):
     cursor = connection.cursor()
     clients = {}
-    cursor.execute("SELECT name, id from reports_client;")
-    [clients.__setitem__(a, b) for a, b in cursor.fetchall()]
     
     for node in sdata.findall('Node'):
         name = node.get('name')
+        cursor.execute("SELECT name, id from reports_client where name = '%s';" % (name) )
+        [clients.__setitem__(a, b) for a, b in cursor.fetchall()]
         if not clients.has_key(name):
             cursor.execute(\
                 "INSERT INTO reports_client VALUES (NULL, %s, %s, NULL, NULL)",
@@ -167 +167 @@
                         cursor.execute("INSERT INTO reports_performance_interaction VALUES (NULL, %s, %s);",
                                        [item_id, current_interaction.id])
                     except:
+                        # WTF
                         pass
 
-    if vlevel > 1:
-        print("----------------INTERACTIONS SYNCED----------------")
-    cursor.execute("select reports_interaction.id, x.client_id from (select client_id, MAX(timestamp) as timer from reports_interaction Group BY client_id) x, reports_interaction where reports_interaction.client_id = x.client_id AND reports_interaction.timestamp = x.timer")
-    for row in cursor.fetchall():
-        cursor.execute("UPDATE reports_client SET current_interaction_id = %s where reports_client.id = %s",
-                       [row[0],row[1]])
-    if vlevel > 1:
-        print("------------LATEST INTERACTION SET----------------")
-
     for key in pingability.keys():
         if key not in clients:
             #print "Ping Save Problem with client %s" % name

src/lib/Component.py

@@ -71 +71 @@
                     self.cleanup = False
                     return
             try:
+                # forcing django to reinitiate a new database connection for each fork()
+                from django.db import connection
+                connection.connection = None 
                 self.send_response(200)
                 self.send_header("Content-type", "text/xml")
                 self.send_header("Content-length", str(len(response)))
@@ -217 +220 @@
                 if pid:
                     self.children.append(pid)
                     raise ForkedChild
+            # forcing django to reinitiate a new database connection for each fork()
+            from django.db import connection
+            connection.connection = None 
             # all handlers must take address as the first argument
             response = self._dispatch(method, (address, ) + params)
             # wrap response in a singleton tuple