DIRAC 9.0.0a54__py3-none-any.whl → 9.0.7__py3-none-any.whl

DIRAC/RequestManagementSystem/ConfigTemplate.cfg

@@ -44,19 +44,19 @@ Agents
   {
     PollingTime = 60
     # number of Requests to execute per cycle
-    RequestsPerCycle = 100
+    RequestsPerCycle = 300
     # minimum number of workers process in the ProcessPool
-    MinProcess = 20
+    MinProcess = 50
     # maximum number of workers process in the ProcessPool; recommended to set it to the same value as MinProcess
-    MaxProcess = 20
+    MaxProcess = 50
     # queue depth of the ProcessPool
-    ProcessPoolQueueSize = 20
+    ProcessPoolQueueSize = 100
     # timeout for the ProcessPool finalization
     ProcessPoolTimeout = 900
     # sleep time before retrying to get a free slot in the ProcessPool
-    ProcessPoolSleep = 5
+    ProcessPoolSleep = 1
     # If a positive integer n is given, we fetch n requests at once from the DB. Otherwise, one by one
-    BulkRequest = 0
+    BulkRequest = 300
     OperationHandlers
     {
       ForwardDISET

DIRAC/RequestManagementSystem/DB/test/RMSTestScenari.py

@@ -6,6 +6,7 @@ integration tests (Test_ReqDB.py)
 # pylint: disable=invalid-name,wrong-import-position
 import time
 
+import pytest
 
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
@@ -42,6 +43,7 @@ def test_stress(reqDB):
         assert delete["OK"], delete
 
 
+@pytest.mark.slow
 def test_stressBulk(reqDB):
     """stress test bulk"""
 

DIRAC/ResourceStatusSystem/Client/SiteStatus.py

@@ -1,4 +1,4 @@
-""" SiteStatus helper
+"""SiteStatus helper
 
 Module that acts as a helper for knowing the status of a site.
 It takes care of switching between the CS and the RSS.
@@ -195,7 +195,7 @@ class SiteStatus(metaclass=DIRACSingleton):
 
         return S_OK(siteList)
 
-    def setSiteStatus(self, site, status, comment="No comment"):
+    def setSiteStatus(self, site, status, comment="No comment", expiry=None):
         """
         Set the status of a site in the 'SiteStatus' table of RSS
 
@@ -231,6 +231,8 @@ class SiteStatus(metaclass=DIRACSingleton):
             return S_ERROR(f"Unable to get user proxy info {result['Message']} ")
 
         tokenExpiration = datetime.utcnow() + timedelta(days=1)
+        if expiry:
+            tokenExpiration = expiry
 
         self.rssCache.acquireLock()
         try:

DIRAC/ResourceStatusSystem/Command/FreeDiskSpaceCommand.py

@@ -121,7 +121,9 @@ class FreeDiskSpaceCommand(Command):
             "Site": siteRes["Value"] if siteRes["Value"] else "unassigned",
         }
 
-        results["Used"] = results["Total"] - results["Free"]
+        # There are sometimes small discrepencies which can lead to negative
+        # used values.
+        results["Used"] = max(0, results["Total"] - results["Free"])
 
         for sType in ["Total", "Free", "Used"]:
             spaceTokenAccounting = StorageOccupancy()

DIRAC/ResourceStatusSystem/Utilities/CSHelpers.py

@@ -3,11 +3,10 @@ Module containing functions interacting with the CS and useful for the RSS
 modules.
 """
 
-from DIRAC import gConfig, gLogger, S_OK
+from DIRAC import S_OK, gConfig, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueues
 from DIRAC.Core.Utilities.SiteSEMapping import getSEParameters
-from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueues, getCESiteMapping
 from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers
-from DIRAC.ResourceStatusSystem.Utilities import Utils
 
 
 def warmUp():
@@ -19,28 +18,6 @@ def warmUp():
     gRefresher.refreshConfigurationIfNeeded()
 
 
-def getResources():
-    """
-    Gets all resources
-    """
-
-    resources = DMSHelpers().getStorageElements()
-
-    fts = getFTS()
-    if fts["OK"]:
-        resources = resources + fts["Value"]
-
-    fc = getFileCatalogs()
-    if fc["OK"]:
-        resources = resources + fc["Value"]
-
-    res = getCESiteMapping()
-    if res["OK"]:
-        resources = resources + list(res["Value"])
-
-    return S_OK(resources)
-
-
 def getStorageElementEndpoint(seName):
     """Get endpoints of a StorageElement
 
@@ -86,12 +63,6 @@ def getFTS():
     return S_OK([])
 
 
-def getSpaceTokenEndpoints():
-    """Get Space Token Endpoints"""
-
-    return Utils.getCSTree("Shares/Disk")
-
-
 def getFileCatalogs():
     """
     Gets all storage elements from /Resources/FileCatalogs

DIRAC/ResourceStatusSystem/scripts/dirac_rss_set_status.py

@@ -29,6 +29,7 @@ def registerSwitches():
         ("reason=", "Reason to set the Status"),
         ("VO=", "VO to change a status for. When omitted, status will be changed for all VOs"),
         ("tokenOwner=", "Owner of the token"),
+        ("days=", "Number of days the token is valid for. Default is 1 day. 0 or less days denotes forever."),
     )
 
     for switch in switches:
@@ -50,6 +51,7 @@ def parseSwitches():
     switches = dict(Script.getUnprocessedSwitches())
     switches.setdefault("statusType", None)
     switches.setdefault("VO", None)
+    switches.setdefault("days", 1)
 
     for key in ("element", "name", "status", "reason"):
         if key not in switches:
@@ -183,7 +185,11 @@ def setStatus(switchDict, tokenOwner):
         )
         return S_OK()
 
-    tomorrow = datetime.utcnow().replace(microsecond=0) + timedelta(days=1)
+    tokenLifetime = int(switchDict["days"])
+    if tokenLifetime <= 0:
+        tokenExpiration = datetime.max
+    else:
+        tokenExpiration = datetime.utcnow().replace(microsecond=0) + timedelta(days=tokenLifetime)
 
     for status, statusType in elements:
         gLogger.debug(f"{status} {statusType}")
@@ -193,8 +199,16 @@ def setStatus(switchDict, tokenOwner):
             continue
 
         gLogger.debug(
-            "About to set status %s -> %s for %s, statusType: %s, VO: %s, reason: %s"
-            % (status, switchDict["status"], switchDict["name"], statusType, switchDict["VO"], switchDict["reason"])
+            "About to set status %s -> %s for %s, statusType: %s, VO: %s, reason: %s, days: %s"
+            % (
+                status,
+                switchDict["status"],
+                switchDict["name"],
+                statusType,
+                switchDict["VO"],
+                switchDict["reason"],
+                switchDict["days"],
+            )
         )
         result = rssClient.modifyStatusElement(
             switchDict["element"],
@@ -205,7 +219,7 @@ def setStatus(switchDict, tokenOwner):
             reason=switchDict["reason"],
             vO=switchDict["VO"],
             tokenOwner=tokenOwner,
-            tokenExpiration=tomorrow,
+            tokenExpiration=tokenExpiration,
         )
         if not result["OK"]:
             return result

DIRAC/Resources/Catalog/RucioFileCatalogClient.py

@@ -151,7 +151,7 @@ class RucioFileCatalogClient(FileCatalogClientBase):
             self.authHost = options.get("AuthHost", None)
             self.caCertPath = Locations.getCAsLocation()
             try:
-                sLog.info(f"Logging in with a proxy located at: {self.proxyPath}")
+                sLog.debug(f"Logging in with a proxy located at: {self.proxyPath}")
                 sLog.debug("account: ", self.username)
                 sLog.debug("rucio host: ", self.rucioHost)
                 sLog.debug("auth  host: ", self.authHost)

DIRAC/Resources/Computing/AREXComputingElement.py

@@ -1,4 +1,4 @@
-""" AREX Computing Element (ARC REST interface)
+"""AREX Computing Element (ARC REST interface)
 
 Allows interacting with ARC AREX services via a REST interface.
 
@@ -807,7 +807,23 @@ class AREXComputingElement(ComputingElement):
             return S_ERROR(f"Failed decoding the status of the CE")
 
         # Look only in the relevant section out of the headache
-        queueInfo = ceData["Domains"]["AdminDomain"]["Services"]["ComputingService"]["ComputingShare"]
+        # This "safe_get" function allows to go down the dictionary
+        # even if some elements are lists instead of dictionaries
+        # and returns None if any element is not found
+        # FIXME: this is a temporary measure to be removed after https://github.com/DIRACGrid/DIRAC/issues/8354
+        def safe_get(d, *keys):
+            for k in keys:
+                if isinstance(d, list):
+                    d = d[0]  # assume first element
+                d = d.get(k) if isinstance(d, dict) else None
+                if d is None:
+                    break
+            return d
+
+        queueInfo = safe_get(ceData, "Domains", "AdminDomain", "Services", "ComputingService", "ComputingShare")
+        if queueInfo is None:
+            self.log.error("Failed to extract queue info")
+
         if not isinstance(queueInfo, list):
             queueInfo = [queueInfo]
 
@@ -819,7 +835,7 @@ class AREXComputingElement(ComputingElement):
         for qi in queueInfo:
             if qi["ID"].endswith(magic):
                 result["RunningJobs"] = int(qi["RunningJobs"])
-                result["WaitingJobs"] = int(qi["WaitingJobs"])
+                result["WaitingJobs"] = int(qi["WaitingJobs"]) + int(qi["StagingJobs"]) + int(qi["PreLRMSWaitingJobs"])
                 break  # Pick the first (should be only ...) matching queue + VO
         else:
             return S_ERROR(f"Could not find the queue {self.queue} associated to VO {vo}")

DIRAC/Resources/Computing/BatchSystems/Condor.py

@@ -6,6 +6,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
+import json
 import re
 import tempfile
 import subprocess
@@ -25,6 +26,8 @@ STATES_MAP = {
 
 HOLD_REASON_SUBCODE = "55"
 
+STATE_ATTRIBUTES = "ClusterId,ProcId,JobStatus,HoldReasonCode,HoldReasonSubCode,HoldReason"
+
 subTemplate = """
 # Environment
 # -----------
@@ -62,6 +65,7 @@ environment = "DIRAC_PILOT_STAMP=$(stamp) %(environment)s"
 # Requirements
 # ------------
 request_cpus = %(processors)s
+requirements = NumJobStarts == 0
 
 # Exit options
 # ------------
@@ -73,7 +77,8 @@ on_exit_hold = ExitCode =!= 0
 # A subcode of our choice to identify who put the job on hold
 on_exit_hold_subcode = %(holdReasonSubcode)s
 # Jobs are then deleted from the system after N days if they are not idle or running
-periodic_remove = (JobStatus != 1) && (JobStatus != 2) && ((time() - EnteredCurrentStatus) > (%(daysToKeepRemoteLogs)s * 24 * 3600))
+periodic_remove = ((JobStatus == 1) && (NumJobStarts > 0)) || \
+    ((JobStatus != 1) && (JobStatus != 2) && ((time() - EnteredCurrentStatus) > (%(daysToKeepRemoteLogs)s * 24 * 3600)))
 
 # Specific options
 # ----------------
@@ -87,63 +92,34 @@ Queue stamp in %(pilotStampList)s
 """
 
 
-def parseCondorStatus(lines, jobID):
+def getCondorStatus(jobMetadata):
     """parse the condor_q or condor_history output for the job status
 
-    :param lines: list of lines from the output of the condor commands, each line is a tuple of jobID, statusID, and holdReasonCode
-    :type lines: python:list
-    :param str jobID: jobID of condor job, e.g.: 123.53
+    :param jobMetadata: dict with job metadata
+    :type jobMetadata: dict[str, str | int]
     :returns: Status as known by DIRAC, and a reason if the job is being held
     """
-    jobID = str(jobID)
-
-    holdReason = ""
-    status = None
-    for line in lines:
-        l = line.strip().split()
-
-        # Make sure the job ID exists
-        if len(l) < 1 or l[0] != jobID:
-            continue
-
-        # Make sure the status is present and is an integer
-        try:
-            status = int(l[1])
-        except (ValueError, IndexError):
-            break
-
-        # Stop here if the status is not held (5): result should be found in STATES_MAP
-        if status != 5:
-            break
-
-        # A job can be held for various reasons,
-        # we need to further investigate with the holdReasonCode & holdReasonSubCode
-        # Details in:
-        # https://htcondor.readthedocs.io/en/latest/classad-attributes/job-classad-attributes.html#HoldReasonCode
-
-        # By default, a held (5) job is defined as Aborted in STATES_MAP, but there might be some exceptions
-        status = 3
-        try:
-            holdReasonCode = l[2]
-            holdReasonSubcode = l[3]
-            holdReason = " ".join(l[4:])
-        except IndexError:
-            # This should not happen in theory
-            # Just set the status to unknown such as
-            status = None
-            holdReasonCode = "undefined"
-            holdReasonSubcode = "undefined"
-            break
-
-        # If holdReasonCode is 3 (The PERIODIC_HOLD expression evaluated to True. Or, ON_EXIT_HOLD was true)
-        # And subcode is HOLD_REASON_SUBCODE, then it means the job failed by itself, it needs to be marked as Failed
-        if holdReasonCode == "3" and holdReasonSubcode == HOLD_REASON_SUBCODE:
-            status = 5
-        # If holdReasonCode is 16 (Input files are being spooled), the job should be marked as Waiting
-        elif holdReasonCode == "16":
-            status = 1
-
-    return (STATES_MAP.get(status, "Unknown"), holdReason)
+    if jobMetadata["JobStatus"] != 5:
+        # If the job is not held, we can return the status directly
+        return (STATES_MAP.get(jobMetadata["JobStatus"], "Unknown"), "")
+
+    # A job can be held for various reasons,
+    # we need to further investigate with the holdReasonCode & holdReasonSubCode
+    # Details in:
+    # https://htcondor.readthedocs.io/en/latest/classad-attributes/job-classad-attributes.html#HoldReasonCode
+
+    # By default, a held (5) job is defined as Aborted in STATES_MAP, but there might be some exceptions
+    status = 3
+
+    # If holdReasonCode is 3 (The PERIODIC_HOLD expression evaluated to True. Or, ON_EXIT_HOLD was true)
+    # And subcode is HOLD_REASON_SUBCODE, then it means the job failed by itself, it needs to be marked as Failed
+    if jobMetadata["HoldReasonCode"] == 3 and jobMetadata["HoldReasonSubCode"] == HOLD_REASON_SUBCODE:
+        status = 5
+    # If holdReasonCode is 16 (Input files are being spooled), the job should be marked as Waiting
+    elif jobMetadata["HoldReasonCode"] == 16:
+        status = 1
+
+    return (STATES_MAP.get(status, "Unknown"), jobMetadata["HoldReason"])
 
 
 class Condor(object):
@@ -171,8 +147,6 @@ class Condor(object):
         preamble = kwargs.get("Preamble")
 
         jdlFile = tempfile.NamedTemporaryFile(dir=outputDir, suffix=".jdl", mode="wt")
-        scheddOptions = 'requirements = OpSys == "LINUX"\n'
-        scheddOptions += "gentenv = False"
         jdlFile.write(
             subTemplate
             % dict(
@@ -185,7 +159,7 @@ class Condor(object):
                 holdReasonSubcode=HOLD_REASON_SUBCODE,
                 daysToKeepRemoteLogs=1,
                 scheddOptions="",
-                extraString="",
+                extraString=submitOptions,
                 pilotStampList=",".join(stamps),
             )
         )
@@ -193,7 +167,7 @@ class Condor(object):
         jdlFile.flush()
 
         cmd = "%s; " % preamble if preamble else ""
-        cmd += "condor_submit %s %s" % (submitOptions, jdlFile.name)
+        cmd += "condor_submit -spool %s" % jdlFile.name
         sp = subprocess.Popen(
             cmd,
             shell=True,
@@ -283,7 +257,6 @@ class Condor(object):
 
     def getJobStatus(self, **kwargs):
         """Get status of the jobs in the given list"""
-
         resultDict = {}
 
         MANDATORY_PARAMETERS = ["JobIDList"]
@@ -299,15 +272,11 @@ class Condor(object):
             resultDict["Message"] = "Empty job list"
             return resultDict
 
-        user = kwargs.get("User")
-        if not user:
-            user = os.environ.get("USER")
-        if not user:
-            resultDict["Status"] = -1
-            resultDict["Message"] = "No user name"
-            return resultDict
+        # Prepare the command to get the status of the jobs
+        cmdJobs = " ".join(str(jobID) for jobID in jobIDList)
 
-        cmd = "condor_q -submitter %s -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason" % user
+        # Get the status of the jobs currently active
+        cmd = "condor_q %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(cmd),
             stdout=subprocess.PIPE,
@@ -321,12 +290,13 @@ class Condor(object):
             resultDict["Status"] = status
             resultDict["Message"] = error
             return resultDict
+        if not output:
+            output = "[]"
 
-        qList = output.strip().split("\n")
+        jobsMetadata = json.loads(output)
 
-        condorHistCall = (
-            "condor_history -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason -submitter %s" % user
-        )
+        # Get the status of the jobs in the history
+        condorHistCall = "condor_history %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(condorHistCall),
             stdout=subprocess.PIPE,
@@ -335,15 +305,28 @@ class Condor(object):
         )
         output, _ = sp.communicate()
         status = sp.returncode
-        if status == 0:
-            for line in output.split("\n"):
-                qList.append(line)
+
+        if status != 0:
+            resultDict["Status"] = status
+            resultDict["Message"] = error
+            return resultDict
+        if not output:
+            output = "[]"
+
+        jobsMetadata += json.loads(output)
 
         statusDict = {}
-        if len(qList):
-            for job in jobIDList:
-                job = str(job)
-                statusDict[job], _ = parseCondorStatus(qList, job)
+        # Build a set of job IDs found in jobsMetadata
+        foundJobIDs = set()
+        for jobDict in jobsMetadata:
+            jobID = "%s.%s" % (jobDict["ClusterId"], jobDict["ProcId"])
+            statusDict[jobID], _ = getCondorStatus(jobDict)
+            foundJobIDs.add(jobID)
+
+        # For job IDs not found, set status to "Unknown"
+        for jobID in jobIDList:
+            if str(jobID) not in foundJobIDs:
+                statusDict[str(jobID)] = "Unknown"
 
         # Final output
         status = 0
@@ -355,19 +338,30 @@ class Condor(object):
         """Get the overall status of the CE"""
         resultDict = {}
 
-        user = kwargs.get("User")
-        if not user:
-            user = os.environ.get("USER")
-        if not user:
+        cmd = "condor_q -totals -json"
+        sp = subprocess.Popen(
+            shlex.split(cmd),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            universal_newlines=True,
+        )
+        output, error = sp.communicate()
+        status = sp.returncode
+
+        if status != 0 or not output:
             resultDict["Status"] = -1
-            resultDict["Message"] = "No user name"
+            resultDict["Message"] = error
             return resultDict
 
-        waitingJobs = 0
-        runningJobs = 0
+        jresult = json.loads(output)
+        resultDict["Status"] = 0
+        resultDict["Waiting"] = jresult[0]["Idle"]
+        resultDict["Running"] = jresult[0]["Running"]
 
+        # We also need to check the hold jobs, some of them are actually waiting (e.g. for input files)
+        cmd = 'condor_q -json -constraint "JobStatus == 5" -attributes HoldReasonCode'
         sp = subprocess.Popen(
-            shlex.split("condor_q -submitter %s" % user),
+            shlex.split(cmd),
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
@@ -376,33 +370,57 @@ class Condor(object):
         status = sp.returncode
 
         if status != 0:
-            if "no record" in output:
-                resultDict["Status"] = 0
-                resultDict["Waiting"] = waitingJobs
-                resultDict["Running"] = runningJobs
-                return resultDict
-            resultDict["Status"] = status
+            resultDict["Status"] = -1
             resultDict["Message"] = error
             return resultDict
 
-        if "no record" in output:
-            resultDict["Status"] = 0
-            resultDict["Waiting"] = waitingJobs
-            resultDict["Running"] = runningJobs
+        # If there are no held jobs, we can return the result
+        if not output:
             return resultDict
 
-        if output:
-            lines = output.split("\n")
-            for line in lines:
-                if not line.strip():
-                    continue
-                if " I " in line:
-                    waitingJobs += 1
-                elif " R " in line:
-                    runningJobs += 1
+        jresult = json.loads(output)
+        for job_metadata in jresult:
+            if job_metadata["HoldReasonCode"] == 16:
+                resultDict["Waiting"] += 1
+
+        return resultDict
+
+    def getJobOutputFiles(self, **kwargs):
+        """Get output file names and templates for the specific CE"""
+        resultDict = {}
+
+        MANDATORY_PARAMETERS = ["JobIDList", "OutputDir", "ErrorDir"]
+        for argument in MANDATORY_PARAMETERS:
+            if argument not in kwargs:
+                resultDict["Status"] = -1
+                resultDict["Message"] = "No %s" % argument
+                return resultDict
+
+        outputDir = kwargs["OutputDir"]
+        errorDir = kwargs["ErrorDir"]
+        jobIDList = kwargs["JobIDList"]
+
+        jobDict = {}
+        for jobID in jobIDList:
+            jobDict[jobID] = {}
+
+            cmd = "condor_transfer_data %s" % jobID
+            sp = subprocess.Popen(
+                shlex.split(cmd),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                universal_newlines=True,
+            )
+            _, error = sp.communicate()
+            status = sp.returncode
+            if status != 0:
+                resultDict["Status"] = -1
+                resultDict["Message"] = error
+                return resultDict
+
+            jobDict[jobID]["Output"] = "%s/%s.out" % (outputDir, jobID)
+            jobDict[jobID]["Error"] = "%s/%s.err" % (errorDir, jobID)
 
-        # Final output
         resultDict["Status"] = 0
-        resultDict["Waiting"] = waitingJobs
-        resultDict["Running"] = runningJobs
+        resultDict["Jobs"] = jobDict
         return resultDict

DIRAC/Resources/Computing/BatchSystems/SLURM.py

@@ -40,6 +40,7 @@ class SLURM(object):
         executable = kwargs["Executable"]
         account = kwargs.get("Account", "")
         numberOfProcessors = kwargs.get("NumberOfProcessors", 1)
+        wholeNode = kwargs.get("WholeNode", False)
         # numberOfNodes is treated as a string as it can contain values such as "2-4"
         # where 2 would represent the minimum number of nodes to allocate, and 4 the maximum
         numberOfNodes = kwargs.get("NumberOfNodes", "1")
@@ -72,7 +73,10 @@ class SLURM(object):
             # One pilot (task) per node, allocating a certain number of processors
             cmd += "--ntasks-per-node=1 "
             cmd += "--nodes=%s " % numberOfNodes
-            cmd += "--cpus-per-task=%d " % numberOfProcessors
+            if wholeNode:
+                cmd += "--exclusive "
+            else:
+                cmd += "--cpus-per-task=%d " % numberOfProcessors
             if numberOfGPUs:
                 cmd += "--gpus-per-task=%d " % int(numberOfGPUs)
             # Additional options

DIRAC/Resources/Computing/BatchSystems/test/Test_SLURM.py

@@ -198,3 +198,49 @@ def test_getJobOutputFiles(numberOfNodes, outputContent, expectedContent):
 
     os.remove(outputFile)
     os.remove(errorFile)
+
+
+def test_submitJob_cmd_generation(mocker):
+    """Test submitJob() command string generation for various kwargs"""
+    slurm = SLURM()
+    # Mock subprocess.Popen to capture the command
+    popen_mock = mocker.patch("subprocess.Popen")
+    process_mock = popen_mock.return_value
+    process_mock.communicate.return_value = ("Submitted batch job 1234\n", "")
+    process_mock.returncode = 0
+
+    # Minimal kwargs
+    kwargs = {
+        "Executable": "/bin/echo",
+        "OutputDir": "/tmp",
+        "ErrorDir": "/tmp",
+        "Queue": "testq",
+        "SubmitOptions": "",
+        "JobStamps": ["stamp1"],
+        "NJobs": 1,
+    }
+    # Test default (WholeNode False)
+    slurm.submitJob(**kwargs)
+    cmd = popen_mock.call_args[0][0]
+    assert "--cpus-per-task=1" in cmd
+    assert "--exclusive" not in cmd
+
+    # Test WholeNode True disables --cpus-per-task and adds --exclusive
+    kwargs["WholeNode"] = True
+    slurm.submitJob(**kwargs)
+    cmd = popen_mock.call_args[0][0]
+    assert "--exclusive" in cmd
+    assert "--cpus-per-task" not in cmd
+
+    # Test NumberOfProcessors
+    kwargs["WholeNode"] = False
+    kwargs["NumberOfProcessors"] = 8
+    slurm.submitJob(**kwargs)
+    cmd = popen_mock.call_args[0][0]
+    assert "--cpus-per-task=8" in cmd
+
+    # Test NumberOfGPUs
+    kwargs["NumberOfGPUs"] = 2
+    slurm.submitJob(**kwargs)
+    cmd = popen_mock.call_args[0][0]
+    assert "--gpus-per-task=2" in cmd