heartbeat: rebind stream. #918
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
siddontang
reviewed
Jan 15, 2018
server/grpc_service.go
Outdated
| @@ -311,9 +313,10 @@ func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error { | |||
|
|
|||
| hbStreams := cluster.coordinator.hbStreams | |||
|
|
|||
| if isNew { | |||
| if time.Since(lastBind) > heartbeatStreamRebindInterval { | |||
| regionHeartbeatCounter.WithLabelValues(storeLabel, "report", "bind").Inc() | |||
| hbStreams.bindStream(storeID, server) | |||
There was a problem hiding this comment.
any side effect if you bindStream again after the interval?
There was a problem hiding this comment.
Just re-assign a map entry, should be trivial.
siddontang
reviewed
Jan 15, 2018
server/grpc_service.go
Outdated
| @@ -239,6 +239,8 @@ func (s *Server) StoreHeartbeat(ctx context.Context, request *pdpb.StoreHeartbea | |||
|
|
|||
| const regionHeartbeatSendTimeout = 5 * time.Second | |||
|
|
|||
| var heartbeatStreamRebindInterval = time.Minute | |||
There was a problem hiding this comment.
can we use a config here to speed up test?
I see that you should wait at least 1m in test to rebind.
There was a problem hiding this comment.
I've set it to 3 seconds in test.
There was a problem hiding this comment.
oh, this is a var I just notice. Seem it is a not good way here.
|
PTAL @siddontang |
|
But CI failed @disksing |
I'm going to just restart it. |
disksing
added a commit
to oh-my-tidb/pd
that referenced
this pull request
Jan 15, 2018
Connor1996
pushed a commit
that referenced
this pull request
Jan 15, 2018
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.
Circumvent potential problems that may be occurred by reconnecting.