dm-operator: support discovery dm-master service in current discovery service #3098
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
Codecov Report
@@ Coverage Diff @@
## master #3098 +/- ##
==========================================
+ Coverage 43.12% 43.24% +0.12%
==========================================
Files 156 159 +3
Lines 16924 17073 +149
==========================================
+ Hits 7298 7384 +86
- Misses 9001 9062 +61
- Partials 625 627 +2
Flags with carried forward coverage won't be shown. Click here to find out more. |
cofyc
reviewed
Aug 12, 2020
pkg/discovery/server/server.go
Outdated
| @@ -44,6 +46,7 @@ func NewServer(pdControl pdapi.PDControlInterface, cli versioned.Interface, kube | |||
| func (s *server) registerHandlers() { | |||
| ws := new(restful.WebService) | |||
| ws.Route(ws.GET("/new/{advertise-peer-url}").To(s.newHandler)) | |||
| ws.Route(ws.GET("/newdm/{advertise-peer-url}").To(s.newDMHandler)) | |||
There was a problem hiding this comment.
is it possible to add a parameter to /new/{advertise-peer-url} API for dm? e.g. service=dm
newHandler and newDMHandler are similar, we can avoid duplicate code if we can.
There was a problem hiding this comment.
addressed in 609e797
cofyc
previously approved these changes
Aug 13, 2020
| cli: cli, | ||
| pdControl: pdControl, | ||
| masterControl: masterControl, | ||
| clusters: map[string]*clusterInfo{}, |
There was a problem hiding this comment.
Initialize dmClusters here?
pkg/discovery/discovery.go
Outdated
| return "", err | ||
| } | ||
| keyName := fmt.Sprintf("%s/%s", ns, dcName) | ||
| // TODO: the replicas should be the total replicas of pd sets. |
There was a problem hiding this comment.
Suggested change
| // TODO: the replicas should be the total replicas of pd sets. | |
| // TODO: the replicas should be the total replicas of dm master set. |
pkg/discovery/server/server.go
Outdated
| result, err = s.discovery.DiscoverDM(advertisePeerURL) | ||
| default: | ||
| klog.Errorf("invalid register-type %s", registerType) | ||
| if err := resp.WriteError(http.StatusInternalServerError, err); err != nil { |
There was a problem hiding this comment.
Set err to include the invalid register-type %s message? It is nil here, right?
pkg/dmapi/dmapi.go
Outdated
| return nil, fmt.Errorf("unable to list members info from dm-master, err: %s", listMemberResp.Msg) | ||
| } | ||
| if len(listMemberResp.ListMemberResp) != 1 { | ||
| return nil, fmt.Errorf("invalid list members resp: %s", body) |
There was a problem hiding this comment.
Should we use string(body)?
pkg/dmapi/master_control.go
Outdated
|
|
||
| // MasterClientURL builds the url of master client | ||
| func MasterClientURL(namespace Namespace, clusterName string, scheme string) string { | ||
| return fmt.Sprintf("%s://%s-master.%s:2379", scheme, clusterName, string(namespace)) |
There was a problem hiding this comment.
2379 should be updated?
pkg/discovery/discovery.go
Outdated
| } | ||
| klog.Infof("dm advertisePeerUrl is: %s", advertisePeerUrl) | ||
| strArr := strings.Split(advertisePeerUrl, ".") | ||
| if len(strArr) != 4 { |
There was a problem hiding this comment.
IF we require the namespace to be the same as we have checked in L140, we can just take pd-0.pd-peer as the URL to decrease the DNS queries.
pkg/discovery/server/server.go
Outdated
Comment on lines
81
to
84
| klog.Errorf("invalid register-type %s", registerType) | ||
| if err := resp.WriteError(http.StatusInternalServerError, fmt.Errorf("invalid register-type %s", registerType)); err != nil { | ||
| klog.Errorf("failed to writeError: %v", err) | ||
| } |
There was a problem hiding this comment.
Suggested change
| klog.Errorf("invalid register-type %s", registerType) | |
| if err := resp.WriteError(http.StatusInternalServerError, fmt.Errorf("invalid register-type %s", registerType)); err != nil { | |
| klog.Errorf("failed to writeError: %v", err) | |
| } | |
| err = fmt.Errorf("invalid register-type %s", registerType) | |
| klog.Errorf("%v", err) | |
| if werr := resp.WriteError(http.StatusInternalServerError, err); werr != nil { | |
| klog.Errorf("failed to writeError: %v", werr) | |
| } |
…b-operator into discoverySupportDM
…b-operator into discoverySupportDM
ti-srebot
previously approved these changes
Aug 19, 2020
cofyc
previously approved these changes
Aug 19, 2020
b7b0c31
cofyc
approved these changes
Aug 19, 2020
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?
#2868
Support discovery dm-master service in current discovery service
What is changed and how does it work?
Check List
Tests
Code changes
Does this PR introduce a user-facing change?: