Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1115 stopped flows were marked cpuS. fix #1116

Merged
merged 2 commits into from
Jun 19, 2024
Merged

#1115 stopped flows were marked cpuS. fix #1116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294444b
#1115 stopped flows were marked cpuS. fix
petersilva Jun 19, 2024
d7b2de5
cpuS should only override running state, not any others
petersilva Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions sarracenia/sr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading