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

OADP-605: Fix edge case for already exists resources #186

Merged
merged 4 commits into from Aug 11, 2022
Merged

OADP-605: Fix edge case for already exists resources #186

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d631783
fix edge case for already exists resources
shubham-pampattiwar Aug 11, 2022
2df0a76
update the in cluster obj get call error handling
shubham-pampattiwar Aug 11, 2022
ac5773f
handle more edge cases
shubham-pampattiwar Aug 11, 2022
3f1c834
fix comments
shubham-pampattiwar Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions pkg/restore/restore.go
View file
Open in desktop
Expand Up @@ -1249,12 +1249,30 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
errs.Add(namespace, err)
return warnings, errs
}
if isAlreadyExistsError {
fromCluster, err := resourceClient.Get(name, metav1.GetOptions{})
if err != nil {
ctx.log.Infof("Error retrieving cluster version of %s: %v", kube.NamespaceAndName(obj), err)
warnings.Add(namespace, err)
return warnings, errs
// check if we want to treat the error as a warning, in some cases the creation call might not get executed due to object API validations
// and Velero might not get the already exists error type but in reality the object already exists
objectExists := false
var fromCluster *unstructured.Unstructured

if !isAlreadyExistsError {
shubham-pampattiwar marked this conversation as resolved.
Show resolved Hide resolved
// check for the existence of the object in cluster, if no error then it implies that object exists
// and if err then we want to fallthrough and do another get call later
fromCluster, err = resourceClient.Get(name, metav1.GetOptions{})
if err == nil {
objectExists = true
}
}

if isAlreadyExistsError || objectExists {
// do a get call if we did not run this previously i.e.
// when we earlier ignored the error to check for the existence of obj in cluster, this time we will add the error as restore error
shubham-pampattiwar marked this conversation as resolved.
Show resolved Hide resolved
if fromCluster == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If objectexists == true then fromcluster wouldn't be nil.

No need to call get here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a get call for the AlreadyExistError case, the get call you are referring to is done if error from create is not AlreadyExistsError

fromCluster, err = resourceClient.Get(name, metav1.GetOptions{})
if err != nil {
ctx.log.Infof("Error retrieving cluster version of %s: %v", kube.NamespaceAndName(obj), err)
warnings.Add(namespace, err)
return warnings, errs
}
}
// Remove insubstantial metadata.
fromCluster, err = resetMetadataAndStatus(fromCluster)
Expand Down