Don't stop reporting/Destroying, even if something bad happens to an instance.

Do it as well for the reporting loop.

slapos/grid/slapgrid.py

@@ -876,46 +876,55 @@ class Slapgrid(object):
     #Now we loop through the different computer partitions to report
     report_usage_issue_cp_list = []
     for computer_partition in computer_partition_list:
-      filename_delete_list = []
-      computer_partition_id = computer_partition.getId()
-      instance_path = os.path.join(self.instance_root, computer_partition_id)
-      dir_reports = os.path.join(instance_path, 'var', 'xml_report')
-      #The directory xml_report contain a number of files equal
-      #to the number of software instance running inside the same partition
-      if os.path.isdir(dir_reports):
-        filename_list = os.listdir(dir_reports)
-      else:
-        filename_list = []
-      #logger.debug('name List %s' % filename_list)
-      usage = ''
-
-      for filename in filename_list:
-
-        file_path = os.path.join(dir_reports, filename)
-        if os.path.exists(file_path):
-          usage_file = open(file_path, 'r')
-          usage = usage_file.read()
-          usage_file.close()
-
-          #We check the validity of xml content of each reports
-          if not self.validateXML(usage, partition_consumption_model):
-            logger.info('WARNING: The XML file %s generated by slapreport is '
-                'not valid - This report is left as is at %s where you can '
-                'inspect what went wrong ' % (filename, dir_reports))
-            # Warn the SlapOS Master that a partition generates corrupted xml
-            # report
-          else:
-            computer_partition_usage = self.slap.registerComputerPartition(
-                    self.computer_id, computer_partition_id)
-            computer_partition_usage.setUsage(usage)
-            computer_partition_usage_list.append(computer_partition_usage)
-            filename_delete_list.append(filename)
+      try:
+        filename_delete_list = []
+        computer_partition_id = computer_partition.getId()
+        instance_path = os.path.join(self.instance_root, computer_partition_id)
+        dir_reports = os.path.join(instance_path, 'var', 'xml_report')
+        #The directory xml_report contain a number of files equal
+        #to the number of software instance running inside the same partition
+        if os.path.isdir(dir_reports):
+          filename_list = os.listdir(dir_reports)
         else:
-          logger.debug("Usage report %r not found, ignored" % file_path)
+          filename_list = []
+        #logger.debug('name List %s' % filename_list)
+        usage = ''
+        
+        for filename in filename_list:
+        
+          file_path = os.path.join(dir_reports, filename)
+          if os.path.exists(file_path):
+            usage_file = open(file_path, 'r')
+            usage = usage_file.read()
+            usage_file.close()
+        
+            #We check the validity of xml content of each reports
+            if not self.validateXML(usage, partition_consumption_model):
+              logger.info('WARNING: The XML file %s generated by slapreport is '
+                  'not valid - This report is left as is at %s where you can '
+                  'inspect what went wrong ' % (filename, dir_reports))
+              # Warn the SlapOS Master that a partition generates corrupted xml
+              # report
+            else:
+              computer_partition_usage = self.slap.registerComputerPartition(
+                      self.computer_id, computer_partition_id)
+              computer_partition_usage.setUsage(usage)
+              computer_partition_usage_list.append(computer_partition_usage)
+              filename_delete_list.append(filename)
+          else:
+            logger.debug("Usage report %r not found, ignored" % file_path)
 
-      #After sending the aggregated file we remove all the valid xml reports
-      for filename in filename_delete_list:
-        os.remove(os.path.join(dir_reports, filename))
+        #After sending the aggregated file we remove all the valid xml reports
+        for filename in filename_delete_list:
+          os.remove(os.path.join(dir_reports, filename))
+
+      # Whatever happens, don't stop processing other instances
+      except Exception:
+        computer_partition_id = computer_partition.getId()
+        exception = traceback.format_exc()
+        issue = "Cannot run usage script(s) for %r: %s" % (
+            computer_partition_id, exception)
+        logger.info(issue)
 
     for computer_partition_usage in computer_partition_usage_list:
       logger.info('computer_partition_usage_list : %s - %s' % \