From 5a04fd85d39f8188bdfc1c377711c4cce5060ed0 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Tue, 3 Sep 2024 12:22:01 -0400 Subject: [PATCH] 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 --- .../psconfig/client/pscheduler/task_manager.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py b/psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py index 482c7fb..db49b43 100644 --- a/psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py +++ b/psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py @@ -389,10 +389,8 @@ def _evaluate_task(self, tmap, need_new_task, new_start_time): if ((not old_task['task'].detail_exclusive()) #not exclusive and old_task['task'].detail_multiresult() #is multi-result and (old_task_start_ts + 15*60) < int(time.time()) #started at least 15 min ago - and ( - (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) - 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) - )): + and (old_task['task'].detail_runs_started() is not None and (old_task['task'].detail_runs_started()== 0)) #no runs started + ): #if background-multi, one or less runs and start time is 15 minutes (arbitrary) # in the past the start time is immediately. Fixes special cases where bgm