Skip to content

Commit 5a04fd8

Browse files
committed
Fix for powstream leak issue when powstream is unable to connect to other end. The line removed was a special case for a special case in an old version of pscheduler
1 parent 3276bcd commit 5a04fd8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,8 @@ def _evaluate_task(self, tmap, need_new_task, new_start_time):
389389
if ((not old_task['task'].detail_exclusive()) #not exclusive
390390
and old_task['task'].detail_multiresult() #is multi-result
391391
and (old_task_start_ts + 15*60) < int(time.time()) #started at least 15 min ago
392-
and (
393-
(old_task['task'].detail_runs_started() is not None and (old_task['task'].detail_runs_started()== 0)) #have at no runs started (v1.1 and later)
394-
or (old_task['task'].detail_runs_started() is not None and (old_task['task'].detail_runs() <= 2)) #have less than two runs (not 1 because count bugged) (pre-v1.1)
395-
)):
392+
and (old_task['task'].detail_runs_started() is not None and (old_task['task'].detail_runs_started()== 0)) #no runs started
393+
):
396394

397395
#if background-multi, one or less runs and start time is 15 minutes (arbitrary)
398396
# in the past the start time is immediately. Fixes special cases where bgm

0 commit comments

Comments
 (0)