owner: add recover panic in owner campaignLoop. #5904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ngaut
reviewed
Feb 26, 2018
owner/manager.go
Outdated
| @@ -172,7 +173,23 @@ func (m *ownerManager) CampaignOwner(ctx context.Context) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func recoverInOwner(funcName string, quit bool) { | |||
| r := recover() | |||
There was a problem hiding this comment.
Please use if assignment pattern.
|
@ngaut PTAL |
coocood
reviewed
Feb 26, 2018
owner/manager.go
Outdated
| func (m *ownerManager) campaignLoop(ctx context.Context, etcdSession *concurrency.Session) { | ||
| defer recoverInOwner("campaignLoop", true) |
There was a problem hiding this comment.
We don't need to quit if ddl doesn't work.
ngaut
reviewed
Feb 26, 2018
owner/manager.go
Outdated
| @@ -172,7 +173,21 @@ func (m *ownerManager) CampaignOwner(ctx context.Context) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func recoverInOwner(funcName string, quit bool) { | |||
There was a problem hiding this comment.
The function acts like graceful exit process, the function name is not consistent with the behavior.
|
@coocood PTAL |
ngaut
reviewed
Feb 26, 2018
owner/manager.go
Outdated
| buf := util.GetStack() | ||
| log.Errorf("%s, %v, %s", funcName, r, buf) | ||
| metrics.PanicCounter.WithLabelValues(metrics.LabelDDLOwner).Inc() | ||
| if quit { |
There was a problem hiding this comment.
How about remove the quit code block which would make it a real recover function?
|
@ngaut PTAL |
|
LGTM |
ngaut
approved these changes
Feb 26, 2018
ngaut
added
status/LGT2
|
/run-all-tests |
|
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.