Commit e0b8d72f authored by Mihai Patrascoiu's avatar Mihai Patrascoiu
Browse files

Add QOS_REQUEST_SUBMITTED state to FileActiveStates and JobSubmitter blocking option pending states

parent 61026d0f
......@@ -118,7 +118,7 @@ class JobDeletionSubmitter(Base):
if job_id and self.options.blocking:
inquirer = Inquirer(context)
job = inquirer.get_job_status(job_id)
while job['job_state'] in ['SUBMITTED', 'READY', 'STAGING', 'QOS_TRANSITION', 'ACTIVE', 'DELETE']:
while job['job_state'] in ['SUBMITTED', 'READY', 'STAGING', 'ACTIVE', 'DELETE', 'QOS_TRANSITION', 'QOS_REQUEST_SUBMITTED']:
self.logger.info("Job in state %s" % job['job_state'])
time.sleep(self.options.poll_interval)
job = inquirer.get_job_status(job_id)
......
......@@ -247,7 +247,7 @@ class JobSubmitter(Base):
if job_id and self.options.blocking:
inquirer = Inquirer(context)
job = inquirer.get_job_status(job_id)
while job['job_state'] in ['SUBMITTED', 'READY', 'STAGING', 'ACTIVE', 'QOS_TRANSITION']:
while job['job_state'] in ['SUBMITTED', 'READY', 'STAGING', 'ACTIVE', 'QOS_TRANSITION', 'QOS_REQUEST_SUBMITTED']:
self.logger.info("Job in state %s" % job['job_state'])
time.sleep(self.options.poll_interval)
job = inquirer.get_job_status(job_id)
......
......@@ -22,7 +22,7 @@ from sqlalchemy.orm import relation, backref
from base import Base, Json
FileActiveStates = ['STAGING', 'STARTED', 'SUBMITTED', 'READY', 'ACTIVE', 'QOS_TRANSITION']
FileActiveStates = ['STAGING', 'STARTED', 'SUBMITTED', 'READY', 'ACTIVE', 'QOS_TRANSITION', 'QOS_REQUEST_SUBMITTED']
FileTerminalStates = ['FINISHED', 'FAILED', 'CANCELED']
# NOT_USED is not terminal, nor not-terminal
FileOnHoldStates = ['NOT_USED', 'ON_HOLD', 'ON_HOLD_STAGING']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment