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 3.0 ci problem #1188

Merged
merged 10 commits into from May 6, 2021
Merged

Fix 3.0 ci problem #1188

merged 10 commits into from May 6, 2021

Conversation

ztelur
Copy link
Contributor

@ztelur ztelur commented May 5, 2021

What this PR does:

  • fix etcd dependency problem
  • replace coreos etcd dependency with etcd.io etcd dependency
  • fix TestNacosServiceDiscovery_CRUD fail problem
  • fix cluster_invoker fail problem. Invoke return the ignore err
  • fix TestAddListenerZookeeperServiceDiscovery error related to metadata_service_proxy_factory
  • fix config setDefaultValue int to string bug

@ztelur ztelur changed the title Fix etcd dependency problem Fix 3.0 ci problem May 5, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #1188 (7719517) into 3.0 (968650f) will decrease coverage by 2.91%.
The diff coverage is 53.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##              3.0    #1188      +/-   ##
==========================================
- Coverage   59.53%   56.61%   -2.92%     
==========================================
  Files         259      254       -5     
  Lines       12737    12485     -252     
==========================================
- Hits         7583     7069     -514     
- Misses       4199     4536     +337     
+ Partials      955      880      -75     
Impacted Files Coverage Δ
cluster/cluster_impl/available_cluster.go 100.00% <ø> (ø)
cluster/cluster_impl/broadcast_cluster_invoker.go 76.47% <ø> (ø)
cluster/cluster_impl/failfast_cluster_invoker.go 66.66% <ø> (ø)
cluster/cluster_impl/mock_cluster.go 0.00% <0.00%> (ø)
cluster/loadbalance/random.go 100.00% <ø> (ø)
common/extension/cluster.go 0.00% <ø> (ø)
common/extension/config_center.go 0.00% <ø> (ø)
common/extension/config_center_factory.go 0.00% <ø> (ø)
common/extension/config_post_processor.go 0.00% <0.00%> (ø)
common/extension/configurator.go 0.00% <ø> (ø)
... and 218 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ddc39a3...7719517. Read the comment docs.

@@ -51,6 +50,7 @@ require (
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/zouyx/agollo/v3 v3.4.5
go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest use version+incompatible, like v3.3.25+incompatible

@@ -169,7 +169,7 @@ func (invoker *failbackClusterInvoker) Invoke(ctx context.Context, invocation pr
logger.Errorf("Failback to invoke the method %v in the service %v, wait for retry in background. Ignored exception: %v.\n",
methodName, url.Service(), result.Error().Error())
// ignore
return &protocol.RPCResult{Err: result.Error()}
return &protocol.RPCResult{}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why delete this err?

@AlexStocks AlexStocks merged commit 3180469 into apache:3.0 May 6, 2021
AlexStocks pushed a commit that referenced this pull request May 7, 2021
* add retry times

* Add: add ruubypay to user list. (#1180)

* fix import for linter

* replace default config string with const value (#1182)

* replace default config string with const value

* delete some duplicate keys

Co-authored-by: dongjianhui <dongjianhui@yuanfudao.com>

* Fix 3.0 ci problem (#1188)

* fix etcd problem

* fix metadata report etcd problem

* fix nacos & cluster_impl ci problem

* fix nacos ci problem

* fix zk ci problem

* fix zk metadata service urls not found error

* fix zk TestAddListenerZookeeperServiceDiscovery

* fix zk TestAddListenerZookeeperServiceDiscovery

* fix config int to string bug

* add retry times

* fix import for linter

* revert rename etcdv3

Co-authored-by: xianlezheng <zhengxianle@gmail.com>
Co-authored-by: Mulavar <978007503@qq.com>
Co-authored-by: dongjianhui <dongjianhui@yuanfudao.com>
Co-authored-by: randy <ztelur@gmail.com>
Co-authored-by: 蒋超 <jiangchao@jiangchaodeMacBook-Pro.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants