save the interrupt to the node

Signed-off-by: shaoshian <1196753438@qq.com>

Author: Shaoshian

analyzer/analyzer.py

@@ -104,7 +104,6 @@ def print_remote_log(self,node_log,node):
         except Exception as e:
                 common.printout("WARNING","print_remote_log failed")
                 common.printout("WARNING",str(e))
-            
 
     def process_data(self):
         case_type = re.findall('\d\-\S+', self.cluster["dest_dir"])[0].split('-')[2]
@@ -138,7 +137,6 @@ def process_data(self):
                 common.scp(self.cluster["user"],node,remote_file2,self.cluster["tmp_dir"])
                 common.scp(self.cluster["user"],node,remote_file3,self.cluster["tmp_dir"])
                 common.scp(self.cluster["user"],node,remote_file4,self.cluster["tmp_dir"])
-                
                 try:
                     common.pdsh(self.cluster["user"],[node],"echo \"\" > " + self.cluster["tmp_dir"] +node+"-cetune_console.log")
                 except:
@@ -196,7 +194,6 @@ def process_data(self):
                     workload = self._process_remote_data(workload_file)
                     self.result["vclient"][dir_name]=system
                     self.result["workload"].update(workload)
-            
         #-------------------remote   end--------------------------
         else:
             for dir_name in os.listdir(dest_dir):
@@ -523,7 +520,7 @@ def interrupt_diff(self,dest_dir,node_name,s_path,e_path):
         s_p = s_path
         e_p = e_path
         result_name = node_name+'_interrupt.txt'
-        result_path = os.path.join(dest_dir.replace('raw','conf'),result_name)
+        result_path = os.path.join(dest_dir,node_name,result_name)
         s_l = []
         e_l = []
         diff_list = []
@@ -566,7 +563,7 @@ def interrupt_diff(self,dest_dir,node_name,s_path,e_path):
                 output.writelines(line_str)
             output.close()
         else:
-            print 'ERROR: interrupt_start lines and interrupt_end lines are diffrent ! can not calculate diffrent value!'
+            common.printout("ERROR",'interrupt_start lines and interrupt_end lines are diffrent ! can not calculate diffrent value!')
 
     def check_interrupt(self,s_inter,e_inter):
         result = "True"

analyzer/analyzer_remote.py

@@ -421,7 +421,7 @@ def interrupt_diff(self,dest_dir,node_name,s_path,e_path):
         s_p = s_path
         e_p = e_path
         result_name = node_name+'_interrupt.txt'
-        result_path = os.path.join(dest_dir.replace('raw','conf'),result_name)
+        result_path = os.path.join(dest_dir,node_name,result_name)
         s_l = []
         e_l = []
         diff_list = []
@@ -464,7 +464,7 @@ def interrupt_diff(self,dest_dir,node_name,s_path,e_path):
                 output.writelines(line_str)
             output.close()
         else:
-            print 'ERROR: interrupt_start lines and interrupt_end lines are diffrent ! can not calculate diffrent value!'
+            common.printout("ERROR",'interrupt_start lines and interrupt_end lines are diffrent ! can not calculate diffrent value!')
 
     def check_interrupt(self,s_inter,e_inter):
         result = "True"