embed: fix blocking Close before gRPC server start #7848
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
|
can we add a test for it? |
fanminshi
reviewed
May 1, 2017
| @@ -83,6 +83,10 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) { | |||
| return | |||
There was a problem hiding this comment.
how come we don't close grpcServerC at here?
embed/etcd.go
Outdated
| // errored before starting gRPC server for serveCtx.grpcServerC | ||
| for _, sctx := range e.sctxs { | ||
| close(sctx.grpcServerC) | ||
| } |
There was a problem hiding this comment.
maybe a helper function to close sctxs? I see that this code is called twice already.
embed/etcd.go
Outdated
| @@ -83,6 +83,10 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) { | |||
| return | |||
| } | |||
| if e.sctxs, err = startClientListeners(cfg); err != nil { | |||
| // errored before starting gRPC server for serveCtx.grpcServerC | |||
There was a problem hiding this comment.
just put these in the defer?
defer func() {
if e == nil || err == nil {
return
}
if !serving {
for _, sctx := range e.sctxs { close(sctx.grpcServerC)
}
e.Close()
e = nil
}()
gyuho
force-pushed
the
close-grpcc
branch
2 times, most recently
from
c791d13
to
9cdee03
Compare
|
PTLA. |
heyitsanthony
approved these changes
May 1, 2017
|
lgtm thanks |
|
lgtm |
If 'StartEtcd' returns before starting gRPC server (e.g. mismatch snapshot, misconfiguration), receiving from grpcServerC blocks forever. This patch just closes the channel to not block on grpcServerC, and proceeds to next stop operations in Close. This was masking the issues in etcd-io#7834 Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #7848 +/- ##
=========================================
+ Coverage 75.54% 76% +0.46%
=========================================
Files 332 332
Lines 26177 26183 +6
=========================================
+ Hits 19776 19901 +125
+ Misses 4970 4857 -113
+ Partials 1431 1425 -6
Continue to review full report at Codecov.
|
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.
If 'StartEtcd' returns before starting gRPC server
(e.g. mismatch snapshot, misconfiguration),
receiving from grpcServerC blocks forever. This patch
just closes the channel to not block on grpcServerC,
and proceeds to next stop operations in Close.
This was masking the issues in #7834