fix: RAM is not anymore a Tag

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Client/JobState/JobState.py

@@ -1,11 +1,16 @@
-""" This object is a wrapper for setting and getting jobs states
-"""
+"""This object is a wrapper for setting and getting jobs states"""
+
 from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.WorkloadManagementSystem.Client import JobStatus
 from DIRAC.WorkloadManagementSystem.Client.JobState.JobManifest import JobManifest
 from DIRAC.WorkloadManagementSystem.DB.JobDB import JobDB
 from DIRAC.WorkloadManagementSystem.DB.JobLoggingDB import JobLoggingDB
-from DIRAC.WorkloadManagementSystem.DB.TaskQueueDB import TaskQueueDB, multiValueDefFields, singleValueDefFields
+from DIRAC.WorkloadManagementSystem.DB.TaskQueueDB import (
+    TaskQueueDB,
+    multiValueDefFields,
+    singleValueDefFields,
+    rangeValueDefFields,
+)
 from DIRAC.WorkloadManagementSystem.Service.JobPolicy import (
     RIGHT_CHANGE_STATUS,
     RIGHT_GET_INFO,
@@ -351,6 +356,10 @@ def insertIntoTQ(self, manifest=None):
             if name in reqCfg:
                 jobReqDict[name] = reqCfg.getOption(name, [])
 
+        for name in rangeValueDefFields:
+            if name in reqCfg:
+                jobReqDict[name] = reqCfg[name]
+
         jobPriority = reqCfg.getOption("UserPriority", 1)
 
         result = self.__retryFunction(2, JobState.__db.tqDB.insertJob, (self.__jid, jobReqDict, jobPriority))

src/DIRAC/WorkloadManagementSystem/Executor/JobScheduling.py

@@ -249,7 +249,7 @@ def optimizeJob(self, jid, jobState):
 
         # Get stageSites[0] because it has already been randomized and it's as good as any in stageSites
         stageSite = stageSites[0]
-        self.jobLog.verbose(" Staging site will be", stageSite)
+        self.jobLog.verbose("Staging site will be", stageSite)
         stageData = idSites[stageSite]
         # Set as if everything has already been staged
         stageData["disk"] += stageData["tape"]
@@ -351,12 +351,6 @@ def _getTagsFromManifest(self, jobManifest):
                 tagList.append("WholeNode")
                 tagList.append("MultiProcessor")
 
-        # sorting out the RAM (this should be probably coded ~same as number of processors)
-        if "MaxRAM" in jobManifest:
-            maxRAM = jobManifest.getOption("MaxRAM", 0)
-            if maxRAM:
-                tagList.append(f"{maxRAM}MB")
-
         # other tags? Just add them
         if "Tags" in jobManifest:
             tagList.extend(jobManifest.getOption("Tags", []))