Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return resource control to ats to avoid scheduling issues with the flux adapter. #107

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions ats/atsMachines/fluxScheduled.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,10 @@ def calculateCommandList(self, test):
FluxScheduled.set_nt_num_nodes(self, test)
# nn = test.options.get("nn", 0)

max_time = self.timelimit
ret.append(f"-t{max_time}")
# Remove to let ats control it and avoid needing excessively long allocation requests
# to prevent flux refusing to schedule jobs
# max_time = self.timelimit
# ret.append(f"-t{max_time}")

#if np > self.coresPerNode:
# nn = ceil(np / self.coresPerNode)
Expand Down Expand Up @@ -297,15 +299,4 @@ def remainingCapacity(self):
if self.numberNodesExclusivelyUsed >= self.numNodes:
return 0
else:
if (flux.resource.list.resource_list(self.fluxHandle).get().free.nnodes < 1):
return 0
else:
return flux.resource.list.resource_list(self.fluxHandle).get().free.ncores








return self.numProcsAvailable