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

[CPS-6393]fix(resync): resync the release controller when occured unknown error #152

Merged
merged 2 commits into from
Apr 17, 2020

Conversation

whalecold
Copy link
Member

What this PR does / why we need it:

Add your description

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @qianlei90 @hezhizhen

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 15, 2020
Copy link
Contributor

@qianlei90 qianlei90 left a comment

Choose a reason for hiding this comment

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

这样修,只有在resync的时候,才会更新掉错误的状态吧,而这个resync的时间,默认是12小时?

@whalecold
Copy link
Member Author

这样修,只有在resync的时候,才会更新掉错误的状态吧,而这个resync的时间,默认是12小时?

默认 30s

@qianlei90
Copy link
Contributor

/lgtm

@caicloud-bot caicloud-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 Apr 16, 2020
@qianlei90
Copy link
Contributor

/hold

@caicloud-bot caicloud-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 16, 2020
@qianlei90
Copy link
Contributor

/cc @hezhizhen

@qianlei90
Copy link
Contributor

/hold cancel

@caicloud-bot caicloud-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 17, 2020
@hezhizhen
Copy link
Contributor

/lgtm

@caicloud-bot caicloud-bot merged commit 7f1bb4a into caicloud:master Apr 17, 2020
@caicloud-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hezhizhen, qianlei90

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 [hezhizhen,qianlei90]

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

@whalecold
Copy link
Member Author

/cherrypick release-0.4

@caicloud-bot
Copy link
Contributor

@whalecold: #152 failed to apply on top of branch "release-0.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	cmd/controller/app/controllers.go
M	pkg/controller/release/controller.go
M	pkg/release/handler.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/release/handler.go
Auto-merging pkg/controller/release/controller.go
CONFLICT (content): Merge conflict in pkg/controller/release/controller.go
Auto-merging cmd/controller/app/controllers.go
Patch failed at 0001 fix(resync): resync the release controller when occured unknown error

In response to this:

/cherrypick release-0.4

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.

whalecold added a commit to whalecold/rudder that referenced this pull request Jun 19, 2020
…nown error (caicloud#152)

* [CPS-6393]fix(resync): resync the release controller when occured unknown error

* use time.During instead of int32

Co-authored-by: Lisheng Zheng <zhenglisheng@caicloud.io>
whalecold pushed a commit to whalecold/rudder that referenced this pull request Jun 19, 2020
…nown error (caicloud#152)

* [CPS-6393]fix(resync): resync the release controller when occured unknown error

* use time.During instead of int32

Co-authored-by: Lisheng Zheng <zhenglisheng@caicloud.io>
whalecold pushed a commit to whalecold/rudder that referenced this pull request Jun 23, 2020
…nown error (caicloud#152)

* [CPS-6393]fix(resync): resync the release controller when occured unknown error

* use time.During instead of int32

Co-authored-by: Lisheng Zheng <zhenglisheng@caicloud.io>
caicloud-bot pushed a commit that referenced this pull request Jun 28, 2020
…known error (#152) (#156)

* [CPS-6393]fix(resync): resync the release controller when occured unknown error (#152)

* [CPS-6393]fix(resync): resync the release controller when occured unknown error

* use time.During instead of int32

Co-authored-by: Lisheng Zheng <zhenglisheng@caicloud.io>

* fix lint error

Co-authored-by: Lisheng Zheng <zhenglisheng@caicloud.io>
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. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants