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

[Dubbo-4525] fix Clusterutils.mergeurl, make sure specific keys from provider side not override by that from consumer. #4533

Merged
merged 4 commits into from Jul 12, 2019

Conversation

chickenlj
Copy link
Contributor

What is the purpose of the change

Fixes #4525

Brief changelog

XXXXX

Verifying this change

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 sample in dubbo samples project.
  • 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.

@codecov-io
Copy link

codecov-io commented Jul 11, 2019

Codecov Report

Merging #4533 into 2.7.3-release will decrease coverage by 0.04%.
The diff coverage is 92.3%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##             2.7.3-release    #4533      +/-   ##
===================================================
- Coverage            63.72%   63.68%   -0.05%     
+ Complexity             454      452       -2     
===================================================
  Files                  766      767       +1     
  Lines                32839    32833       -6     
  Branches              5180     5176       -4     
===================================================
- Hits                 20928    20910      -18     
- Misses                9511     9518       +7     
- Partials              2400     2405       +5
Impacted Files Coverage Δ Complexity Δ
...apache/dubbo/rpc/cluster/support/ClusterUtils.java 82.5% <92.3%> (+0.86%) 0 <0> (ø) ⬇️
.../remoting/transport/netty4/NettyServerHandler.java 61.9% <0%> (-9.53%) 0% <0%> (ø)
...apache/dubbo/common/config/ConfigurationUtils.java 64% <0%> (-8%) 0% <0%> (ø)
...ng/transport/dispatcher/all/AllChannelHandler.java 51.42% <0%> (-5.72%) 0% <0%> (ø)
.../org/apache/dubbo/remoting/ExecutionException.java 15.78% <0%> (-5.27%) 0% <0%> (ø)
...exchange/support/header/HeaderExchangeHandler.java 64.75% <0%> (-2.46%) 0% <0%> (ø)
.../apache/dubbo/remoting/transport/AbstractPeer.java 63.04% <0%> (-2.18%) 0% <0%> (ø)
...ache/dubbo/registry/multiple/MultipleRegistry.java 62.67% <0%> (-1.41%) 20% <0%> (-2%)
...pache/dubbo/remoting/transport/AbstractServer.java 47.91% <0%> (-1.05%) 0% <0%> (ø)
...n/java/org/apache/dubbo/config/AbstractConfig.java 79.51% <0%> (-0.07%) 0% <0%> (ø)
... and 3 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 0bd5a29...6f20c5e. Read the comment docs.

@cvictory cvictory added this to the 2.7.3 milestone Jul 11, 2019
@cvictory cvictory self-requested a review July 11, 2019 06:15
Copy link
Contributor

@cvictory cvictory left a comment

Choose a reason for hiding this comment

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

LGTM

@cvictory cvictory merged commit a5f6090 into apache:2.7.3-release Jul 12, 2019
@chickenlj chickenlj deleted the clusterutils-mergeurl branch September 3, 2019 02:36
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

3 participants