embed: gracefully close peer handler #7879
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
gyuho
changed the title
gyuho
changed the title
gyuho
changed the title
gyuho
force-pushed
the
http-server
branch
5 times, most recently
from
140338e
to
723d247
Compare
embed/etcd.go
Outdated
| if plns[i], err = rafthttp.NewListener(u, &cfg.PeerTLSInfo); err != nil { | ||
| return nil, err | ||
| var l net.Listener | ||
| l, err = rafthttp.NewListener(u, &cfg.PeerTLSInfo) |
There was a problem hiding this comment.
l, lerr := to avoid the var l net.Listener?
embed/etcd.go
Outdated
| // gracefully shutdown http.Server; close open listeners, idle connections | ||
| // pass canceled context to close existing idle connections only once | ||
| // and not delay the server shutdown | ||
| serr := srv.Shutdown(canceled) |
There was a problem hiding this comment.
return srv.Shutdown(canceled)?
embed/etcd.go
Outdated
| @@ -51,7 +55,9 @@ const ( | |||
|
|
|||
| // Etcd contains a running etcd server and its listeners. | |||
| type Etcd struct { | |||
| Peers []net.Listener | |||
| peerServeFuncs []func() error | |||
There was a problem hiding this comment.
type Etcd struct {
Peers []peerListener
...
}
...
type peerListener struct {
net.Listener
serve func() error
close func(context.Context) error
}?
gyuho
changed the title
gyuho
force-pushed
the
http-server
branch
4 times, most recently
from
3b6e852
to
823f9b3
Compare
|
Apparently this breaks in EXPECT_DEBUG=1 go test -v -run TestCtlV3AuthMemberRemove
EXPECT_DEBUG=1 go test -v -run TestCtlV3MemberRemoveBoth pass |
gyuho
force-pushed
the
http-server
branch
6 times, most recently
from
ce2e79c
to
1367d54
Compare
Signed-off-by: Gyu-Ho Lee <[email protected]>
|
All fixed (it had to start rafthttp layer first). PTAL. |
heyitsanthony
approved these changes
May 8, 2017
| @@ -226,12 +260,18 @@ func startPeerListeners(cfg *Config) (plns []net.Listener, err error) { | |||
| plog.Warningf("The scheme of peer url %s is HTTP while client cert auth (--peer-client-cert-auth) is enabled. Ignored client cert auth for this url.", u.String()) | |||
| } | |||
| } | |||
| if plns[i], err = rafthttp.NewListener(u, &cfg.PeerTLSInfo); err != nil { | |||
| peers[i] = &peerListener{close: func(context.Context) error { return nil }} | |||
There was a problem hiding this comment.
Just curious, why are we initializing the close function here?
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.
Passing canceled context to close existing idle connections only once and to not delay the server shutdown. And make
embed.Etcd.Peersnon-exported (need release note).c.f. #6174