sweep: #5957 JobAgent polling time fix

Author: fstagni

src/DIRAC/Core/Base/AgentReactor.py

@@ -61,7 +61,7 @@ def __init__(self, baseAgentName):
         self.__loader = ModuleLoader("Agent", PathFinder.getAgentSection, AgentModule)
         self.__tasks = {}
         self.__baseAgentName = baseAgentName
-        self.__scheduler = ThreadScheduler.ThreadScheduler(enableReactorThread=False, minPeriod=30)
+        self.__scheduler = ThreadScheduler.ThreadScheduler(enableReactorThread=False, minPeriod=10)
         self.__alive = True
         self.__running = False
 

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

@@ -177,14 +177,17 @@ def execute(self):
 
         self.stopAfterFailedMatches = self.am_getOption("StopAfterFailedMatches", self.stopAfterFailedMatches)
         if not jobRequest["OK"]:
-            # if we don't match a job, independently from the reason,
-            # we wait a bit longer before trying again
-            self.am_setOption("PollingTime", int(self.am_getOption("PollingTime") * 1.5))
             res = self._checkMatchingIssues(jobRequest)
             if not res["OK"]:
                 self._finish(res["Message"])
+                return res
+
+            # if we don't match a job, independently from the reason,
+            # we wait a bit longer before trying again
+            time.sleep(int(self.am_getOption("PollingTime")) * (self.matchFailedCount + 1) * 2)
             return res
 
+        # If we are, we matched a job
         # Reset the Counter
         self.matchFailedCount = 0