server/embed: fix data race when start insecure grpc #15509
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
There are two goroutines accessing the `gs` grpc server var. Before insecure `gs` server start, the `gs` can be changed to secure server and then the client will fail to connect to etcd with insecure request. It is data-race. We should use argument for reference in the new goroutine. fix: etcd-io#15495 Signed-off-by: Wei Fu <fuweid89@gmail.com>
serathius
approved these changes
Mar 18, 2023
ahrtr
approved these changes
Mar 18, 2023
Comment on lines
+186
to
+192
| defer func(gs *grpc.Server) { | ||
| if err != nil { | ||
| sctx.lg.Warn("stopping secure grpc server due to error", zap.Error(err)) | ||
| gs.Stop() | ||
| sctx.lg.Warn("stopped secure grpc server due to error", zap.Error(err)) | ||
| } | ||
| }(gs) |
There was a problem hiding this comment.
Minor comment: the code block is almost identical to the code block for insecure. I am thinking to define a separate function something like below, then call it in both secure and insecure code block.
func closegRPCServer(gs *grpc.Server) {
...
}
There was a problem hiding this comment.
Since it needs return error to the log, I'm not sure how to handle this with your idea. In here, I follow the defer pattern~
|
@fuweid Could you backport it to release-3.5 and release-3.4? |
Sure! Will send prs later. |
This was referenced Mar 20, 2023
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Mar 22, 2023
Add item **server/embed: fix data race when start insecure grpc** to 3.4/3.5 changelog. REF: etcd-io#15509 Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Mar 22, 2023
Add item [server/embed: fix data race when starting both secure & insecure gRPC servers on the same address] to 3.4/3.5 changelog. REF: etcd-io#15509 Signed-off-by: Wei Fu <fuweid89@gmail.com>
9 tasks
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.
There are two goroutines accessing the
gsgrpc server var. Before insecuregsserver start, thegscan be changed to secure server and then the client will fail to connect to etcd with insecure request. It is data-race. We should use argument for reference in the new goroutine.fix: #15495
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.