Skip to content

Commit

Permalink
do not use HTC to kill unsubmitted tasks. Fix dmwm#8874
Browse files Browse the repository at this point in the history
  • Loading branch information
belforte committed Jan 9, 2025
1 parent d046922 commit c4ba529
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/python/TaskWorker/Actions/DagmanKiller.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ def executeInternal(self, *args, **kwargs): # pylint: disable=unused-argument
raise ValueError("No proxy provided")
self.proxy = self.task['user_proxy'] # pylint: disable=attribute-defined-outside-init

if not self.task['tw_name'] or not self.task['clusterid']:
self.logger.info("Task %s was not submitted to HTCondor scheduler yet", self.workflow)
return

self.logger.info("About to kill workflow: %s.", self.workflow)

self.workflow = str(self.workflow) # pylint: disable=attribute-defined-outside-init
if not WORKFLOW_RE.match(self.workflow):
raise Exception("Invalid workflow name.")

# Query HTCondor for information about running jobs and update Dashboard appropriately
if self.task['tm_collector']:
Expand All @@ -65,7 +66,8 @@ def executeInternal(self, *args, **kwargs): # pylint: disable=unused-argument

# Note that we can not send kills for jobs not in queue at this time; we'll need the
# DAG FINAL node to be fixed and the node status to include retry number.
return self.killAll(const)
self.killAll(const)
return

def killAll(self, jobConst):

Expand Down

0 comments on commit c4ba529

Please sign in to comment.