fix: agent should exit on disconnect event whatever master kill with SIGKILL #27
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
|
@fengmk2, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dead-horse, @popomore and @ngot to be potential reviewers. |
|
我得加测试用例。 |
fengmk2
changed the title
atian25
reviewed
May 25, 2017
lib/agent_worker.js
Outdated
| @@ -23,12 +23,22 @@ agent.ready(() => { | |||
| agent.once('error', startErrorHandler); | |||
| function startErrorHandler(err) { | |||
| consoleLogger.error(err); | |||
| consoleLogger.error('[agent_worker] Agent Worker start error, exiting now!'); | |||
| consoleLogger.error('[agent_worker] start error, exiting with code:1'); | |||
lib/master.js
Outdated
|
|
||
| function receiveSig(sig) { | ||
| debug('receive signal %s, exit with code 0, pid %s', sig, process.pid); |
dead-horse
reviewed
May 26, 2017
lib/agent_worker.js
Outdated
|
|
||
| process.once('disconnect', () => { | ||
| consoleLogger.info('[agent_worker] got disconnect event on child_process fork mode, exiting with code:0'); | ||
| process.exit(0); |
Codecov Report
@@ Coverage Diff @@
## master #27 +/- ##
==========================================
- Coverage 96.59% 95.19% -1.41%
==========================================
Files 7 7
Lines 294 333 +39
==========================================
+ Hits 284 317 +33
- Misses 10 16 +6
Continue to review full report at Codecov.
|
|
加了一个 io loop 等 SIGTERM 事件发生，避免误判 |
|
终于搞定正常退出的完整提示日志了
|
|
这个测试怎么没有触发 appveyor |
fengmk2
commented
May 27, 2017
| // kill(15) default | ||
| process.once('SIGTERM', this.onSignal.bind(this, 'SIGTERM')); | ||
|
|
||
| process.once('exit', this.onExit.bind(this)); |
fengmk2
commented
May 27, 2017
| @@ -385,6 +419,17 @@ class Master extends EventEmitter { | |||
| } | |||
| require('cluster-reload')(this.options.workers); | |||
| } | |||
|
|
|||
| close() { | |||
dead-horse
reviewed
May 27, 2017
| process.once('exit', code => { | ||
| // istanbul can't cover here | ||
| // https://github.com/gotwarlost/istanbul/issues/567 | ||
| this.killAgentWorker(); |
dead-horse
approved these changes
May 27, 2017
|
1.6.4 |
popomore
reviewed
May 28, 2017
| process.once('SIGQUIT', receiveSig.bind(null, 'SIGQUIT')); | ||
| // kill(15) default | ||
| process.once('SIGTERM', receiveSig.bind(null, 'SIGTERM')); | ||
| onExit(code) { |
There was a problem hiding this comment.
onSignal => close => onExit(code)
|
这个 fix 也证明，通过 child_process fork 出来的子进程，如果需要实现父进程挂了子进程也跟着挂，必须在子进程里面也加上相应的处理，才能实现，没办法只通过父进程来实现。 |
|
哦，除非再起一个观察者进程，发现父进程挂了，然后去强制杀掉未退出的子进程，然后自杀。 |
fengmk2
added a commit
that referenced
this pull request
Jun 12, 2017
4 tasks
fengmk2
added a commit
that referenced
this pull request
Jun 12, 2017
hyj1991
pushed a commit
to hyj1991/egg-cluster
that referenced
this pull request
Jun 6, 2022
hyj1991
pushed a commit
to hyj1991/egg-cluster
that referenced
this pull request
Jun 6, 2022
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.
closes eggjs/egg#960
Checklist
npm testpassesAffected core subsystem(s)
Description of change