fix: use MaxRAM instead of RAM for consistency

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Client/Matcher.py

@@ -73,8 +73,8 @@ def selectJob(self, resourceDescription, credDict):
 
             # Make a nice print of the resource matching parameters
             toPrintDict = dict(resourceDict)
-            if "RAM" in resourceDict:
-                toPrintDict["RAM"] = resourceDict["RAM"]
+            if "MaxRAM" in resourceDict:
+                toPrintDict["MaxRAM"] = resourceDict["MaxRAM"]
             if "NumberOfProcessors" in resourceDescription:
                 toPrintDict["NumberOfProcessors"] = resourceDescription["NumberOfProcessors"]
             toPrintDict["Tag"] = []
@@ -171,7 +171,7 @@ def _processResourceDescription(self, resourceDescription):
         """
 
         resourceDict = {}
-        for name in singleValueDefFields + multiValueMatchFields + ["RAM"]:
+        for name in singleValueDefFields + multiValueMatchFields + ["MaxRAM"]:
             if name in resourceDescription:
                 resourceDict[name] = resourceDescription[name]
 

src/DIRAC/WorkloadManagementSystem/DB/TaskQueueDB.py

@@ -277,11 +277,11 @@ def travelAndCheckType(value, validTypes, escapeValues=True):
                     tqMatchDict[field] = result["Value"]
 
         # Check range value fields (RAM requirements for matching)
-        if "RAM" in tqMatchDict:
-            result = travelAndCheckType(tqMatchDict["RAM"], int, escapeValues=False)
+        if "MaxRAM" in tqMatchDict:
+            result = travelAndCheckType(tqMatchDict["MaxRAM"], int, escapeValues=False)
             if not result["OK"]:
                 return S_ERROR(f"Match definition field RAM failed : {result['Message']}")
-            tqMatchDict["RAM"] = result["Value"]
+            tqMatchDict["MaxRAM"] = result["Value"]
 
         return S_OK(tqMatchDict)
 
@@ -796,8 +796,8 @@ def __generateTQMatchSQL(self, tqMatchDict, numQueuesToGet=1, negativeCond=None)
             sqlCondList.append(self.__generateSQLSubCond("tq.%s <= %%s" % "CPUTime", tqMatchDict["CPUTime"]))
 
         # RAM matching logic
-        if "RAM" in tqMatchDict:
-            ram = tqMatchDict["RAM"]
+        if "MaxRAM" in tqMatchDict:
+            ram = tqMatchDict["MaxRAM"]
             # Join with tq_RAM_requirements table
             sqlTables["tq_RAM_requirements"] = "ram_req"
             # Match if:
@@ -937,7 +937,7 @@ def __generateTQMatchSQL(self, tqMatchDict, numQueuesToGet=1, negativeCond=None)
         if "tq_RAM_requirements" in sqlTables:
             fromClause += " LEFT JOIN `tq_RAM_requirements` ram_req ON tq.TQId = ram_req.TQId"
 
-        tqSqlCmd = "SELECT tq.TQId, tq.Owner, tq.OwnerGroup FROM %s WHERE %s" % (fromClause, " AND ".join(sqlCondList))
+        tqSqlCmd = f"SELECT tq.TQId, tq.Owner, tq.OwnerGroup FROM {fromClause} WHERE {' AND '.join(sqlCondList)}"
 
         # Apply priorities
         tqSqlCmd = f"{tqSqlCmd} ORDER BY RAND() / tq.Priority ASC"

tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py

@@ -1167,36 +1167,36 @@ def test_chainWithRAM():
     # Remember: Matching is based on MinRAM only (resource_RAM >= MinRAM)
 
     # Resource with 1536 MB RAM (1.5 GB)
-    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "RAM": 1536}, numQueuesToGet=5)
+    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "MaxRAM": 1536}, numQueuesToGet=5)
     assert result["OK"]
     res = {int(x[0]) for x in result["Value"]}
     # Should match: tq_job3 (no requirement), tq_job4 (MinRAM=1024, 1536 >= 1024)
     assert res == {tq_job3, tq_job4}
 
     # Resource with 3072 MB RAM (3 GB)
-    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "RAM": 3072}, numQueuesToGet=5)
+    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "MaxRAM": 3072}, numQueuesToGet=5)
     assert result["OK"]
     res = {int(x[0]) for x in result["Value"]}
     # Should match: tq_job1 (MinRAM=2048), tq_job3 (no requirement), tq_job4 (MinRAM=1024)
     # tq_job2 has MinRAM=4096, so 3072 is not enough
     assert res == {tq_job1, tq_job3, tq_job4}
 
     # Resource with 6144 MB RAM (6 GB)
-    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "RAM": 6144}, numQueuesToGet=5)
+    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "MaxRAM": 6144}, numQueuesToGet=5)
     assert result["OK"]
     res = {int(x[0]) for x in result["Value"]}
     # Should match: all jobs (6144 >= all MinRAM values: 2048, 4096, 0, 1024)
     assert res == {tq_job1, tq_job2, tq_job3, tq_job4}
 
     # Resource with 10240 MB RAM (10 GB)
-    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "RAM": 10240}, numQueuesToGet=5)
+    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "MaxRAM": 10240}, numQueuesToGet=5)
     assert result["OK"]
     res = {int(x[0]) for x in result["Value"]}
     # Should match: all jobs (10GB is enough for all MinRAM requirements)
     assert res == {tq_job1, tq_job2, tq_job3, tq_job4}
 
     # Resource with 512 MB RAM
-    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "RAM": 512}, numQueuesToGet=5)
+    result = tqDB.matchAndGetTaskQueue({"CPUTime": 50000, "MaxRAM": 512}, numQueuesToGet=5)
     assert result["OK"]
     res = {int(x[0]) for x in result["Value"]}
     # Should only match: tq_job3 (no requirement) - 512MB is below all other MinRAM values