Add retry for dialPumpClient #4879
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
jackysp
reviewed
Oct 24, 2017
tidb.go
Outdated
| @@ -232,7 +231,8 @@ func RegisterLocalStore(name string, driver engine.Driver) error { | |||
| // | |||
| // The engine should be registered before creating storage. | |||
| func NewStore(path string) (kv.Storage, error) { | |||
| return newStoreWithRetry(path, defaultMaxRetries) | |||
| return newStoreWithRetry(path, 3) | |||
| //return newStoreWithRetry(path, util.DefaultMaxRetries) | |||
XuHuaiyu
changed the title
coocood
reviewed
Oct 24, 2017
tidb_test.go
Outdated
| c.Assert(err, NotNil) | ||
| c.Assert(err.Error(), Equals, "must fail") | ||
| elapse := time.Since(begin) | ||
| c.Assert(uint64(elapse), GreaterEqual, uint64(3*time.Second)) |
There was a problem hiding this comment.
Can we use a smaller wait time for the test?
|
Please fix CI and conflict |
Conflicts: tidb-server/main.go
|
PTAL @coocood |
|
LGTM |
|
PTAL @shenli |
zimulala
reviewed
Oct 24, 2017
tidb_test.go
Outdated
| func (s *testMainSuite) TestRetryDialPumpClient(c *C) { | ||
| retryDialPumlClientMustFail := func(binlogSocket string, clientCon *grpc.ClientConn, maxRetries int, dialerOpt grpc.DialOption) (err error) { | ||
| return util.RunWithRetry(maxRetries, 10, func() (bool, error) { | ||
| clientCon, err = grpc.Dial(binlogSocket, grpc.WithInsecure(), dialerOpt) |
There was a problem hiding this comment.
This code doesn't use. We can remove it or add some comments.
shenli
reviewed
Oct 24, 2017
| @@ -248,13 +247,30 @@ func newStoreWithRetry(path string, maxRetries int) (kv.Storage, error) { | |||
| } | |||
|
|
|||
| var s kv.Storage | |||
| err1 := util.RunWithRetry(maxRetries, retryInterval, func() (bool, error) { | |||
| err1 := util.RunWithRetry(maxRetries, util.RetryInterval, func() (bool, error) { | |||
| log.Infof("new store") | |||
There was a problem hiding this comment.
For recording this process.
tidb.go
Outdated
| return util.RunWithRetry(maxRetries, util.RetryInterval, func() (bool, error) { | ||
| log.Infof("setup binlog client") | ||
| var err error | ||
| clientCon, err = grpc.Dial(binlogSocket, grpc.WithInsecure(), dialerOpt) |
There was a problem hiding this comment.
We should log something if meet this error.
�ý,�ý.�ý`�ý,�ý.�ý,�ý.:q!
|
LGTM |
shenli
approved these changes
Oct 24, 2017
|
/run-all-tests |
zimulala
added
status/LGT2
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.
fix #4848
PTAL @coocood