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

cherry pick pr7109 to 3.0 #7950

Merged
merged 3 commits into from
Jun 4, 2021
Merged

cherry pick pr7109 to 3.0 #7950

merged 3 commits into from
Jun 4, 2021

Conversation

zhangyz-hd
Copy link
Contributor

What is the purpose of the change

Cherry pick commits from #7109 to 3.0 branch, to fix #7054.

Checklist

  • 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.
  • 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.
  • Check if is necessary to patch to Dubbo 3 if you are work on Dubbo 2.7
  • 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.
  • Add some description to dubbo-website project if you are requesting to add a feature.
  • GitHub Actions works fine on your own branch.
  • If this contribution is large, please follow the Software Donation Guide.

@codecov-commenter
Copy link

codecov-commenter commented Jun 1, 2021

Codecov Report

Merging #7950 (9924460) into 3.0 (8bc9257) will decrease coverage by 0.26%.
The diff coverage is 86.95%.

Impacted file tree graph

@@             Coverage Diff              @@
##                3.0    #7950      +/-   ##
============================================
- Coverage     59.81%   59.54%   -0.27%     
  Complexity      326      326              
============================================
  Files          1086     1086              
  Lines         44360    44360              
  Branches       6626     6625       -1     
============================================
- Hits          26534    26416     -118     
- Misses        14906    15024     +118     
  Partials       2920     2920              
Impacted Files Coverage Δ
.../threadpool/manager/DefaultExecutorRepository.java 80.82% <84.21%> (-6.33%) ⬇️
.../apache/dubbo/config/bootstrap/DubboBootstrap.java 63.88% <100.00%> (+0.17%) ⬆️
...pache/dubbo/remoting/transport/AbstractClient.java 65.71% <100.00%> (+1.33%) ⬆️
...a/org/apache/dubbo/rpc/filter/AccessLogFilter.java 25.00% <0.00%> (-44.74%) ⬇️
...va/org/apache/dubbo/rpc/support/AccessLogData.java 53.16% <0.00%> (-37.98%) ⬇️
...ng/transport/dispatcher/WrappedChannelHandler.java 43.47% <0.00%> (-19.57%) ⬇️
...dubbo/common/status/support/LoadStatusChecker.java 46.15% <0.00%> (-15.39%) ⬇️
...in/java/org/apache/dubbo/common/utils/JVMUtil.java 81.13% <0.00%> (-11.33%) ⬇️
.../apache/dubbo/remoting/transport/AbstractPeer.java 58.69% <0.00%> (-8.70%) ⬇️
...ng/transport/dispatcher/all/AllChannelHandler.java 82.75% <0.00%> (-6.90%) ⬇️
... and 19 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 8bc9257...9924460. Read the comment docs.

Map<Integer, ExecutorService> executors = data.computeIfAbsent(componentKey, k -> new ConcurrentHashMap<>());
Integer portKey = url.getPort();
Map<Integer, ExecutorService> executors = data.computeIfAbsent(EXECUTOR_SERVICE_COMPONENT_KEY, k -> new ConcurrentHashMap<>());
//issue-7054:Consumer's executor is sharing globally, key=Integer.MAX_VALUE. Provider's executor is sharing by protocol.
Copy link
Member

Choose a reason for hiding this comment

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

please remove issue count and refer it in pr comment

@@ -127,16 +122,20 @@ public ExecutorService getExecutor(URL url) {
return null;
}

Integer portKey = url.getPort();
//issue-7054:Consumer's executor is sharing globally, key=Integer.MAX_VALUE. Provider's executor is sharing by protocol.
Copy link
Member

Choose a reason for hiding this comment

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

also for this one

@AlbumenJ AlbumenJ merged commit 259dff2 into apache:3.0 Jun 4, 2021
@zhangyz-hd zhangyz-hd deleted the cherrypick-7109-to-3 branch July 5, 2021 02:21
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.

3 participants