Changeset 6775 for lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/sbin/analyticsd

Timestamp:

Feb 6, 2018, 3:07:51 PM (2 years ago)

Author:

mabarracus

Message:

fix bug

File:

• lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/sbin/analyticsd (modified) (3 diffs)

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

@@ -275 +275 @@
             print(e)
 
-    def check_temporary_tables_size(self,table_name):
+    def check_temporary_tables_size(self,table_name,is_tmp=False):
         if self.t != 'load':
             return None
@@ -281 +281 @@
             size = 0
             rows = 0
-            self.cur.execute('select floor((data_length + index_length) / 1048576) `size`,table_rows from information_schema.TABLES where table_schema = "analytics" and table_name = "{}";'.format(table_name))
+            if is_tmp:
+                self.cur.execute('select floor((data_length + index_length - data_free) / 1048576) `size`,table_rows from information_schema.TABLES where table_schema = "analytics" and table_name = "{}";'.format(table_name))
+            else:
+                self.cur.execute('select floor((data_length + index_length) / 1048576) `size`,table_rows from information_schema.TABLES where table_schema = "analytics" and table_name = "{}";'.format(table_name))
 
             res=self.cur.fetchone()
@@ -812 +815 @@
                 self.cfg.write()
                 ctime=0.0
-                self.temporary_tables_size['clients'],self.temporary_tables_rows['clients']=db.check_temporary_tables_size('tmp_clients')
-                self.temporary_tables_size['packages'],self.temporary_tables_rows['packages']=db.check_temporary_tables_size('tmp_packages')
+                self.temporary_tables_size['clients'],self.temporary_tables_rows['clients']=db.check_temporary_tables_size('tmp_clients',True)
+                self.temporary_tables_size['packages'],self.temporary_tables_rows['packages']=db.check_temporary_tables_size('tmp_packages',True)
                 self.db_tables_size['clients'],self.db_tables_rows['clients']=db.check_temporary_tables_size('Client_Versions')
                 self.db_tables_size['packages'],self.db_tables_rows['packages']=db.check_temporary_tables_size('RecvPackages')