Merge pull request #1116 from MetPX/issue1115

#1115 stopped flows were marked cpuS. fix
MetPX · Jun 19, 2024 · be1ad27 · be1ad27
2 parents 6337812 + d7b2de5
commit be1ad27
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/sarracenia/sr.py b/sarracenia/sr.py
@@ -492,7 +492,7 @@ def _read_state_dir(self):
                                 if pathname[-4:] == '.pid':
                                     i = int(pathname[-6:-4])
                                     if t.isdigit():
-                                        #print( "%s/%s instance: %s, pid: %s" % ( c, cfg, i, t ) )
+                                        #print( "pid assignment: {c}/{cfg} instance: {i}, pid: {t}" )
                                         self.states[c][cfg]['instance_pids'][i] = int(t)
                                 elif pathname[-6:] == '.qname':
                                     self.states[c][cfg]['queueName'] = t
@@ -1050,8 +1050,7 @@ def _resolve(self):
                     resource_usage={ 'uss': 0, 'rss': 0, 'vms':0, 'user_cpu': 0.0, 'system_cpu':0.0 }
                     nvip=False
                     for i in self.states[c][cfg]['instance_pids']:
-                        if self.states[c][cfg]['instance_pids'][
-                                i] not in self.procs:
+                        if self.states[c][cfg]['instance_pids'][i] not in self.procs:
                             self.states[c][cfg]['missing_instances'].append(i)
                         else:
                             observed_instances += 1
@@ -1114,12 +1113,11 @@ def _resolve(self):
                         flow_status = 'idle'
                     elif (now-self.states[c][cfg]['metrics']['rxLast']) > self.configs[c][cfg]['options'].runStateThreshold_idle:
                         flow_status = 'idle'
-                    else:
-                        flow_status = 'running'
-
-                    if self.states[c][cfg]['metrics']['msgRate'] > 0 and \
+                    elif self.states[c][cfg]['metrics']['msgRate'] > 0 and \
                            self.states[c][cfg]['metrics']['msgRateCpu'] < self.configs[c][cfg]['options'].runStateThreshold_cpuSlow:
                         flow_status = 'cpuSlow'
+                    else:
+                        flow_status = 'running'
 
                     self.states[c][cfg]['resource_usage'] = copy.deepcopy(resource_usage)
                     self.configs[c][cfg]['status'] = flow_status