Skip to content
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.

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

[release-4.7] Bug 1976287: Validate the status of the etcd snapshot during backup and restore #617

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #603

/assign hexfusion

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2021

@openshift-cherrypick-robot: Bugzilla bug 1965024 has been cloned as Bugzilla bug 1976287. Retitling PR to link against new bug.
/retitle [release-4.7] Bug 1976287: Validate the status of the etcd snapshot during backup and restore

In response to this:

[release-4.7] Bug 1965024: Validate the status of the etcd snapshot during backup and restore

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 openshift-ci bot changed the title [release-4.7] Bug 1965024: Validate the status of the etcd snapshot during backup and restore [release-4.7] Bug 1976287: Validate the status of the etcd snapshot during backup and restore Jun 25, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2021

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1976287, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1965024 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1965024 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

In response to this:

[release-4.7] Bug 1976287: Validate the status of the etcd snapshot during backup and restore

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 openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jun 25, 2021
@openshift-ci openshift-ci bot requested a review from geliu2016 June 25, 2021 17:07
@hexfusion
Copy link
Contributor

/lgtm
/approve
/hold for tests

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jun 25, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, openshift-cherrypick-robot

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 25, 2021
@hexfusion
Copy link
Contributor

/test e2e-disruptive

@hexfusion
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 26, 2021
@dhellmann dhellmann added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 30, 2021
@openshift-merge-robot openshift-merge-robot merged commit 1fddc46 into openshift:release-4.7 Jun 30, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 30, 2021

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1976287 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1976287: Validate the status of the etcd snapshot during backup and restore

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.

@hexfusion
Copy link
Contributor

/cherry-pick release-4.6

@openshift-cherrypick-robot
Copy link
Author

@hexfusion: #617 failed to apply on top of branch "release-4.6":

Applying: Add consistency checks on the etcd snapshot during the backup and restore operations.
.git/rebase-apply/patch:216: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	bindata/etcd/cluster-backup.sh
M	pkg/operator/etcd_assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/etcd_assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/etcd_assets/bindata.go
Auto-merging bindata/etcd/cluster-backup.sh
CONFLICT (content): Merge conflict in bindata/etcd/cluster-backup.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add consistency checks on the etcd snapshot during the backup and restore operations.
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants