fixup

slapos/grid/SlapObject.py

@@ -893,15 +893,16 @@ class Partition(object):
 
     print(service_list)
 
-    bad_service_list = []
+    has_failed_on_watch_process = False
     with self.getSupervisorRPC() as supervisor:
       all_process = supervisor.getAllProcessInfo()
       print(all_process)
       for process in all_process:
         if 'on-watch' in process['name'] and process['statename'] != "RUNNING":
           self.logger.info('On watch service %r is not running' % process['name'])
-          bad_service_list.append(process['name'])
-    return bad_service_list
+          has_failed_on_watch_process = True
+    if has_failed_on_watch_process:
+      raise ChildProcessError("Some on-watch process is not running, please check the log.")
     
   def cleanupFolder(self, folder_path):
     """Delete all files and folders in a specified directory

slapos/grid/slapgrid.py

@@ -1292,15 +1292,7 @@ stderr_logfile_backups=1
         if not self.force_stop:
           self._checkPromiseList(local_partition)
           computer_partition.started()
-          bad_service_list = local_partition.checkOnWatchServiceStatus()
-
-          if len(bad_service_list) > 0:
-            self.logger.removeHandler(partition_file_handler)
-            for service in bad_service_list:
-              self.logger.info('On watch service %r is not running' % service)
-            self.logger.addHandler(partition_file_handler)
-            raise ChildProcessError("No RUNNING on-watch process founded.")
-
+          local_partition.checkOnWatchServiceStatus()
         self._endInstallationTransaction(computer_partition)
       elif computer_partition_state == COMPUTER_PARTITION_STOPPED_STATE:
         try:
@@ -1498,6 +1490,11 @@ stderr_logfile_backups=1
       except slapos.slap.ResourceNotReady:
         return '(not ready)'
 
+    self.logger.info('---------------------------------')
+    self.logger.info('---------------------------------')
+    self.logger.info('---------------------------------')
+
+    self.logger.info('I want generate an output here!!!')
     self.logger.info('Finished computer partitions.')
     self.logger.info('=' * 80)
     if process_error_partition_list:
@@ -1548,11 +1545,21 @@ stderr_logfile_backups=1
       except slapos.slap.ResourceNotReady:
         return '(not ready)'
 
+    self.logger.info('---------------------------------')
+    self.logger.info('---------------------------------')
+    self.logger.info('---------------------------------')
+
+    self.logger.info('I want generate an output here!!!')
+
     if promise_error_partition_list:
       self.logger.info('Finished computer partitions.')
       for partition, exc in promise_error_partition_list:
         self.logger.info('  %s[%s]: %s', partition.getId(), getPartitionType(partition), exc)
 
+    self.logger.info('=================================')
+    self.logger.info('=================================')
+    self.logger.info('=================================')
+    self.logger.info('I want generate an output here!!!')
     # Return success value
     if not clean_run_promise:
       return SLAPGRID_PROMISE_FAIL