This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
worker: fix potential panic when restoring subtask from meta #305
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
csuzhangxc
added
priority/normal
Codecov Report
@@ Coverage Diff @@
## master #305 +/- ##
===========================================
Coverage 60.1755% 60.1755%
===========================================
Files 134 134
Lines 14810 14810
===========================================
Hits 8912 8912
Misses 5059 5059
Partials 839 839 |
|
@amyangfei @WangXiangUSTC PTAL |
Comment on lines
+86
to
+94
| // release resources, NOTE: we need to refactor New/Init/Start/Close for components later. | ||
| w2.cancel() | ||
| w2.subTaskHolder.closeAllSubTasks() | ||
| if w2.meta != nil { | ||
| w2.meta.Close() | ||
| } | ||
| if w2.db != nil { | ||
| w2.db.Close() | ||
| } |
There was a problem hiding this comment.
can we just use w2.Close(), and maybe need add some check in Close (close something when it is not nil)
There was a problem hiding this comment.
I think we can.
But I also think we should refactor the pattern of components' new/init/start/close later.
like new only creates fields but does not acquire (IO) resources and start no goroutines, then when new failed, no operation needs to do and let GC to remove the objects is enough.
I think we need to do some refactoring when developing the HA version of DM.
what's your opinion?
There was a problem hiding this comment.
OK，we can do this later
Co-Authored-By: WangXiangUSTC <wx347249478@gmail.com>
|
LGTM |
WangXiangUSTC
added
status/LGT1
amyangfei
added
status/LGT2
|
cherry pick to release-1.0 in PR #311 |
sre-bot
added
already-cherry-pick-1.0
csuzhangxc
pushed a commit
that referenced
this pull request
Oct 16, 2019
csuzhangxc
added
already-update-release-note
lichunzhu
pushed a commit
to lichunzhu/dm
that referenced
this pull request
Apr 6, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What problem does this PR solve?
What is changed and how it works?
before this PR, we have the following order in worker.go:
InitConditionHubregistersWorkerinstancesrestoreSubTaskrestores subtasks from metaw.ctx, w.cancel = context.WithCancel(context.Background())initsw.ctxandw.cancelbut when restoring subtasks from meta,
w.ctxmay be used, thennilpointer will be accessed and panicked.in this PR, we make sure have the following order:
w.ctx, w.cancel = context.WithCancel(context.Background())initsw.ctxandw.cancelInitConditionHubregistersWorkerinstancesrestoreSubTaskrestores subtasks from metaCheck List
Tests
Related changes