[ISSUE #10435] Fix shared ClientChannelInfo preventing inactive channel expiry#10437
[ISSUE #10435] Fix shared ClientChannelInfo preventing inactive channel expiry#10437chuanxo wants to merge 2 commits into
Conversation
… channel expiry
oss-sentinel-ai
left a comment
oss-sentinel-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
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #10437 +/- ##
=============================================
- Coverage 48.04% 47.98% -0.06%
+ Complexity 13305 13288 -17
=============================================
Files 1377 1377
Lines 100613 100641 +28
Branches 12992 12995 +3
=============================================
- Hits 48341 48295 -46
- Misses 46354 46397 +43
- Partials 5918 5949 +31 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
3 participants
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 能被正常过期清理。