Set PowerManagementError state in state machine

The state machine itself should be responsible for all state transitions, not the action methods.
longkb · Jan 8, 2020 · 8c5bd63 · 8c5bd63
1 parent 8e37ff6
commit 8c5bd63
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/pkg/controller/baremetalhost/baremetalhost_controller.go b/pkg/controller/baremetalhost/baremetalhost_controller.go
@@ -584,7 +584,6 @@ func (r *ReconcileBareMetalHost) manageHostPower(prov provisioner.Provisioner, i
 	}
 
 	if provResult.ErrorMessage != "" {
-		info.host.Status.Provisioning.State = metal3v1alpha1.StatePowerManagementError
 		return recordActionFailure(info, metal3v1alpha1.PowerManagementError, provResult.ErrorMessage)
 	}
 
@@ -615,7 +614,6 @@ func (r *ReconcileBareMetalHost) manageHostPower(prov provisioner.Provisioner, i
 	}
 
 	if provResult.ErrorMessage != "" {
-		info.host.Status.Provisioning.State = metal3v1alpha1.StatePowerManagementError
 		return recordActionFailure(info, metal3v1alpha1.PowerManagementError, provResult.ErrorMessage)
 	}
 

diff --git a/pkg/controller/baremetalhost/host_state_machine.go b/pkg/controller/baremetalhost/host_state_machine.go
@@ -211,7 +211,14 @@ func (hsm *hostStateMachine) handleMatchProfile(info *reconcileInfo) actionResul
 
 func (hsm *hostStateMachine) handleExternallyProvisioned(info *reconcileInfo) actionResult {
 	if hsm.Host.Spec.ExternallyProvisioned {
-		return hsm.Reconciler.actionManageSteadyState(hsm.Provisioner, info)
+		actResult := hsm.Reconciler.actionManageSteadyState(hsm.Provisioner, info)
+		if r, f := actResult.(actionFailed); f {
+			switch r.ErrorType {
+			case metal3v1alpha1.PowerManagementError:
+				hsm.NextState = metal3v1alpha1.StatePowerManagementError
+			}
+		}
+		return actResult
 	}
 
 	switch {
@@ -232,7 +239,14 @@ func (hsm *hostStateMachine) handleReady(info *reconcileInfo) actionResult {
 	case hsm.Host.NeedsProvisioning():
 		hsm.NextState = metal3v1alpha1.StateProvisioning
 	default:
-		return hsm.Reconciler.actionManageReady(hsm.Provisioner, info)
+		actResult := hsm.Reconciler.actionManageReady(hsm.Provisioner, info)
+		if r, f := actResult.(actionFailed); f {
+			switch r.ErrorType {
+			case metal3v1alpha1.PowerManagementError:
+				hsm.NextState = metal3v1alpha1.StatePowerManagementError
+			}
+		}
+		return actResult
 	}
 	return actionComplete{}
 }
@@ -269,7 +283,14 @@ func (hsm *hostStateMachine) handleProvisioned(info *reconcileInfo) actionResult
 		return actionComplete{}
 	}
 
-	return hsm.Reconciler.actionManageSteadyState(hsm.Provisioner, info)
+	actResult := hsm.Reconciler.actionManageSteadyState(hsm.Provisioner, info)
+	if r, f := actResult.(actionFailed); f {
+		switch r.ErrorType {
+		case metal3v1alpha1.PowerManagementError:
+			hsm.NextState = metal3v1alpha1.StatePowerManagementError
+		}
+	}
+	return actResult
 }
 
 func (hsm *hostStateMachine) handlePowerManagementError(info *reconcileInfo) actionResult {