Avoid overwriting Status updating the plan which is being executed

arangodb · Mar 26, 2018 · d7a4f0a · d7a4f0a
1 parent e7bf5e7
commit d7a4f0a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/deployment/reconcile/plan_executor.go b/pkg/deployment/reconcile/plan_executor.go
@@ -64,6 +64,9 @@ func (d *Reconciler) ExecutePlan(ctx context.Context) (bool, error) {
 					Msg("Failed to start action")
 				return false, maskAny(err)
 			}
+			// action.Start may have changed status, so reload it.
+			status = d.context.GetStatus()
+			// Update status according to result on action.Start.
 			if ready {
 				// Remove action from list
 				status.Plan = status.Plan[1:]
@@ -91,6 +94,8 @@ func (d *Reconciler) ExecutePlan(ctx context.Context) (bool, error) {
 				return false, maskAny(err)
 			}
 			if ready {
+				// action.CheckProgress may have changed status, so reload it.
+				status = d.context.GetStatus()
 				// Remove action from list
 				status.Plan = status.Plan[1:]
 				// Save plan update