(WIP) ServiceDiscoveryRegistry implementation #491
Closed
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
merge v1.4.0 into develop
Feature/dubbo 2.7.5
flycash
reviewed
Apr 27, 2020
AlexStocks
reviewed
Apr 29, 2020
zouyx
reviewed
Apr 30, 2020
| @@ -18,11 +18,11 @@ | |||
| package extension | |||
|
|
|||
| import ( | |||
| "github.com/apache/dubbo-go/registry" | |||
| ) | ||
|
|
||
| func SetServiceNameMapping(name string, creator func() mapping.ServiceNameMapping) { | ||
| // TODO(@邓大明) |
| } | ||
|
|
||
| func GetServiceNameMapping(name string) mapping.ServiceNameMapping { | ||
| // TODO(@邓大明) |
Comment on lines
21
to
26
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/common/extension" | ||
| "github.com/apache/dubbo-go/registry" | ||
| "github.com/apache/dubbo-go/registry/service/instance" | ||
| "math/rand" | ||
| "time" |
Comment on lines
21
to
24
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/registry" | ||
| "github.com/stretchr/testify/assert" | ||
| "testing" |
Comment on lines
344
to
349
| s.lock.Lock() | ||
| // 1. expunge stale | ||
| s.expungeStaleRevisionExportedURLs(serviceInstances) | ||
| // 2. Initialize | ||
| s.initRevisionExportedURLs(serviceInstances) | ||
| s.lock.Unlock() |
There was a problem hiding this comment.
i think this lock is too large, can shorten it?
| currentRevision := gxset.NewSet() | ||
| for _, s := range serviceInstances { | ||
| rv := getExportedServicesRevision(s) | ||
| if len(rv) != 0 { |
There was a problem hiding this comment.
Suggested change
| if len(rv) != 0 { | |
| if len(rv) > 0 { |
| ) | ||
|
|
||
| func TestServiceDiscoveryRegistry_Register(t *testing.T) { | ||
| //registryURL,_:=common.NewURL("in-memory://localhost:12345", |
Comment on lines
21
to
26
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/common/constant" | ||
| "github.com/apache/dubbo-go/registry" | ||
| "github.com/apache/dubbo-go/registry/service/synthesizer" | ||
| "net/url" | ||
| "strings" |
Comment on lines
21
to
26
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/common/constant" | ||
| "github.com/apache/dubbo-go/registry" | ||
| "github.com/stretchr/testify/assert" | ||
| "net/url" | ||
| "testing" |
Fix Some Bug and merger origin/develop
2、format imports
Codecov Report
@@ Coverage Diff @@
## feature/dubbo-2.7.5 #491 +/- ##
=======================================================
- Coverage 66.81% 64.53% -2.29%
=======================================================
Files 196 202 +6
Lines 10125 10596 +471
=======================================================
+ Hits 6765 6838 +73
- Misses 2708 3103 +395
- Partials 652 655 +3
Continue to review full report at Codecov.
|
…nto feature/dubbo-2.7.5 # Conflicts: # config/service_config.go # config/service_config_test.go # go.sum
AlexStocks
reviewed
May 3, 2020
config/config_loader.go
Outdated
| svs.id = key | ||
| svs.Implement(rpcService) | ||
| if err := svs.Export(); err != nil { | ||
| panic(fmt.Sprintf("service %s export failed! err: %#v", key, err)) |
There was a problem hiding this comment.
hi, new guy, pls use %+v for error to handle nil-error or self-defined error.
config/service_config.go
Outdated
| @@ -113,6 +113,24 @@ func NewServiceConfig(id string, context context.Context) *ServiceConfig { | |||
| } | |||
| } | |||
|
|
|||
| // Get Random Port | |||
| func getRandomPort(protocolConfigs []*ProtocolConfig) *list.List { | |||
There was a problem hiding this comment.
this work has been done by Mr Zouyx. why u do it again?
zouyx
reviewed
May 3, 2020
config/config_loader.go
Outdated
Comment on lines
184
to
186
| extension.SetAndInitGlobalDispatcher(providerConfig.eventDispatcherType) | ||
|
|
||
| extension.SetAndInitGlobalDispatcher(consumerConfig.eventDispatcherType) |
config/config_loader.go
Outdated
Comment on lines
105
to
107
| extension.SetAndInitGlobalDispatcher(consumerConfig.eventDispatcherType) | ||
|
|
||
| extension.SetAndInitGlobalDispatcher(consumerConfig.eventDispatcherType) |
registry/event_listener.go
Outdated
| return e.ServiceName == sicl.ServiceName | ||
| } | ||
|
|
||
| type ChangedNotify interface { |
Comment on lines
24
to
31
| func SetMetadataServiceProxy(name string, creator func() BaseMetadataServiceProxy) { | ||
| //TODO | ||
| } | ||
|
|
||
| func GetMetadataServiceProxy(name string) BaseMetadataServiceProxy { | ||
| //TODO | ||
| return nil | ||
| } |
|
|
||
| //IsAvailable for make sure is't available | ||
| func (s *serviceDiscoveryRegistry) IsAvailable() bool { | ||
| return true |
added 2 commits
May 4, 2020 21:21
Merge nacos metadata report implementation
Codecov Report
@@ Coverage Diff @@
## feature/dubbo-2.7.5 #491 +/- ##
=======================================================
- Coverage 66.06% 63.63% -2.43%
=======================================================
Files 203 210 +7
Lines 10558 11163 +605
=======================================================
+ Hits 6975 7104 +129
- Misses 2909 3371 +462
- Partials 674 688 +14
Continue to review full report at Codecov.
|
AlexStocks
reviewed
May 31, 2020
| }) | ||
| } | ||
|
|
||
| // StoreConsumerMetadata will store the metadata |
There was a problem hiding this comment.
store the consumer metadata.
| client config_client.IConfigClient | ||
| } | ||
|
|
||
| // StoreProviderMetadata will store the metadata |
There was a problem hiding this comment.
store the provider metadata
| }) | ||
| } | ||
|
|
||
| // SaveServiceMetadata will store the metadata |
There was a problem hiding this comment.
save the service metadata.
| } | ||
|
|
||
| bytes, err := json.Marshal(urlStrList) | ||
|
|
There was a problem hiding this comment.
delete this blank line.
|
|
||
| package nacos | ||
|
|
||
| import ( |
AlexStocks
reviewed
May 31, 2020
remoting/nacos/builder.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } | ||
| clientConfig.TimeoutMs = uint64(timeout.Seconds() * 1000) |
There was a problem hiding this comment.
pls init the config in a struct.
clientConfig := nacosConstant.ClientConfig {
xxx: xxx,
}It can be found by consumer
Invoke dubbo server success
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.
#420