Bug 1885425: fix(indexing): order bulk add by version field #503

njhale · 2020-11-03T04:34:51Z

When adding more than one bundle to an index in replaces mode, sort the input by order of ascending version field (semver). This ensures a deterministic update graph in the absence of a replaces field.

The replaces field takes priority.

openshift-ci-robot · 2020-11-03T04:35:42Z

@njhale: An error was encountered searching for bug 1885425 on the Bugzilla server at https://bugzilla.redhat.com:

could not unmarshal response body: unexpected end of JSON input
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1885425: fix(indexing): order bulk add by version field

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

njhale · 2020-11-03T04:36:57Z

/bugzilla refresh

openshift-ci-robot · 2020-11-03T04:36:59Z

@njhale: An error was encountered searching for bug 1885425 on the Bugzilla server at https://bugzilla.redhat.com:

could not unmarshal response body: unexpected end of JSON input
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

njhale · 2020-11-03T14:46:03Z

/bugzilla refresh
/retest

openshift-ci-robot · 2020-11-03T14:46:10Z

@njhale: This pull request references Bugzilla bug 1885425, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh
/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

njhale · 2020-11-05T15:42:54Z

/retest
/hold

yashvardhannanavati · 2020-11-11T21:24:57Z

Can I please ask what's the time-frame of this PR getting merged?

codecov · 2020-11-12T05:04:38Z

Codecov Report

Merging #503 (ffbb2c4) into master (ed41d85) will increase coverage by 0.69%.
The diff coverage is 67.56%.

@@            Coverage Diff             @@
##           master     #503      +/-   ##
==========================================
+ Coverage   48.73%   49.42%   +0.69%     
==========================================
  Files          90       90              
  Lines        6103     6286     +183     
==========================================
+ Hits         2974     3107     +133     
- Misses       2469     2485      +16     
- Partials      660      694      +34

Impacted Files	Coverage Δ
pkg/registry/decode.go	`81.25% <ø> (ø)`
pkg/registry/empty.go	`0.00% <0.00%> (ø)`
pkg/sqlite/load.go	`41.79% <38.29%> (-0.50%)`	⬇️
pkg/sqlite/query.go	`67.08% <61.66%> (+0.50%)`	⬆️
pkg/registry/bundle.go	`58.53% <73.33%> (+7.83%)`	⬆️
pkg/registry/populator.go	`63.02% <77.01%> (+2.59%)`	⬆️
pkg/registry/input_stream.go	`77.94% <77.94%> (ø)`
pkg/lib/bundle/validate.go	`63.80% <100.00%> (ø)`
pkg/registry/imageinput.go	`69.49% <100.00%> (+0.52%)`	⬆️
pkg/sqlite/configmap.go	`45.16% <100.00%> (ø)`
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ed41d85...8096517. Read the comment docs.

When adding more than one bundle to an index in replaces mode, sort the input by order of ascending version field (semver). This ensures a deterministic update graph in the absence of a replaces field. The replaces field takes priority.

njhale · 2020-11-13T05:55:56Z

/hold cancel

Can I please ask what's the time-frame of this PR getting merged?

@yashvardhannanavati I'm requesting reviews now. If all goes well it should be in today.

On index add in replaces mode, pick the highest bundle version in each channel as its head; take the default channel from the highest bundle version in the entire package.

ecordell · 2020-11-13T15:31:06Z

/approve

openshift-ci-robot · 2020-11-13T15:31:11Z

[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:

~~OWNERS~~ [ecordell,njhale]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

kevinrizza · 2020-11-13T16:08:57Z

/lgtm

openshift-bot · 2020-11-13T17:35:33Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-11-13T18:14:34Z

/retest

Please review the full test history for this PR and help us cut down flakes.

njhale · 2020-11-13T21:57:48Z

/retest

njhale · 2020-11-14T14:51:23Z

/retest

openshift-bot · 2020-11-16T07:46:19Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-11-16T07:59:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

njhale · 2020-11-16T14:38:48Z

/hold

e2e-aws consistently failing. investigating now.

njhale · 2020-11-16T16:21:08Z

/hold cancel

The failures don't seem to be isolated to this PR or operator-registry. DPTP is looking into the problem (see https://coreos.slack.com/archives/CEKNRGF25/p1605530888050100)

njhale · 2020-11-16T16:21:18Z

/retest

njhale · 2020-11-16T20:59:25Z

/retest

njhale · 2020-11-17T15:26:28Z

/retest

openshift-ci-robot · 2020-11-17T18:06:58Z

@njhale: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

operator-framework/operator-registry#479 is closed

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1885425 has not been moved to the MODIFIED state.

In response to this:

Bug 1885425: fix(indexing): order bulk add by version field

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

njhale · 2020-11-17T20:37:10Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2020-11-17T20:37:16Z

@njhale: #503 failed to apply on top of branch "release-4.6":

Applying: fix(indexing): order bulk add by version field
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/registry/populator_test.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing pkg/registry/replacesgraphloader.go
Auto-merging pkg/registry/populator_test.go
CONFLICT (content): Merge conflict in pkg/registry/populator_test.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix(indexing): order bulk add by version field
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

With the introduction of operator-framework#503, when a bundle from the list of bundles being added with the `opm index add` command was invalid, opm was not throwing an error, and was building the index with the valid bundles instead, even when the `permissive` mode was not enabled. This PR fixes the issue.

njhale · 2020-11-19T19:19:11Z

/bugzilla refresh

openshift-ci-robot · 2020-11-19T19:19:15Z

@njhale: All pull requests linked via external trackers have merged:

operator-framework/operator-registry#503

Bugzilla bug 1885425 has been moved to the MODIFIED state.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot requested review from dinhxuanvu and gallettilance November 3, 2020 04:34

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2020

njhale changed the title ~~fix(indexing): order bulk add by version field~~ Bug 1885425: fix(indexing): order bulk add by version field Nov 3, 2020

njhale mentioned this pull request Nov 3, 2020

Bug 1885425: fix(indexing): include skips in bulk add order #479

Closed

njhale force-pushed the fix-bulk-add branch from bb2fbe9 to 8702f75 Compare November 3, 2020 04:42

openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Nov 3, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 3, 2020

njhale force-pushed the fix-bulk-add branch 3 times, most recently from fa2449f to 0dd89d1 Compare November 3, 2020 15:04

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 5, 2020

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2020

njhale force-pushed the fix-bulk-add branch 3 times, most recently from 3e84bf0 to 716e9ff Compare November 13, 2020 05:40

fix(indexing): order bulk add by version field

396ca5b

When adding more than one bundle to an index in replaces mode, sort the input by order of ascending version field (semver). This ensures a deterministic update graph in the absence of a replaces field. The replaces field takes priority.

njhale force-pushed the fix-bulk-add branch from 716e9ff to ee50b37 Compare November 13, 2020 05:48

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2020

fix(indexing): pick channel heads by semver

8096517

On index add in replaces mode, pick the highest bundle version in each channel as its head; take the default channel from the highest bundle version in the entire package.

openshift-ci-robot assigned kevinrizza Nov 13, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 16, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 16, 2020

openshift-merge-robot merged commit 6ec440c into operator-framework:master Nov 17, 2020

njhale mentioned this pull request Nov 18, 2020

[release-4.6] Bug 1898746: fix(indexing): order bulk add by version field #521

Merged

This was referenced Nov 18, 2020

fix(opm-index-add) Throw error when a bundle is invalid #522

Closed

Bug 1868125: [opm] Add valid bundles to index when permissive enabled #517

Closed

This was referenced Jan 19, 2021

Sorting order of operator bundles not being honored in 1.12.x of opm #328

Closed

opm index add default channel issue #387

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1885425: fix(indexing): order bulk add by version field #503

Bug 1885425: fix(indexing): order bulk add by version field #503

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 5, 2020

yashvardhannanavati commented Nov 11, 2020

codecov bot commented Nov 12, 2020 •

edited

njhale commented Nov 13, 2020

ecordell commented Nov 13, 2020

openshift-ci-robot commented Nov 13, 2020

kevinrizza commented Nov 13, 2020

openshift-bot commented Nov 13, 2020

openshift-bot commented Nov 13, 2020

njhale commented Nov 13, 2020

njhale commented Nov 14, 2020

openshift-bot commented Nov 16, 2020

openshift-bot commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 17, 2020

openshift-ci-robot commented Nov 17, 2020

njhale commented Nov 17, 2020

openshift-cherrypick-robot commented Nov 17, 2020

njhale commented Nov 19, 2020

openshift-ci-robot commented Nov 19, 2020

Bug 1885425: fix(indexing): order bulk add by version field #503

Bug 1885425: fix(indexing): order bulk add by version field #503

Conversation

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 3, 2020

openshift-ci-robot commented Nov 3, 2020

njhale commented Nov 5, 2020

yashvardhannanavati commented Nov 11, 2020

codecov bot commented Nov 12, 2020 • edited

Codecov Report

njhale commented Nov 13, 2020

ecordell commented Nov 13, 2020

openshift-ci-robot commented Nov 13, 2020

kevinrizza commented Nov 13, 2020

openshift-bot commented Nov 13, 2020

openshift-bot commented Nov 13, 2020

njhale commented Nov 13, 2020

njhale commented Nov 14, 2020

openshift-bot commented Nov 16, 2020

openshift-bot commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 16, 2020

njhale commented Nov 17, 2020

openshift-ci-robot commented Nov 17, 2020

njhale commented Nov 17, 2020

openshift-cherrypick-robot commented Nov 17, 2020

njhale commented Nov 19, 2020

openshift-ci-robot commented Nov 19, 2020

codecov bot commented Nov 12, 2020 •

edited