diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index 0a36dbe668a7626b07668c30629c41739874752c..c4b373e8468de06bc9838ad33d66023d5e4345c1 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 3387cb4d24d96b9e78020475b20bc90bd3ec7962..124d2efe7fc19e9fb65c7187947ecd36f05f07f1 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)