Skip to content

CMP-4599: Fix race condition - detect stale ProfileBundle status after CEL content update #83

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
yuumasato merged 1 commit into from
Aug 31, 2026
Merged

CMP-4599: Fix race condition - detect stale ProfileBundle status after CEL content update #83

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
5 changes: 3 additions & 2 deletions helpers/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ func Setup(tc *config.TestConfig) error {

// At this point, operator has created ProfileBundles with custom content image
// (if custom image was specified, it was added to Subscription before creation)
if err := ensureCELContentFile(c, tc); err != nil {
postCELUpdateRV, err := ensureCELContentFile(c, tc)
if err != nil {
return err
}

if err := waitForValidTestProfileBundles(c, tc); err != nil {
if err := waitForValidTestProfileBundles(c, tc, postCELUpdateRV); err != nil {
return err
}

Expand Down
23 changes: 17 additions & 6 deletions helpers/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,15 @@ func waitForOperatorToBeReady(c dynclient.Client, tc *testConfig.TestConfig) err
// ProfileBundle so CEL profiles (e.g. the CIS OpenShift Virtualization
// benchmark) are parsed alongside the XCCDF datastream. The ProfileBundle is
// created by the operator, so retry until it exists.
func ensureCELContentFile(c dynclient.Client, tc *testConfig.TestConfig) error {
func ensureCELContentFile(c dynclient.Client, tc *testConfig.TestConfig) (string, error) {
if tc.CELContentFile == "" {
return nil
return "", nil
}
key := types.NamespacedName{
Name: "ocp4",
Namespace: tc.OperatorNamespace.Namespace,
}
var postUpdateRV string
bo := backoff.WithMaxRetries(backoff.NewConstantBackOff(tc.APIPollInterval), 180)
err := backoff.RetryNotify(func() error {
pb := &cmpv1alpha1.ProfileBundle{}
Expand All @@ -326,18 +327,22 @@ func ensureCELContentFile(c dynclient.Client, tc *testConfig.TestConfig) error {
return nil
}
pb.Spec.CELContentFile = tc.CELContentFile
return c.Update(goctx.TODO(), pb)
if err := c.Update(goctx.TODO(), pb); err != nil {
return err
}
postUpdateRV = pb.ResourceVersion
return nil
}, bo, func(err error, d time.Duration) {
log.Printf("Still waiting to set celContentFile on ProfileBundle ocp4 after %s: %s", d.String(), err)
})
if err != nil {
return fmt.Errorf("failed to set celContentFile on ProfileBundle ocp4: %w", err)
return "", fmt.Errorf("failed to set celContentFile on ProfileBundle ocp4: %w", err)
}
log.Printf("ProfileBundle ocp4 celContentFile set to %s", tc.CELContentFile)
return nil
return postUpdateRV, nil
}

func waitForValidTestProfileBundles(c dynclient.Client, tc *testConfig.TestConfig) error {
func waitForValidTestProfileBundles(c dynclient.Client, tc *testConfig.TestConfig, postCELUpdateRV string) error {
bundleNames := []string{"ocp4", "rhcos4"}

for _, bundleName := range bundleNames {
Expand All @@ -355,6 +360,12 @@ func waitForValidTestProfileBundles(c dynclient.Client, tc *testConfig.TestConfi
if found.Status.DataStreamStatus != cmpv1alpha1.DataStreamValid {
return fmt.Errorf("%s ProfileBundle is in %s state", found.Name, found.Status.DataStreamStatus)
}
if bundleName == "ocp4" && postCELUpdateRV != "" &&
found.ResourceVersion == postCELUpdateRV {
return fmt.Errorf(
"%s ProfileBundle status is stale, waiting for re-parse",
found.Name)
}
return nil
}, bo, func(err error, _ time.Duration) {
log.Printf("waiting for ProfileBundle %s to parse: %s", bundleName, err)
Expand Down