OSPP2023-23aaf0426 #65
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
|
|
SpecialYang
requested changes
Oct 8, 2023
control_plane.go
Outdated
| @@ -15,21 +15,28 @@ | |||
| package opensergo | |||
|
|
|||
| import ( | |||
| discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" | |||
There was a problem hiding this comment.
所有的import 都需要保持以下格式
基础库
第三方库
该项目
control_plane.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| cp.server = transport.NewServer(uint32(10246), []model.SubscribeRequestHandler{cp.handleSubscribeRequest}) | ||
| cp.xdsServer = transport.NewDiscoveryServer(uint32(8002), []model.SubscribeXDsRequestHandler{cp.handleXDSSubscribeRequest}) |
There was a problem hiding this comment.
是的，因为我看原项目也是固定端口是10246，所以我就写了8002
There was a problem hiding this comment.
你看看10248 有没有用？没有，就用这个吧
pkg/model/xDS_connection.go
Outdated
| func (conn *XDSConnection) Watched(typeUrl string) *WatchedResource { | ||
| conn.RLock() | ||
| defer conn.RUnlock() | ||
| if conn.WatchedResources != nil && conn.WatchedResources[typeUrl] != nil { |
There was a problem hiding this comment.
WatchedResources 不会有nil的情况
control_plane.go
Outdated
| crdWatcher, err := c.operator.RegisterWatcher(model.SubscribeTarget{ | ||
| Namespace: request[4], | ||
| AppName: request[3], | ||
| Kind: request[0] + delimiter + request[1] + delimiter + request[2], |
There was a problem hiding this comment.
这里 数字的可维护性太差了，建议弄一个函数包一下。
namespace, appname, kind := tool(xxxx)
control_plane.go
Outdated
| } | ||
|
|
||
| // Add the connection to the connection map. | ||
| c.xdsServer.AddConnectionToMap(request[4], request[3], request[0]+"/"+request[1]+"/"+request[2], con) |
| @@ -1,4 +1,3 @@ | |||
|
|
|||
| @@ -15,17 +15,18 @@ | |||
| package main | |||
|
|
|||
| import ( | |||
pkg/transport/grpc/xDSServer.go
Outdated
| for { | ||
| // Go select{} statements are not ordered; the same channel can be chosen many times. | ||
| // For requests, these are higher priority (client may be blocked on startup until these are done) | ||
| // and often very cheap to handle (simple ACK), so we check it first. |
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.
Describe what this PR does / why we need it
Does this pull request fix one issue?
Describe how you did it
Describe how to verify it
Special notes for reviews