Skip to content

Alibaba: format the log of the destroyer #5435

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Dec 13, 2021
Merged

Alibaba: format the log of the destroyer #5435

openshift-merge-robot merged 1 commit into from
Dec 13, 2021

Conversation

@bd233
Copy link
Contributor

@bd233 bd233 commented Dec 1, 2021

Format the log of the destroyer and output more resource information

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 1, 2021
@bd233 bd233 mentioned this pull request Dec 1, 2021
Merged
staebler
staebler reviewed Dec 8, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 8, 2021
@staebler
Copy link
Contributor

staebler commented Dec 8, 2021

@bd233 Is this still a draft? Or is this ready to merge?

@bd233 bd233 force-pushed the alibabcloud-destroy-logger branch from 9b708d2 to 0b4a179 Compare December 10, 2021 12:13
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2021
@bd233 bd233 marked this pull request as ready for review December 10, 2021 12:21
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 10, 2021
@bd233
Copy link
Contributor Author

bd233 commented Dec 10, 2021

@bd233 Is this still a draft? Or is this ready to merge?

I updated most of the logs

staebler
staebler reviewed Dec 10, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

Good improvements. Thanks.

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Suggested change
execute func(*logrus.Entry) error
execute func(logrus.FieldLogger) error

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Suggested change
o.Logger.Debugf("%s: %v", f.name, ferr)
stageLogger.WithError(err).Debugf("Error executing stage")

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Suggested change
logger.Info("Resource groups deleted")
logger.Info("Resource group deleted")

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Suggested change
logger.Info("OSS bucket Deleted")
logger.Info("OSS bucket deleted")

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

The logger passed in already has a field "id" that has the SBL ID.

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Suggested change
logger.Info("VSwitch deleted")
logger.Info("VSwitches deleted")

pkg/destroy/alibabacloud/alibabacloud.go Outdated
Copy link
Contributor

@staebler staebler Dec 10, 2021

Choose a reason for hiding this comment

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

Other places where the security group ID is added as a field, the key "id" is used. Let's stay consistent. Either change everywhere else to use "securityGroupID" or change this place to use "id".

Suggested change
logger.WithField("securityGroupID", securityGroupID).Debug("Revoking")
logger.WithField("id", securityGroupID).Debug("Revoking")

Copy link
Contributor Author

@bd233 bd233 Dec 10, 2021

Choose a reason for hiding this comment

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

Have updated^^

@bd233 bd233 force-pushed the alibabcloud-destroy-logger branch from 0b4a179 to a9c57e1 Compare December 10, 2021 17:14
staebler
staebler approved these changes Dec 10, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

openshift-ci bot commented Dec 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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

The pull request process is described here

Details 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-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

7 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 10, 2021

/retest-required

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

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 10, 2021
@mtulio
Copy link
Contributor

mtulio commented Dec 10, 2021

@bd233 as the 5421 was merged, we need to rebase this PR. ptal? Thanks!

@bd233
Alibaba: fix: format the log of the destroyer
da0f219 
Format the log of the destroyer and output more resource information

Signed-off-by: sunhui <[email protected]>
@bd233 bd233 force-pushed the alibabcloud-destroy-logger branch from a9c57e1 to da0f219 Compare December 12, 2021 16:06
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 12, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 12, 2021

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

Test name Commit Details Required Rerun command
ci/prow/e2e-ovirt da0f219 link false /test e2e-ovirt
ci/prow/e2e-aws-workers-rhel7 da0f219 link false /test e2e-aws-workers-rhel7
ci/prow/e2e-libvirt da0f219 link false /test e2e-libvirt
ci/prow/e2e-crc da0f219 link false /test e2e-crc
ci/prow/e2e-aws-workers-rhel8 da0f219 link false /test e2e-aws-workers-rhel8
ci/prow/e2e-aws-fips da0f219 link false /test e2e-aws-fips
ci/prow/e2e-aws-single-node da0f219 link false /test e2e-aws-single-node

Full PR test history. Your PR dashboard.

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.

@mtulio
Copy link
Contributor

mtulio commented Dec 13, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 13, 2021
@openshift-merge-robot openshift-merge-robot merged commit 8bf4833 into openshift:master Dec 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@staebler staebler staebler approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mtulio mtulio

@staebler staebler

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bd233 @staebler @openshift-bot @mtulio @openshift-merge-robot