fix(subscriptions): fix race between subscription sync and cache #689
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
approved
Adds a "generated-by" annotation to subscriptions generated for requiredAPIs that contains the name of the generating installplan. If the "generated-by" installplan is not present in the cache at the generated subscription's sync time, the subscription is resynced until it is.
ecordell
reviewed
Jan 29, 2019
| @@ -47,6 +47,8 @@ const ( | |||
| serviceKind = "Service" | |||
| roleKind = "Role" | |||
| roleBindingKind = "RoleBinding" | |||
|
|
|||
| generatedByKey = "olm/generated-by" | |||
There was a problem hiding this comment.
elsewhere we used olm. as a prefix. Also gofmt
| ipName, ok := sub.GetAnnotations()[generatedByKey] | ||
| if !ok { | ||
| // err := fmt.Errorf("no installplan reference or %s annotation found", generatedByKey) | ||
| // logger.WithField("err", err.Error()).Error("an error occurred while associating a subscription with an installplan") |
test/e2e/installplan_e2e_test.go
Outdated
| @@ -567,6 +567,7 @@ func TestCreateInstallPlanWithPreExistingCRDOwners(t *testing.T) { | |||
| // existing cleanup should remove this | |||
| createSubscriptionForCatalog(t, crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, betaChannel, v1alpha1.ApprovalAutomatic) | |||
|
|
|||
| // time.Sleep(5 * time.Minute) | |||
openshift-ci-robot
added
size/L
ecordell
reviewed
Jan 29, 2019
| @@ -145,6 +145,43 @@ type Step struct { | |||
| Status StepStatus `json:"status"` | |||
| } | |||
|
|
|||
| // ManifestsMatch returns true if the CSV manifests in the StepResources of the given list of steps | |||
| // matches those in the InstallPlanStatus. | |||
| func (s *InstallPlanStatus) CSVManifestsMatch(steps []*Step) bool { | |||
There was a problem hiding this comment.
if you make this a method on installplan, can't we skip half of this calculation? (spec.clusterServiceVersionNames is a list of the csvs)
There was a problem hiding this comment.
discussed in person - nevermind 😄
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ecordell, njhale The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ecordell
pushed a commit
to ecordell/operator-lifecycle-manager
that referenced
this pull request
Mar 8, 2019
fix(subscriptions): fix race between subscription sync and cache
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a "generated-by" annotation to subscriptions generated for requiredAPIs that contains the name of the generating installplan. If the "generated-by" installplan is not present in the cache at the generated subscription's sync time, the subscription is resynced until it is.
Addresses ALM-884.