Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def submitJob(self, executableFile, proxy=None, **kwargs):
# if there's a max RAM available to the job, use that
if self.maxRAM:
self.ceParameters["MemoryLimitMB"] = min(
self.maxRAM, self.ceParameters.get("MemoryLimitMB", 1024 * 1024)
self.maxRAM, int(self.ceParameters.get("MemoryLimitMB", 1024 * 1024))
) # 1024 * 1024 is an arbitrary large number
result = CG2Manager().systemCall(
0, cmd, callbackFunction=self.sendOutput, env=self.__getEnv(), ceParameters=self.ceParameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def getAvailableRAM(siteName=None, gridCE=None, queue=None):
gLogger.info("Looking in", csPath)
availableRAM = gConfig.getValue(csPath, None)
if availableRAM:
return availableRAM
return int(availableRAM)

# 3) checks if 'WholeNode' is one of the used tags
# Tags of the CE
Expand Down Expand Up @@ -277,6 +277,6 @@ def getRAMForJob(jobID):
# from /Resources/Computing/JobLimits/jobID/MaxRAM (set by PoolComputingElement)
ram = gConfig.getValue(f"Resources/Computing/JobLimits/{jobID}/MaxRAM")
if ram:
return ram
return int(ram)

return getAvailableRAM()
Loading