Skip to content

[3.6][Backport] Prune orphaned blobs on registry storage#16126

Merged
openshift-merge-robot merged 5 commits intoopenshift:release-3.6from
miminar:origin3.6-registry-prunes-orphanes
Sep 8, 2017
Merged

[3.6][Backport] Prune orphaned blobs on registry storage#16126
openshift-merge-robot merged 5 commits intoopenshift:release-3.6from
miminar:origin3.6-registry-prunes-orphanes

Conversation

@miminar
Copy link

@miminar miminar commented Sep 4, 2017

Resolves bz#1479340
Backports #14585

Oleg Bulatov and others added 3 commits September 4, 2017 13:16
Add -prune option to dockerregistry
5efa5b8 
Signed-off-by: Oleg Bulatov <obulatov@redhat.com>
Exit normally if registry's storage is empty
551b37b 
In earlier versions of docker-registry, repository enumeration didn't
return error for empty registry storage while the blob enumeration
function did. This case needs to be handled.

Signed-off-by: Michal Minář <miminar@redhat.com>
Extended test for registry garbage collector
899b2fa 
Signed-off-by: Michal Minář <miminar@redhat.com>
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 4, 2017
@miminar
Copy link
Author

miminar commented Sep 4, 2017

/test extended_image_registry

@miminar
Copy link
Author

miminar commented Sep 4, 2017

Obsoletes openshift/ose#827

@bparees
Copy link
Contributor

bparees commented Sep 5, 2017

/retest

@bparees
Copy link
Contributor

bparees commented Sep 5, 2017

@miminar doesn't this need to be backported to the ose repos's 3.6 release, not origin's, at this point?

@miminar
Copy link
Author

miminar commented Sep 6, 2017

@bparees I was told that it will be merged to ose automatically once merged here.

@miminar
Copy link
Author

miminar commented Sep 6, 2017 •
edited
Loading

The same problem as with other release-3.6 PR #16138 (comment)

Update: opened issue #16169
Update: issue #16143 says it all

@miminar
Copy link
Author

miminar commented Sep 6, 2017

/test end_to_end

@bparees
Copy link
Contributor

bparees commented Sep 6, 2017

@miminar that wasn't my understanding. @brenton are backports to origin:release-3.6 automatically being pulled into the ose release 3.6.x branch for errata releases? My understanding was we had to backport to ose manually.

@bparees
Copy link
Contributor

bparees commented Sep 6, 2017

@jupierce may know too ^^^

@jupierce
Copy link
Contributor

jupierce commented Sep 6, 2017

@bparees We are leaving open the opportunity to merge into origin:release-1.6 for a time because ose CI is not functional. Once ose CI is operational again, engineering will be asked to merge directly into ose.

@bparees
Copy link
Contributor

bparees commented Sep 6, 2017

@jupierce got it, thanks.

@0xmichalis
Copy link
Contributor

0xmichalis commented Sep 6, 2017

/test extended_image_registry

@miminar
Copy link
Author

miminar commented Sep 6, 2017

Issue #16143 once again.
/retest

@miminar
Copy link
Author

miminar commented Sep 7, 2017

Still #16143
/retest

@miminar miminar mentioned this pull request Sep 7, 2017
Closed
Michal Minář added 2 commits September 7, 2017 16:30
extended: fixed registry tests
937ce6a 
The extended test suite now secures the registry. This patch allows for
secure connection to the registry.

Signed-off-by: Michal Minář <miminar@redhat.com>
extended: Skip test instead of failing
466f2c3 
When server configuration cannot be determined.

Signed-off-by: Michal Minář <miminar@redhat.com>
@miminar
Copy link
Author

miminar commented Sep 7, 2017

Cool. The extended tests work again. I've just added some fixes for the failing extended tests (#15779 and #15807).

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 7, 2017 •
edited
Loading

@miminar: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_image_registry 899b2fa link /test extended_image_registry

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@bparees
Copy link
Contributor

bparees commented Sep 8, 2017

/retest

@bparees
Copy link
Contributor

bparees commented Sep 8, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2017
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Sep 8, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, miminar

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2017
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Sep 8, 2017

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit 387485d into openshift:release-3.6 Sep 8, 2017
@miminar miminar deleted the origin3.6-registry-prunes-orphanes branch February 22, 2018 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@bparees bparees

@dcbw dcbw

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@miminar @bparees @jupierce @0xmichalis @openshift-ci-robot @openshift-merge-robot @dcbw