fix: do not divide maxRAM

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py

@@ -227,7 +227,7 @@ def __checkDiskSpace(self, totalSize):
         diskSpace = getDiskSpace(self.__getDownloadDir(False))  # MB
         availableBytes = diskSpace * 1024 * 1024  # bytes
         bufferGBs = gConfig.getValue(
-            os.path.join("/Systems/WorkloadManagement/JobWrapper", "JobWrapper", "MinOutputDataBufferGB"), 5.0
+            os.path.join("/Systems/WorkloadManagement/JobWrapper", "MinOutputDataBufferGB"), 5.0
         )
         data = bufferGBs * 1024 * 1024 * 1024  # bufferGBs in bytes
         if (data + totalSize) < availableBytes:

src/DIRAC/WorkloadManagementSystem/Client/Matcher.py

@@ -196,7 +196,7 @@ def _processResourceDescription(self, resourceDescription):
         maxRAM = resourceDescription.get("MaxRAM")
         if maxRAM:
             try:
-                maxRAM = int(maxRAM / 1000)
+                maxRAM = int(maxRAM)
             except ValueError:
                 maxRAM = None
         nProcessors = resourceDescription.get("NumberOfProcessors")

src/DIRAC/WorkloadManagementSystem/Executor/test/Test_Executor.py

@@ -55,8 +55,8 @@ def test__applySiteFilter(sites, banned, expected):
         ({"Tag": "bof"}, ["bof"]),
         ({"Tags": "bof, bif"}, ["bof", "bif"]),
         ({"MaxRAM": 2500}, ["2500MB"]),
-        ({"Tags": "bof, bif", "MaxRAM": 2048}, ["bof", "bif", "2500MB"]),
-        ({"WholeNode": "yes", "MaxRAM": 2048}, ["WholeNode", "MultiProcessor", "2500MB"]),
+        ({"Tags": "bof, bif", "MaxRAM": 2048}, ["bof", "bif", "2048MB"]),
+        ({"WholeNode": "yes", "MaxRAM": 2048}, ["WholeNode", "MultiProcessor", "2048MB"]),
         ({"NumberOfProcessors": 1}, []),
         ({"NumberOfProcessors": 4}, ["MultiProcessor", "4Processors"]),
         ({"NumberOfProcessors": 4, "MinNumberOfProcessors": 2}, ["MultiProcessor", "4Processors"]),

tests/Jenkins/dirac-cfg-update-server.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-""" update local cfg
-"""
+"""update local cfg"""
+
 import os
 import sys
 
 from DIRAC.Core.Base.Script import Script
 
-Script.setUsageMessage("\n".join([__doc__.split("\n")[1], "Usage:", f"  {Script.scriptName} [options] ... DB ..."]))
+Script.setUsageMessage("\n".join([__doc__.split("\n")[0], "Usage:", f"  {Script.scriptName} [options] ... DB ..."]))
 
 Script.parseCommandLine()
 
@@ -553,8 +553,8 @@
 # to avoid having to wait while testing rescheduling
 csAPI.setOption("Systems/WorkloadManagement/Executors/Optimizers/JobScheduling/RescheduleDelays", "0")
 
-csAPI.createSection("Systems/WorkloadManagement/Production/JobWrapper/")
-csAPI.setOption("Systems/WorkloadManagement/Production/JobWrapper/MinOutputDataBufferGB", 1)
+csAPI.createSection("Systems/WorkloadManagement/JobWrapper/")
+csAPI.setOption("Systems/WorkloadManagement/JobWrapper/MinOutputDataBufferGB", 1)
 
 # Final action: commit in CS
 res = csAPI.commit()