From ca3e3f7aeebdf39c0ce70c2360c5ed06e070b784 Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban@inaf.it>
Date: Tue, 21 Sep 2021 21:51:56 +0200
Subject: [PATCH] Minor changes.

Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>
---
 transfer_service/db_connector.py   | 7 ++++---
 transfer_service/job_rpc_server.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py
index 0a36dbe..c4b373e 100644
--- a/transfer_service/db_connector.py
+++ b/transfer_service/db_connector.py
@@ -406,7 +406,7 @@ class DbConnector(object):
         finally:
             self.connPool.putconn(conn, close = False)
 
-    def listActiveJobs(self):
+    def getActiveJobs(self):
         """Returns some info about active jobs."""
         conn = self.getConnection()
         try:
@@ -420,6 +420,7 @@ class DbConnector(object):
                        owner_id
                        FROM job
                        WHERE phase NOT IN ('ABORTED',
+                                           'ARCHIVED',
                                            'COMPLETED',
                                            'ERROR')
                        AND
@@ -447,12 +448,12 @@ class DbConnector(object):
         finally:
             self.connPool.putconn(conn, close = False)
 
-    def listJobsByPhase(self, phase):
+    def getJobsByPhase(self, phase):
         """Returns some info about jobs according to the phase."""
         conn = self.getConnection()
         try:
             cursor = conn.cursor(cursor_factory = RealDictCursor)
-            if phase in [ "PENDING", "QUEUED", "EXECUTING" ]:
+            if phase in [ "PENDING", "QUEUED", "EXECUTING", "HELD", "SUSPENDED" ]:
                 cursor.execute("""
                     SELECT job_id,
                            job_type,
diff --git a/transfer_service/job_rpc_server.py b/transfer_service/job_rpc_server.py
index 3387cb4..124d2ef 100644
--- a/transfer_service/job_rpc_server.py
+++ b/transfer_service/job_rpc_server.py
@@ -48,7 +48,7 @@ class JobRPCServer(RedisRPCServer):
                          "errorMsg": errorMsg }
         elif requestBody["requestType"] == "JOB_LIST":
             try:
-                result = self.dbConn.listActiveJobs()
+                result = self.dbConn.getActiveJobs()
             except Exception:
                 errorMsg = "Database error."
                 self.logger.exception(errorMsg)
@@ -62,7 +62,7 @@ class JobRPCServer(RedisRPCServer):
         elif requestBody["requestType"] == "JOB_BY_PHASE":
             jobPhase = requestBody["jobPhase"]
             try:
-                result = self.dbConn.listJobsByPhase(jobPhase)
+                result = self.dbConn.getJobsByPhase(jobPhase)
             except Exception:
                 errorMsg = "Database error."
                 self.logger.exception(errorMsg)
-- 
GitLab