Skip to content

Bug 1917484: Don't adopt after clean failure during deprovisioning #121

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

Closed
zaneb wants to merge 1 commit into from
Closed

Bug 1917484: Don't adopt after clean failure during deprovisioning #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions pkg/provisioner/ironic/ironic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,19 @@ func (p *ironicProvisioner) Adopt(force bool) (result provisioner.Result, err er
err = fmt.Errorf("Invalid state for adopt: %s",
ironicNode.ProvisionState)
case nodes.Manageable:
_, hasImageSource := ironicNode.InstanceInfo["image_source"]
_, hasBootISO := ironicNode.InstanceInfo["boot_iso"]
if p.status.State == metal3v1alpha1.StateDeprovisioning &&
!(hasImageSource || hasBootISO) {
// If we got here after a fresh registration and image data is
// available, it should have been added to the node during
// registration. If it isn't present then we got here due to a
// failed cleaning on deprovision. The node will be cleaned again
// before the next provisioning, so just allow the controller to
// continue without adopting.
p.log.Info("no image info; not adopting", "state", ironicNode.ProvisionState)
return operationComplete()
}
return p.changeNodeProvisionState(
ironicNode,
nodes.ProvisionStateOpts{
Expand Down Expand Up @@ -1332,6 +1345,7 @@ func (p *ironicProvisioner) Deprovision() (result provisioner.Result, err error)
)

case nodes.CleanFail:
p.log.Info("cleaning failed")
if ironicNode.Maintenance {
p.log.Info("clearing maintenance flag")
return p.setMaintenanceFlag(ironicNode, false)
Expand All @@ -1341,6 +1355,14 @@ func (p *ironicProvisioner) Deprovision() (result provisioner.Result, err error)
nodes.ProvisionStateOpts{Target: nodes.TargetManage},
)

case nodes.Manageable:
// We end up here after CleanFail. Because cleaning happens in the
// process of moving from manageable to available, the node will still
// get cleaned before we provision it again. Therefore, just declare
// deprovisioning complete.
p.log.Info("deprovisioning node is in manageable state")
return operationComplete()

case nodes.Available:
p.publisher("DeprovisioningComplete", "Image deprovisioning completed")
return result, nil
Expand Down
17 changes: 17 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 @@ -172,6 +172,23 @@ func TestDeprovision(t *testing.T) {
expectedRequestAfter: 10,
expectedDirty: true,
},
{
name: "clean fail state",
ironic: testserver.NewIronic(t).WithDefaultResponses().Node(nodes.Node{
ProvisionState: string(nodes.CleanFail),
UUID: nodeUUID,
}),
expectedRequestAfter: 10,
expectedDirty: true,
},
{
name: "manageable state",
ironic: testserver.NewIronic(t).Ready().Node(nodes.Node{
ProvisionState: string(nodes.Manageable),
UUID: nodeUUID,
}),
expectedDirty: false,
},
}

for _, tc := range cases {
Expand Down