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

complete lookup method of consul registry and add integration test #3906

Merged
merged 8 commits into from
Apr 29, 2019

Conversation

Moriadry-zz
Copy link

@Moriadry-zz Moriadry-zz commented Apr 22, 2019

What is the purpose of the change

complete lookup method of consul registry and add integration test. see #3890

Brief changelog

XXXXX

make lookup method return our immediate provider list, just like what we do in https://github.com/apache/incubator-dubbo/blob/9ce0676908adbb5d073727c47b5a32dda153230e/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java#L195 .

Also check this in ConsulRegistryTest.testLookup()

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

@Moriadry-zz
Copy link
Author

Moriadry-zz commented Apr 22, 2019

@beiwei30 Hi Ian, could you help me review this pr? I do some fix in it, I also add a test to increase the code coverage, to ensure everything is fine.

@codecov-io
Copy link

codecov-io commented Apr 22, 2019

Codecov Report

Merging #3906 into master will increase coverage by 0.28%.
The diff coverage is 44.44%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3906      +/-   ##
============================================
+ Coverage     63.66%   63.94%   +0.28%     
- Complexity       71       97      +26     
============================================
  Files           712      713       +1     
  Lines         31450    31467      +17     
  Branches       5073     5073              
============================================
+ Hits          20023    20122      +99     
+ Misses         9134     9036      -98     
- Partials       2293     2309      +16
Impacted Files Coverage Δ Complexity Δ
...g/apache/dubbo/registry/consul/ConsulRegistry.java 56.29% <44.44%> (+56.29%) 24 <2> (+24) ⬆️
...ng/exchange/support/header/HeartbeatTimerTask.java 73.68% <0%> (-5.27%) 0% <0%> (ø)
...e/dubbo/remoting/transport/netty/NettyChannel.java 57.64% <0%> (-4.71%) 0% <0%> (ø)
.../apache/dubbo/remoting/transport/AbstractPeer.java 67.39% <0%> (-4.35%) 0% <0%> (ø)
...pache/dubbo/registry/support/AbstractRegistry.java 79.69% <0%> (-1.92%) 0% <0%> (ø)
...he/dubbo/registry/multicast/MulticastRegistry.java 69.23% <0%> (-0.46%) 0% <0%> (ø)
.../org/apache/dubbo/monitor/dubbo/MetricsFilter.java 79.62% <0%> (-0.38%) 0% <0%> (ø)
...rialize/protostuff/delegate/TimestampDelegate.java 62.5% <0%> (ø) 0% <0%> (?)
...ommon/serialize/protostuff/utils/WrapperUtils.java 93.54% <0%> (+0.44%) 0% <0%> (ø) ⬇️
...dubbo/remoting/exchange/support/DefaultFuture.java 73.46% <0%> (+0.68%) 0% <0%> (ø) ⬇️
... and 11 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 4c96814...f1d4e07. Read the comment docs.

@beiwei30
Copy link
Member

@beiwei30 Hi Ian, could you help me review this pr? I do some fix in it, I also add a test to increase the code coverage, to ensure everything is fine.

Sorry for the late response. I am on it.

Copy link
Member

@beiwei30 beiwei30 left a comment

Choose a reason for hiding this comment

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

pls. check my comments.

@beiwei30 beiwei30 merged commit 86b1a98 into apache:master Apr 29, 2019
@Moriadry-zz Moriadry-zz mentioned this pull request Apr 30, 2019
6 tasks
@beiwei30 beiwei30 added this to the 2.7.2 milestone May 5, 2019
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.

5 participants