You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2021/05/18 13:28:25 UTC
[GitHub] [dubbo-go-pixiu] ztelur opened a new pull request #171: make Pixiu Admin config management finer-grained
ztelur opened a new pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171
### What this PR does:
- init from api_config fetched from etcd remotely
- wath api_config change event from etcd
- use gost etcd and zk dependency
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter edited a comment on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
# [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#171](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (3fea7f3) into [develop](https://codecov.io/gh/apache/dubbo-go-pixiu/commit/5c98b5e42d4303306b73b1cf663de5e47f49700c?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (5c98b5e) will **decrease** coverage by `5.40%`.
> The diff coverage is `9.01%`.
[](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## develop #171 +/- ##
===========================================
- Coverage 43.19% 37.78% -5.41%
===========================================
Files 33 32 -1
Lines 1755 1768 +13
===========================================
- Hits 758 668 -90
- Misses 888 1007 +119
+ Partials 109 93 -16
```
| [Impacted Files](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [pkg/config/api\_config.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL2NvbmZpZy9hcGlfY29uZmlnLmdv) | `3.50% <0.00%> (-7.11%)` | :arrow_down: |
| [pkg/router/route.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JvdXRlci9yb3V0ZS5nbw==) | `76.47% <0.00%> (-13.81%)` | :arrow_down: |
| [pkg/service/api/discovery\_service.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3NlcnZpY2UvYXBpL2Rpc2NvdmVyeV9zZXJ2aWNlLmdv) | `44.23% <28.76%> (-20.77%)` | :arrow_down: |
| [pkg/registry/zookeeper.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JlZ2lzdHJ5L3pvb2tlZXBlci5nbw==) | `55.55% <100.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [5c98b5e...3fea7f3](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter edited a comment on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
# [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#171](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (a9966e8) into [develop](https://codecov.io/gh/apache/dubbo-go-pixiu/commit/fbaf7ed106551c54004c22d7f04334ea34732544?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (fbaf7ed) will **decrease** coverage by `5.19%`.
> The diff coverage is `8.97%`.
[](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## develop #171 +/- ##
===========================================
- Coverage 43.29% 38.09% -5.20%
===========================================
Files 37 36 -1
Lines 1834 1848 +14
===========================================
- Hits 794 704 -90
- Misses 928 1048 +120
+ Partials 112 96 -16
```
| [Impacted Files](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [pkg/config/api\_config.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL2NvbmZpZy9hcGlfY29uZmlnLmdv) | `3.50% <0.00%> (-7.11%)` | :arrow_down: |
| [pkg/pixiu/pixiu\_start.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3BpeGl1L3BpeGl1X3N0YXJ0Lmdv) | `0.00% <0.00%> (ø)` | |
| [pkg/router/route.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JvdXRlci9yb3V0ZS5nbw==) | `76.47% <0.00%> (-13.81%)` | :arrow_down: |
| [pkg/service/api/discovery\_service.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3NlcnZpY2UvYXBpL2Rpc2NvdmVyeV9zZXJ2aWNlLmdv) | `43.13% <28.76%> (-21.78%)` | :arrow_down: |
| [pkg/registry/zookeeper.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JlZ2lzdHJ5L3pvb2tlZXBlci5nbw==) | `55.55% <100.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [fbaf7ed...a9966e8](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] AlexStocks commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
AlexStocks commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r650813546
##########
File path: pkg/registry/zookeeper.go
##########
@@ -17,14 +17,14 @@
package registry
import (
+ gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
Review comment:
move it to the 2rd import block.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] AlexStocks commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
AlexStocks commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r650813740
##########
File path: pkg/registry/zookeeper_test.go
##########
@@ -18,6 +18,7 @@ package registry
import (
"fmt"
+ gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
Review comment:
move it to 2rd import block
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] cityiron commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
cityiron commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r636583397
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: 其他需要从远端获取配置的初始化操作
Review comment:
use english
##########
File path: pkg/config/api_config.go
##########
@@ -18,36 +18,49 @@
package config
import (
+ "go.etcd.io/etcd/clientv3"
Review comment:
split
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: 其他需要从远端获取配置的初始化操作
+ go listenResourceAndMethodEvent(metaConfig.APIConfigPath)
+ // TODO: 其他监控配置的操作，比如 PluginGroup 等
return apiConfig, nil
}
-func initAPIConfigFromString(content string) error {
+func initAPIConfigFromKVList(kList, vList []string) error {
Review comment:
make handle resource and handle method two method may be better
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter edited a comment on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
# [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#171](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (a9966e8) into [develop](https://codecov.io/gh/apache/dubbo-go-pixiu/commit/fbaf7ed106551c54004c22d7f04334ea34732544?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (fbaf7ed) will **decrease** coverage by `5.19%`.
> The diff coverage is `8.97%`.
[](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## develop #171 +/- ##
===========================================
- Coverage 43.29% 38.09% -5.20%
===========================================
Files 37 36 -1
Lines 1834 1848 +14
===========================================
- Hits 794 704 -90
- Misses 928 1048 +120
+ Partials 112 96 -16
```
| [Impacted Files](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [pkg/config/api\_config.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL2NvbmZpZy9hcGlfY29uZmlnLmdv) | `3.50% <0.00%> (-7.11%)` | :arrow_down: |
| [pkg/pixiu/pixiu\_start.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3BpeGl1L3BpeGl1X3N0YXJ0Lmdv) | `0.00% <0.00%> (ø)` | |
| [pkg/router/route.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JvdXRlci9yb3V0ZS5nbw==) | `76.47% <0.00%> (-13.81%)` | :arrow_down: |
| [pkg/service/api/discovery\_service.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3NlcnZpY2UvYXBpL2Rpc2NvdmVyeV9zZXJ2aWNlLmdv) | `43.13% <28.76%> (-21.78%)` | :arrow_down: |
| [pkg/registry/zookeeper.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JlZ2lzdHJ5L3pvb2tlZXBlci5nbw==) | `55.55% <100.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [fbaf7ed...a9966e8](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] mark4z commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
mark4z commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r650386312
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
Review comment:
Agree
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] ztelur commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
ztelur commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r639510936
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: 其他需要从远端获取配置的初始化操作
+ go listenResourceAndMethodEvent(metaConfig.APIConfigPath)
+ // TODO: 其他监控配置的操作，比如 PluginGroup 等
return apiConfig, nil
}
-func initAPIConfigFromString(content string) error {
+func initAPIConfigFromKVList(kList, vList []string) error {
Review comment:
resource and method data store in etcd as parent path relation. with this design, it' a little difficulty to split this function when fetch data from etcd use prefix=true option
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] williamfeng323 commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
williamfeng323 commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r649641858
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
Review comment:
should we handle the error return from the new client function?
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
Review comment:
It also limited the config center can only be etcd. Could we get the config center client from something like getConfigCenterClient(some_indicator)? It is not generic enough I think.
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: init other setting which need fetch from remote
+ go listenResourceAndMethodEvent(metaConfig.APIConfigPath)
+ // TODO: watch other setting which need fetch from remote
return apiConfig, nil
}
-func initAPIConfigFromString(content string) error {
+func initAPIConfigFromKVList(kList, vList []string) error {
lock.Lock()
defer lock.Unlock()
- apiConf := &fc.APIConfig{}
- if len(content) != 0 {
- err := yaml.UnmarshalYML([]byte(content), apiConf)
- if err != nil {
- return perrors.Errorf("unmarshalYmlConfig error %v", perrors.WithStack(err))
- }
+ tmpApiConf := &fc.APIConfig{}
+
+ for i, k := range kList {
+ v := vList[i]
- valid := validateAPIConfig(apiConf)
- if !valid {
- return perrors.Errorf("api config not valid error %v", perrors.WithStack(err))
+ // handle resource
+ re := getCheckResourceRegexp()
+ if m := re.Match([]byte(k)); m {
Review comment:
maybe we could use below judgment to reduce the complexity.
```
if m := re.Match([]byte(k)); m {
continue
}
```
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: 其他需要从远端获取配置的初始化操作
+ go listenResourceAndMethodEvent(metaConfig.APIConfigPath)
+ // TODO: 其他监控配置的操作，比如 PluginGroup 等
return apiConfig, nil
}
-func initAPIConfigFromString(content string) error {
+func initAPIConfigFromKVList(kList, vList []string) error {
Review comment:
I agree with cityiron. the complexity of this function is high. If we introduce sonarqube, it cannot pass the check.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter edited a comment on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] ztelur commented on a change in pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
ztelur commented on a change in pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#discussion_r650506770
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
etcdv3.WithName(etcdv3.RegistryETCDV3Client),
etcdv3.WithTimeout(10*time.Second),
etcdv3.WithEndpoints(strings.Split(metaConfig.Address, ",")...),
)
- go listenAPIConfigNodeEvent(metaConfig.APIConfigPath)
-
- content, err := client.Get(metaConfig.APIConfigPath)
+ kList, vList, err := client.GetChildren(metaConfig.APIConfigPath)
if err != nil {
return nil, perrors.Errorf("Get remote config fail error %v", err)
}
-
- if err = initAPIConfigFromString(content); err != nil {
+ if err = initAPIConfigFromKVList(kList, vList); err != nil {
return nil, err
}
+ // TODO: 其他需要从远端获取配置的初始化操作
+ go listenResourceAndMethodEvent(metaConfig.APIConfigPath)
+ // TODO: 其他监控配置的操作，比如 PluginGroup 等
return apiConfig, nil
}
-func initAPIConfigFromString(content string) error {
+func initAPIConfigFromKVList(kList, vList []string) error {
Review comment:
ok, I will make handle resource and handle method two method
##########
File path: pkg/config/api_config.go
##########
@@ -67,64 +80,116 @@ func LoadAPIConfigFromFile(path string) (*fc.APIConfig, error) {
// LoadAPIConfig load the api config from config center
func LoadAPIConfig(metaConfig *model.APIMetaConfig) (*fc.APIConfig, error) {
- client = etcdv3.NewConfigClient(
+ client, _ = etcdv3.NewConfigClientWithErr(
Review comment:
already handle the error return from the new client function
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter commented on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
# [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#171](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (3c059df) into [develop](https://codecov.io/gh/apache/dubbo-go-pixiu/commit/b6f255b6246977ed718a020205029dc2b9d78e65?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (b6f255b) will **decrease** coverage by `5.17%`.
> The diff coverage is `9.73%`.
[](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## develop #171 +/- ##
===========================================
- Coverage 40.60% 35.43% -5.18%
===========================================
Files 35 34 -1
Lines 1692 1685 -7
===========================================
- Hits 687 597 -90
- Misses 903 1002 +99
+ Partials 102 86 -16
```
| [Impacted Files](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [pkg/config/api\_config.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL2NvbmZpZy9hcGlfY29uZmlnLmdv) | `3.88% <0.00%> (-6.72%)` | :arrow_down: |
| [pkg/router/route.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JvdXRlci9yb3V0ZS5nbw==) | `76.47% <0.00%> (-13.81%)` | :arrow_down: |
| [pkg/service/api/discovery\_service.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3NlcnZpY2UvYXBpL2Rpc2NvdmVyeV9zZXJ2aWNlLmdv) | `44.23% <28.76%> (-20.77%)` | :arrow_down: |
| [pkg/registry/zookeeper.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JlZ2lzdHJ5L3pvb2tlZXBlci5nbw==) | `55.55% <100.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [b6f255b...3c059df](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] codecov-commenter edited a comment on pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171#issuecomment-843910604
# [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#171](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (3c059df) into [develop](https://codecov.io/gh/apache/dubbo-go-pixiu/commit/b6f255b6246977ed718a020205029dc2b9d78e65?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (b6f255b) will **decrease** coverage by `5.17%`.
> The diff coverage is `9.73%`.
[](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## develop #171 +/- ##
===========================================
- Coverage 40.60% 35.43% -5.18%
===========================================
Files 35 34 -1
Lines 1692 1685 -7
===========================================
- Hits 687 597 -90
- Misses 903 1002 +99
+ Partials 102 86 -16
```
| [Impacted Files](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [pkg/config/api\_config.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL2NvbmZpZy9hcGlfY29uZmlnLmdv) | `3.88% <0.00%> (-6.72%)` | :arrow_down: |
| [pkg/router/route.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JvdXRlci9yb3V0ZS5nbw==) | `76.47% <0.00%> (-13.81%)` | :arrow_down: |
| [pkg/service/api/discovery\_service.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3NlcnZpY2UvYXBpL2Rpc2NvdmVyeV9zZXJ2aWNlLmdv) | `44.23% <28.76%> (-20.77%)` | :arrow_down: |
| [pkg/registry/zookeeper.go](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGtnL3JlZ2lzdHJ5L3pvb2tlZXBlci5nbw==) | `55.55% <100.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [b6f255b...3c059df](https://codecov.io/gh/apache/dubbo-go-pixiu/pull/171?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go-pixiu] xiaoliu10 merged pull request #171: make Pixiu Admin config management finer-grained
Posted by GitBox <gi...@apache.org>.
xiaoliu10 merged pull request #171:
URL: https://github.com/apache/dubbo-go-pixiu/pull/171
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org