*: add config client #2041
Merged
*: add config client #2041
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
rleungx
force-pushed
the
config-client
branch
2 times, most recently
from
b88c677
to
ccd1729
Compare
Codecov Report
@@ Coverage Diff @@
## master #2041 +/- ##
=========================================
+ Coverage 76.72% 76.83% +0.1%
=========================================
Files 191 193 +2
Lines 19293 19414 +121
=========================================
+ Hits 14803 14916 +113
Misses 3369 3369
- Partials 1121 1129 +8
Continue to review full report at Codecov.
|
rleungx
force-pushed
the
config-client
branch
from
ccd1729
to
4abf1bc
Compare
disksing
reviewed
Dec 24, 2019
client/config_client.go
Outdated
| return errors.WithStack(errFailInitClusterID) | ||
| } | ||
|
|
||
| func (c *configClient) updateLeader() error { |
There was a problem hiding this comment.
Maybe we add it to PD client so we don't have to manage connections in both places.
rleungx
force-pushed
the
config-client
branch
3 times, most recently
from
e2b8f51
to
62dc5ea
Compare
|
PTAL @disksing @overvenus |
overvenus
reviewed
Dec 31, 2019
client/base_client.go
Outdated
| ) | ||
|
|
||
| // BaseClient is a basic client for all other complex client. | ||
| type BaseClient struct { |
There was a problem hiding this comment.
Suggested change
| type BaseClient struct { | |
| type baseClient struct { |
If BaseClient is only for internal use, I think it's better to not export it for better maintainability.
client/base_client.go
Outdated
| } | ||
|
|
||
| // NewBaseClient returns a new BaseClient. | ||
| func NewBaseClient(ctx context.Context, urls []string, security SecurityOption, opts ...ClientOption) *BaseClient { |
There was a problem hiding this comment.
Suggested change
| func NewBaseClient(ctx context.Context, urls []string, security SecurityOption, opts ...ClientOption) *BaseClient { | |
| func newBaseClient(ctx context.Context, urls []string, security SecurityOption, opts ...ClientOption) *BaseClient { |
disksing
reviewed
Jan 2, 2020
| mergeAndUpdateConfig(localCfg, updateEntries) | ||
| if wrongEntry, err := mergeAndUpdateConfig(localCfg, updateEntries); err != nil { | ||
| c.deleteEntry(component, wrongEntry) | ||
|
|
client/config_client.go
Outdated
| log.Info("[pd] init cluster id", zap.Uint64("cluster-id", c.clusterID)) | ||
|
|
||
| c.wg.Add(1) | ||
| go c.leaderLoop() |
There was a problem hiding this comment.
can we move this to baseclient?
client/config_client.go
Outdated
| log.Info("[pd] create pd configuration client with endpoints", zap.Strings("pd-address", pdAddrs)) | ||
| base := NewBaseClient(ctx, addrsToUrls(pdAddrs), security) | ||
| c := &configClient{base} | ||
| c.connMu.clientConns = make(map[string]*grpc.ClientConn) |
There was a problem hiding this comment.
seems already created in baseClient.
client/config_client.go
Outdated
| if err := c.initRetry(c.initClusterID); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := c.initRetry(c.updateLeader); err != nil { |
|
/run-all-tests |
overvenus
approved these changes
Jan 3, 2020
nolouch
reviewed
Jan 6, 2020
| @@ -117,45 +113,13 @@ var ( | |||
| ) | |||
|
|
|||
| type client struct { | |||
| urls []string | |||
| clusterID uint64 | |||
| *baseClient | |||
There was a problem hiding this comment.
How about adding a function in Client that we can generate a ConfigClient from Client. TiDB may want to only use one client or one connection.
rleungx
force-pushed
the
config-client
branch
2 times, most recently
from
04d68d4
to
d475550
Compare
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
nolouch
approved these changes
Jan 6, 2020
|
/merge |
sre-bot
added
the
status/can-merge
|
/run-all-tests |
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.
What problem does this PR solve?
Part of #1977. It should be reviewed after #2033 is merged.
What is changed and how it works?
This PR adds a client for config manager service.
Check List
Tests