Skip to content

e2e retries CreateOrUpdate on DPA to resolve "... please apply your changes to the latest version ..." #653

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
merged 4 commits into from
May 3, 2022
Merged

e2e retries CreateOrUpdate on DPA to resolve "... please apply your changes to the latest version ..." #653

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a78d8f4
CreateOrUpdate call CreateOrUpdateWithRetries with 3 default retries …
kaovilai Apr 29, 2022
32b5604
Avoid stack growth using for loop
kaovilai Apr 29, 2022
d3481fc
fix retries counting error
kaovilai Apr 29, 2022
cb03f85
err reference typo, rearrange condition
kaovilai Apr 29, 2022
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
37 changes: 27 additions & 10 deletions tests/e2e/lib/dpa_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"log"
"reflect"
"strings"
"time"

"github.com/openshift/oadp-operator/pkg/common"

Expand Down Expand Up @@ -139,17 +140,33 @@ func (v *DpaCustomResource) GetNoErr() *oadpv1alpha1.DataProtectionApplication {
}

func (v *DpaCustomResource) CreateOrUpdate(spec *oadpv1alpha1.DataProtectionApplicationSpec) error {
cr, err := v.Get()
if apierrors.IsNotFound(err) {
v.Build(v.backupRestoreType)
v.CustomResource.Spec = *spec
return v.Create()
}
if err != nil {
return err
return v.CreateOrUpdateWithRetries(spec, 3)
}
func (v *DpaCustomResource) CreateOrUpdateWithRetries(spec *oadpv1alpha1.DataProtectionApplicationSpec, retries int) error {
var (
err error
cr *oadpv1alpha1.DataProtectionApplication
)
for i := 0; i < retries; i++ {
if cr, err = v.Get(); apierrors.IsNotFound(err) {
v.Build(v.backupRestoreType)
v.CustomResource.Spec = *spec
return v.Create()
} else if err != nil {
return err
}
cr.Spec = *spec
if err = v.Client.Update(context.Background(), cr); err != nil{
if apierrors.IsConflict(err) && i < retries-1 {
log.Println("conflict detected during DPA CreateOrUpdate, retrying for ", retries - i - 1 , " more times")
time.Sleep(time.Second * 2)
continue
}
return err
}
return nil
}
cr.Spec = *spec
return v.Client.Update(context.Background(), cr)
return err
}

func (v *DpaCustomResource) Delete() error {
Expand Down