fix(broker): avoid needless emqx_shared_sub call on subscriber down
#15396
+28
−14
Conversation
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
Server `emqx_shared_sub` manages its own monitors and runs cleanups. Moreover, during high disconnect rate it can be overloaded with DOWN signals, and `unsubscribe/3` call can easily timeout.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release-510 #15396 +/- ##
===============================================
+ Coverage 81.74% 81.79% +0.04%
===============================================
Files 1116 1117 +1
Lines 81434 81549 +115
===============================================
+ Hits 66572 66704 +132
+ Misses 14862 14845 -17 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
zmstone
approved these changes
Jun 20, 2025
| do_unsubscribe_down(Topic, SubPid, SubOpts) -> | ||
| true = ets:delete(?SUBOPTION, {Topic, SubPid}), | ||
| case Topic of | ||
| B when is_binary(B) -> |
There was a problem hiding this comment.
nit: maybe add a IS_SHARED_TOPIC macro in emqx_mqtt.hrl.
There was a problem hiding this comment.
To keep most common case clauses first, I guess then we'd then need IS_REGULAR_TOPIC, which is just is_binary(X)?
| @@ -210,24 +210,23 @@ unsubscribe(Topic) when ?IS_TOPIC(Topic) -> | |||
| do_unsubscribe(Topic, SubPid, SubOpts) -> | |||
| true = ets:delete(?SUBOPTION, {Topic, SubPid}), | |||
| true = ets:delete_object(?SUBSCRIPTION, {SubPid, Topic}), | |||
| do_unsubscribe2(Topic, SubPid, SubOpts). | |||
| case Topic of | |||
| B when is_binary(B) -> | |||
There was a problem hiding this comment.
nit: maybe add a IS_SHARED_TOPIC macro in emqx_mqtt.hrl.
There was a problem hiding this comment.
I'll try to make it look nicer in the followup PRs.
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.
Addresses #14011.
Release version: 5.10.1?
Summary
Server
emqx_shared_submanages its own monitors and runs cleanups. Moreover, during high disconnect rate it can be overloaded with DOWN signals, andunsubscribe/3call can easily timeout.PR Checklist
changes/ee/(feat|perf|fix|breaking)-<PR-id>.en.mdfiles