Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the IsProvider check #1500

Merged
merged 34 commits into from
Oct 6, 2021
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a85b65b
Merge branch '3.0' into develop
AlexStocks May 9, 2021
9e38afe
Merge branch '3.0' into develop
AlexStocks May 10, 2021
f0ad730
Merge branch '3.0' into develop
AlexStocks May 10, 2021
4cb6e44
improve etcd version and change create to put (#1203)
ztelur May 15, 2021
56d9d71
Merge branch '3.0' into develop
AlexStocks May 15, 2021
cc74aa5
Merge branch '3.0' into develop
AlexStocks May 18, 2021
40082d4
Merge branch '3.0' into develop
AlexStocks May 21, 2021
63c7c59
Merge pull request #2 from apache/master
alchemy-lee Jun 3, 2021
421ad54
Merge pull request #3 from apache/3.0
alchemy-lee Jun 3, 2021
727e346
Merge branch '3.0' into develop
AlexStocks Jun 20, 2021
268e072
Merge branch '3.0'
LaurenceLiZhixin Jun 21, 2021
42ef7fe
fix: CONTRIBUTING.md url error. (#1303)
stulzq Jul 5, 2021
a109967
add lock (#1304)
tylitianrui Jul 5, 2021
808862e
Revert "add lock (#1304)" (#1329)
LaurenceLiZhixin Jul 18, 2021
7b0682f
Merge pull request #4 from apache/3.0
alchemy-lee Jul 23, 2021
2f92a79
Merge pull request #7 from apache/3.0
alchemy-lee Aug 17, 2021
3da71a1
Merge branch '3.0' into develop
AlexStocks Aug 18, 2021
7802cca
Merge branch 'develop'
AlexStocks Aug 18, 2021
343ba6a
Merge branch 'master' of https://github.com/apache/dubbo-go
AlexStocks Aug 18, 2021
8b0191b
build(deps): bump github.com/dubbogo/gost from 1.11.14 to 1.11.16 (#1…
dependabot[bot] Aug 20, 2021
768c2d8
build(deps): bump google.golang.org/protobuf from 1.26.0 to 1.27.1 (#…
dependabot[bot] Aug 20, 2021
6377396
build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.0-alpha.0 to 3.5…
dependabot[bot] Aug 20, 2021
d904ed4
merge 3.0
AlexStocks Aug 20, 2021
d32db09
Merge branch 'develop'
AlexStocks Aug 20, 2021
d49f62e
Merge branch '3.0' into develop
Sep 24, 2021
481eb47
Merge branch 'develop'
Sep 24, 2021
efe12a0
Merge remote-tracking branch 'apache/3.0' into develop
fangyincheng Sep 27, 2021
bfca099
Merge remote-tracking branch 'apache/develop'
fangyincheng Sep 27, 2021
6b215f3
Merge branch 'apache:3.0' into 3.0
alchemy-lee Oct 2, 2021
88001a2
fix provider check
alchemy-lee Oct 2, 2021
e886e5e
fix provider check
alchemy-lee Oct 2, 2021
525a7f4
fix provider check
alchemy-lee Oct 2, 2021
c8e3be0
Merge branch 'apache:master' into provider-fix
alchemy-lee Oct 5, 2021
20a1634
Merge pull request #10 from apache/3.0
alchemy-lee Oct 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/config_loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,5 @@ func GetMetadataReportConfg() *MetadataReportConfig {
}

func IsProvider() bool {
// FixME
return rootConfig.Provider != nil
return len(rootConfig.Provider.Services) > 0
}
26 changes: 26 additions & 0 deletions metadata/report/nacos/report_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,32 @@ func TestNacosMetadataReportFactory_CreateMetadataReport(t *testing.T) {
assert.NotNil(t, res)
}

func TestZookeeperMetadataReportFactory_CreateMetadataReport(t *testing.T) {
address := "registry://127.0.0.1:8848"
url, err := common.NewURL(address, common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
if err != nil {
t.Fatal(err)
}
metadataReportFactory := &nacosMetadataReportFactory{}
metadataReport := metadataReportFactory.CreateMetadataReport(url)
assert.NotNil(t, metadataReport)

set, err := metadataReport.GetServiceAppMapping("com.apache.dubbo.sample.basic.IGreeter", "mapping")
assert.NotNil(t, err)

err = metadataReport.RegisterServiceAppMapping("com.apache.dubbo.sample.basic.IGreeter", "mapping", "demo_provider")
assert.Nil(t, err)
time.Sleep(1 * time.Second)
err = metadataReport.RegisterServiceAppMapping("com.apache.dubbo.sample.basic.IGreeter", "mapping", "demo_provider2")
assert.Nil(t, err)
time.Sleep(1 * time.Second)
err = metadataReport.RegisterServiceAppMapping("com.apache.dubbo.sample.basic.IGreeter", "mapping", "demo_provider")
assert.Nil(t, err)

set, err = metadataReport.GetServiceAppMapping("com.apache.dubbo.sample.basic.IGreeter", "mapping")
t.Log(set)
}

func newTestReport() report.MetadataReport {
regurl, _ := common.NewURL("registry://console.nacos.io:80", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
res := extension.GetMetadataReportFactory("nacos").CreateMetadataReport(regurl)
Expand Down