Преглед на файлове

Add `PENDING` execution status

Adds new execution status for deployments that wait for deployers' completion.
Daniel Vincze преди 1 година
родител
ревизия
9504ed405e
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 3
      coriolis/conductor/rpc/server.py
  2. 1 0
      coriolis/constants.py

+ 2 - 3
coriolis/conductor/rpc/server.py

@@ -1616,7 +1616,7 @@ class ConductorServerEndpoint(object):
             self, ctxt, deployment_id, deployer_error_details):
         deployment = self._get_deployment(ctxt, deployment_id)
         error_status = constants.EXECUTION_STATUS_ERROR
-        expected_status = constants.EXECUTION_STATUS_UNEXECUTED
+        expected_status = constants.EXECUTION_STATUS_PENDING
         if deployment.last_execution_status != expected_status:
             raise exception.InvalidDeploymentState(
                 f"Deployment is in '{deployment.last_execution_status}' "
@@ -1659,8 +1659,7 @@ class ConductorServerEndpoint(object):
         deployment.info = {}
         deployment.notes = transfer.notes
         deployment.user_scripts = user_scripts
-        deployment.last_execution_status = (
-            constants.EXECUTION_STATUS_UNEXECUTED)
+        deployment.last_execution_status = constants.EXECUTION_STATUS_PENDING
         # NOTE: Deployments have no use for the source/target
         # pools of the parent Transfer so these can be omitted:
         deployment.origin_minion_pool_id = None

+ 1 - 0
coriolis/constants.py

@@ -16,6 +16,7 @@ EXECUTION_STATUS_CANCELLING = "CANCELLING"
 EXECUTION_STATUS_CANCELED_FOR_DEBUGGING = "CANCELED_FOR_DEBUGGING"
 EXECUTION_STATUS_AWAITING_MINION_ALLOCATIONS = "AWAITING_MINION_ALLOCATIONS"
 EXECUTION_STATUS_ERROR_ALLOCATING_MINIONS = "ERROR_ALLOCATING_MINIONS"
+EXECUTION_STATUS_PENDING = "PENDING"
 
 ACTIVE_EXECUTION_STATUSES = [
     EXECUTION_STATUS_RUNNING,