[ISSUE #10435] Fix shared ClientChannelInfo preventing inactive channel expiry#10437
Open
chuanxo wants to merge 2 commits into
Open
[ISSUE #10435] Fix shared ClientChannelInfo preventing inactive channel expiry#10437chuanxo wants to merge 2 commits into
chuanxo wants to merge 2 commits into
Conversation
… channel expiry
oss-taishan-ai
approved these changes
Jun 8, 2026
oss-taishan-ai
left a comment
There was a problem hiding this comment.
Review by github-manager-bot
Summary
This PR fixes a bug where ClientChannelInfo was shared across multiple consumer/producer groups in the heartbeat processing loop, causing incorrect channel expiry behavior.
Findings
- [Info] broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java:81-87 — Moved
ClientChannelInfocreation into theheartBeatV2branch, ensuring each code path creates its own instance. - [Info] broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java:125-130 — Creates
ClientChannelInfoinside the consumer group loop, so each group gets an independent instance. - [Info] broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java:149-154 — Creates
ClientChannelInfoinline for producer registration, maintaining consistency. - [Info] broker/src/test/java/org/apache/rocketmq/broker/processor/ClientManageProcessorTest.java:223-276 — Excellent test coverage. The new test
testHeartbeatMultiGroupChannelIndependentExpiryspecifically validates the bug scenario: two groups share a heartbeat, then only one continues, and the other should be evicted.
Suggestions
The fix is correct and minimal. The performance impact of creating more ClientChannelInfo objects is negligible compared to the correctness gain. The test directly reproduces the reported issue and verifies the fix.
Verdict
✅ Approved — Clean fix for a real concurrency bug with good test coverage.
Automated review by github-manager-bot
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which Issue(s) This PR Fixes
Brief Description
ClientManageProcessor.heartBeat()在循环外只创建了一个ClientChannelInfo实例,多个 consumer/producer group 共享同一引用。ConsumerGroupInfo.updateChannel()更新lastUpdateTimestamp时会影响所有 group,导致scanNotActiveChannel()无法正确过期清理已下线的 group channel。修复方式:将
new ClientChannelInfo(...)移到循环体内,每个 group 持有独立实例。How Did You Test This Change?
在
ClientManageProcessorTest中新增testHeartbeatMultiGroupChannelIndependentExpiry,验证多 group 心跳场景下各 group 的ClientChannelInfo互相独立,未续期的 group channel 能被正常过期清理。