Skip to content
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

Jump to bottom

Prevent orphaned resources for cancellation during delete #368

Merged
merged 4 commits into from
Jan 24, 2019
Merged

Prevent orphaned resources for cancellation during delete #368

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7bce86
Process returned delete errors to properly checkpoint
lblackstone Jan 23, 2019
02deab2
Rename initializationError to partialError
lblackstone Jan 23, 2019
fefc430
Rename InitializationError to PartialError
lblackstone Jan 23, 2019
b533b67
Clarify comment
lblackstone Jan 24, 2019
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
24 changes: 21 additions & 3 deletions pkg/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,9 +736,27 @@ func (k *kubeProvider) Delete(
Name: name,
}

err = await.Deletion(config)
if err != nil {
return nil, err
awaitErr := await.Deletion(config)
if awaitErr != nil {
initErr, isInitErr := awaitErr.(await.InitializationError)
if !isInitErr {
// Object deletion failed.
lblackstone marked this conversation as resolved.
Show resolved Hide resolved
return nil, awaitErr
}

lastKnownState := initErr.Object()

inputsAndComputed, err := plugin.MarshalProperties(
checkpointObject(current, lastKnownState), plugin.MarshalOptions{
Label: fmt.Sprintf("%s.inputsAndComputed", label), KeepUnknowns: true, SkipNulls: true,
})
if err != nil {
return nil, err
}

// Resource delete was issued, but failed to complete. Return live version of object so it can be
// checkpointed.
return nil, initializationError(FqObjName(lastKnownState), awaitErr, inputsAndComputed)
}

return &pbempty.Empty{}, nil
Expand Down