Merge pull request #5638 from chrisburr/more-executor

[v7r2] More executor fixes

Author: fstagni

src/DIRAC/Core/Utilities/ExecutorDispatcher.py

@@ -826,14 +826,14 @@ def __sendTaskToExecutor(self, eId, eTypes=False, checkIdle=False):
             self.__msgTaskToExecutor(taskId, eId, eType)
         except UnrecoverableTaskException as e:
             self.__log.exception("Failed to call __msgTaskToExecutor for", taskId)
+            self.__states.removeTask(taskId)
             return S_ERROR(str(e))
         except Exception:
             self.__log.exception("Exception while sending task to executor")
             self.__queues.pushTask(eType, taskId, ahead=False)
             self.__states.removeTask(taskId)
             return S_ERROR("Exception while sending task to executor")
-        else:
-            return S_OK(taskId)
+        return S_OK(taskId)
 
     def __msgTaskToExecutor(self, taskId, eId, eType):
         try: