Merge pull request #7230 from chrisburr/fix-tqdb

[8.1] Fix group to vo conversion in TaskQueueDB
DIRACGrid · Oct 5, 2023 · 8f05a8b · 8f05a8b
2 parents 6cdcf6c + 08ab485
commit 8f05a8b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/DIRAC/WorkloadManagementSystem/DB/TaskQueueDB.py b/src/DIRAC/WorkloadManagementSystem/DB/TaskQueueDB.py
@@ -170,6 +170,12 @@ def _checkTaskQueueDefinition(self, tqDefDict):
         Check a task queue definition dict is valid
         """
 
+        if "OwnerGroup" in tqDefDict:
+            result = self._escapeString(Registry.getVOForGroup(tqDefDict["OwnerGroup"]))
+            if not result["OK"]:
+                return result
+            tqDefDict["VO"] = result["Value"]
+
         for field in singleValueDefFields:
             if field == "CPUTime":
                 if not isinstance(tqDefDict[field], int):
@@ -255,7 +261,7 @@ def __createTaskQueue(self, tqDefDict, priority=1, connObj=False):
             sqlSingleFields.append(field)
             sqlValues.append(tqDefDict[field])
         sqlSingleFields.append("VO")
-        sqlValues.append(Registry.getVOForGroup(tqDefDict["OwnerGroup"]))
+        sqlValues.append(tqDefDict["VO"])
         # Insert the TQ Disabled
         sqlSingleFields.append("Enabled")
         sqlValues.append("0")