Develop

batch_systems/slurm_client/slurm_client.py

@@ -295,7 +295,7 @@ def status(self, external_job_id):
         Returns:
             tuple: (Ridgeback Status int, extra info)
         """
-        saact_command = ["sacct", f"--jobs={external_job_id}.batch", "--format=jobid,state,exitcode", "-n", "-P"]
+        saact_command = ["sacct", f"--jobs={external_job_id}", "--format=jobid,state,exitcode", "-n", "-P"]
         self.logger.debug("Checking slurm status for job: %s", external_job_id)
         process = subprocess.run(saact_command, check=True, stdout=subprocess.PIPE, universal_newlines=True)
         status = self._parse_status(process.stdout, str(external_job_id))

compose.yaml

@@ -377,7 +377,7 @@ services:
   ridgeback_celery_command_queue:
     <<: *ridgeback_celery
     tmpfs:
-      - /tmp:size=500M,mode=777
+      - /tmp:size=2G,mode=777
     command:
       - |
         source ${RIDGEBACK_VENV}/bin/activate
@@ -402,7 +402,7 @@ services:
   ridgeback_celery_action_queue:
     <<: *ridgeback_celery
     tmpfs:
-      - /tmp:size=500M,mode=777
+      - /tmp:size=2G,mode=777
     command:
       - |
         source ${RIDGEBACK_VENV}/bin/activate

orchestrator/tasks.py

@@ -265,7 +265,7 @@ def submit_job_to_batch_system(job, retries=0):
 
 def _pipeline_completed(job, outputs):
     job.pipeline_completed(outputs)
-    set_permissions_job.delay(str(job.id))
+    # set_permissions_job.delay(str(job.id))
 
 
 def _fail(job, error_message=""):
@@ -330,7 +330,7 @@ def check_job_status(job):
 
             if batch_system_status in (Status.RUNNING,):
                 command_processor.delay(Command(CommandType.CHECK_HANGING, str(job.id)).to_dict())
-                command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
+                # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
 
         elif batch_system_status in (Status.COMPLETED,):
             submitter = JobSubmitterFactory.factory(
@@ -348,14 +348,14 @@ def check_job_status(job):
             outputs, error_message = submitter.get_outputs()
             if outputs:
                 _pipeline_completed(job, outputs)
-                command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
+                # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
             else:
                 _fail(job, error_message)
-                command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
+                # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
         elif batch_system_status in (Status.FAILED,):
             _fail(job, batch_system_message)
 
-        command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
+        # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())
     else:
         raise StopException("Invalid transition %s to %s" % (Status(job.status).name, Status(batch_system_status).name))
 

ridgeback/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.1.4"