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

[ISSUE #6785] Isolate the remoteChannel by group #6786

Merged
merged 1 commit into from
May 23, 2023

Conversation

xdkxlk
Copy link
Contributor

@xdkxlk xdkxlk commented May 22, 2023

Which Issue(s) This PR Fixes

Fixes #6785

Brief Description

How Did You Test This Change?

@codecov-commenter
Copy link

Codecov Report

Merging #6786 (bde54e3) into develop (9dfd4a9) will increase coverage by 0.05%.
The diff coverage is 100.00%.

@@              Coverage Diff              @@
##             develop    #6786      +/-   ##
=============================================
+ Coverage      42.84%   42.89%   +0.05%     
- Complexity      8976     8987      +11     
=============================================
  Files           1108     1104       -4     
  Lines          78444    78376      -68     
  Branches       10212    10203       -9     
=============================================
+ Hits           33607    33620      +13     
+ Misses         40617    40542      -75     
+ Partials        4220     4214       -6     
Impacted Files Coverage Δ
...client/consumer/store/RemoteBrokerOffsetStore.java 68.75% <100.00%> (-0.28%) ⬇️
...etmq/proxy/service/sysmessage/HeartbeatSyncer.java 68.04% <100.00%> (ø)

... and 23 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@@ -49,7 +49,7 @@ public class HeartbeatSyncer extends AbstractSystemMessageSyncer {

protected ThreadPoolExecutor threadPoolExecutor;
protected ConsumerManager consumerManager;
protected final Map<String /* channelId as longText */, RemoteChannel> remoteChannelMap = new ConcurrentHashMap<>();
protected final Map<String /* group @ channelId as longText */, RemoteChannel> remoteChannelMap = new ConcurrentHashMap<>();
Copy link
Contributor

Choose a reason for hiding this comment

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

Will the "@" symbol conflict with the Group character?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not a problem, as long as clients from different groups can be distinguished here.

Copy link
Contributor

@lollipopjin lollipopjin left a comment

Choose a reason for hiding this comment

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

LGTM

@xdkxlk xdkxlk merged commit eef581b into apache:develop May 23, 2023
@xdkxlk xdkxlk deleted the develop-6785 branch May 23, 2023 08:41
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.

[Bug] The subscription data of Remoting may overlap in proxy
4 participants