Skip to content

Fix race condition in duplicate InstallPlan prevention #3684

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
joelanford wants to merge 1 commit into from
Closed

Fix race condition in duplicate InstallPlan prevention #3684

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
14 changes: 8 additions & 6 deletions pkg/controller/operators/catalog/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,12 +1654,6 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, gen
return nil, nil
}

// Check if any existing installplans are creating the same resources
installPlans, err := o.listInstallPlans(namespace)
if err != nil {
return nil, err
}

// There are multiple(2) worker threads process the namespaceQueue.
// Both worker can work at the same time when 2 separate updates are made for the namespace.
// The following sequence causes 2 installplans are created for a subscription
Expand All @@ -1680,6 +1674,14 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, gen
o.muInstallPlan.Lock()
defer o.muInstallPlan.Unlock()

// Check if any existing installplans are creating the same resources
// This must be done AFTER acquiring the lock to ensure worker 2 sees
// the installplan created by worker 1
installPlans, err := o.listInstallPlans(namespace)
if err != nil {
return nil, err
}

for _, installPlan := range installPlans {
if installPlan.Spec.Generation == gen {
return reference.GetReference(installPlan)
Expand Down