Skip to content

Fix issues with deprovisioning after an error/failover #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metal3-io-bot merged 2 commits into from
Jan 20, 2021
Merged

Fix issues with deprovisioning after an error/failover #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a308ddf
Handle deploy failed state when deprovisioning
zaneb Dec 8, 2020
24ba8a0
Don't adopt in deprovisioning if provisioning didn't complete
zaneb Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions controllers/metal3.io/baremetalhost_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,26 +612,28 @@ func clearHostProvisioningSettings(host *metal3v1alpha1.BareMetalHost) {
}

func (r *BareMetalHostReconciler) actionDeprovisioning(prov provisioner.Provisioner, info *reconcileInfo) actionResult {
// Adopt the host in case it has been re-registered during the
// deprovisioning process before it completed
provResult, err := prov.Adopt(info.host.Status.ErrorType == metal3v1alpha1.RegistrationError)
if err != nil {
return actionError{err}
}
if provResult.ErrorMessage != "" {
return recordActionFailure(info, metal3v1alpha1.RegistrationError, provResult.ErrorMessage)
}
if provResult.Dirty {
result := actionContinue{provResult.RequeueAfter}
if clearError(info.host) {
return actionUpdate{result}
if info.host.Status.Provisioning.Image.URL != "" {
Comment thread
zaneb marked this conversation as resolved.
// Adopt the host in case it has been re-registered during the
// deprovisioning process before it completed
provResult, err := prov.Adopt(info.host.Status.ErrorType == metal3v1alpha1.RegistrationError)
if err != nil {
return actionError{err}
}
if provResult.ErrorMessage != "" {
return recordActionFailure(info, metal3v1alpha1.RegistrationError, provResult.ErrorMessage)
}
if provResult.Dirty {
result := actionContinue{provResult.RequeueAfter}
if clearError(info.host) {
return actionUpdate{result}
}
return result
}
return result
}

info.log.Info("deprovisioning")

provResult, err = prov.Deprovision(info.host.Status.ErrorType == metal3v1alpha1.ProvisioningError)
provResult, err := prov.Deprovision(info.host.Status.ErrorType == metal3v1alpha1.ProvisioningError)
if err != nil {
return actionError{errors.Wrap(err, "failed to deprovision")}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioner/ironic/ironic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ func (p *ironicProvisioner) Deprovision(force bool) (result provisioner.Result,
p.log.Info("cleaning")
return operationContinuing(deprovisionRequeueDelay)

case nodes.Active:
case nodes.Active, nodes.DeployFail:
p.log.Info("starting deprovisioning")
p.publisher("DeprovisioningStarted", "Image deprovisioning started")
return p.changeNodeProvisionState(
Expand Down
9 changes: 9 additions & 0 deletions pkg/provisioner/ironic/provision_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@ func TestDeprovision(t *testing.T) {
expectedRequestAfter: 10,
expectedDirty: true,
},
{
name: "deploy failed state",
ironic: testserver.NewIronic(t).WithDefaultResponses().Node(nodes.Node{
ProvisionState: string(nodes.DeployFail),
UUID: nodeUUID,
}),
expectedRequestAfter: 10,
expectedDirty: true,
},
{
name: "error state",
ironic: testserver.NewIronic(t).WithDefaultResponses().Node(nodes.Node{
Expand Down