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

Bug 1997347: pkg/cmd/verify: bug fixes and improvements #657

Merged
merged 5 commits into from Sep 2, 2021

Conversation

hexfusion
Copy link
Contributor

@hexfusion hexfusion commented Sep 1, 2021

This PR addresses a few bugs that were missed in the original PR. The fact that logging was muted and the initcontainer was exiting 0 on failure masked the problems which did end up with a successful backup but the disk checks were not properly being performed. This also adds a fix for s390x compile errors carried from #656 thanks again @yselkowitz

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2021
@hexfusion hexfusion changed the title pkg/cmd/verify: improve multiarch support and logging Bug 1997347: pkg/cmd/verify: improve multiarch support and logging Sep 1, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Sep 1, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

@hexfusion: This pull request references Bugzilla bug 1997347, 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.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @geliu2016

In response to this:

Bug 1997347: pkg/cmd/verify: improve multiarch support and logging

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 the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 1, 2021
@yselkowitz
Copy link
Contributor

compile fixes from #656 still needed
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2021
@yselkowitz
Copy link
Contributor

Thanks. IMHO it would still be appropriate to retitle the second commit to reflect that it is only about logging, but this will compile now.
/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 Sep 1, 2021
@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.8

@openshift-cherrypick-robot

@hexfusion: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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 and others added 2 commits September 1, 2021 17:56
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@hexfusion
Copy link
Contributor Author

Thanks. IMHO it would still be appropriate to retitle the second commit to reflect that it is only about logging, but this will compile now.

I believe we are good now.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@hexfusion
Copy link
Contributor Author

/skip

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@hexfusion hexfusion changed the title Bug 1997347: pkg/cmd/verify: improve multiarch support and logging Bug 1997347: pkg/cmd/verify: bugfixes and improvements Sep 1, 2021
@hexfusion hexfusion changed the title Bug 1997347: pkg/cmd/verify: bugfixes and improvements Bug 1997347: pkg/cmd/verify: bug fixes and improvements Sep 1, 2021
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, wking

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

@hexfusion
Copy link
Contributor Author

/skip

@openshift-bot
Copy link
Contributor

/retest-required

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

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@hexfusion
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 2, 2021
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 2, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2021
@hexfusion
Copy link
Contributor Author

hexfusion commented Sep 2, 2021

/hold cancel

I0902 01:04:57.759979       1 backupstorage.go:155] Path /etc/kubernetes/cluster-backup, required storage bytes: 229507072, available 116686618624

@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 Sep 2, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 2, 2021

@hexfusion: This pull request references Bugzilla bug 1997347, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @geliu2016

In response to this:

Bug 1997347: pkg/cmd/verify: bug fixes and improvements

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 Author

/test e2e-agnostic

@hexfusion
Copy link
Contributor Author

This PR was locally tested and manually verified. Self-tagging for the sake of code freeze. I take responsibility for any negative results.

@hexfusion hexfusion added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2021
@openshift-bot
Copy link
Contributor

/retest-required

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

@hexfusion
Copy link
Contributor Author

infra flake
/test e2e-agnostic

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 2, 2021

@hexfusion: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-single-node 12a5bc1 link /test e2e-aws-single-node
ci/prow/e2e-gcp-five-control-plane-replicas 12a5bc1 link /test e2e-gcp-five-control-plane-replicas

Full PR test history. Your PR dashboard.

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.

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit 7182fb5 into openshift:master Sep 2, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 2, 2021

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

Bugzilla bug 1997347 has been moved to the MODIFIED state.

In response to this:

Bug 1997347: pkg/cmd/verify: bug fixes and improvements

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-cherrypick-robot

@hexfusion: #657 failed to apply on top of branch "release-4.8":

Applying: pkg/cmd/verify: improve logging
Using index info to reconstruct a base tree...
M	cmd/cluster-etcd-operator/main.go
A	pkg/cmd/verify/backupstorage.go
A	pkg/cmd/verify/verify.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/cmd/verify/verify.go deleted in HEAD and modified in pkg/cmd/verify: improve logging. Version pkg/cmd/verify: improve logging of pkg/cmd/verify/verify.go left in tree.
CONFLICT (modify/delete): pkg/cmd/verify/backupstorage.go deleted in HEAD and modified in pkg/cmd/verify: improve logging. Version pkg/cmd/verify: improve logging of pkg/cmd/verify/backupstorage.go left in tree.
Auto-merging cmd/cluster-etcd-operator/main.go
CONFLICT (content): Merge conflict in cmd/cluster-etcd-operator/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/cmd/verify: improve logging
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.8

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 hexfusion deleted the s390x branch September 2, 2021 07:07
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-medium Referenced Bugzilla bug's severity is medium 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. 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

6 participants