fix(bridge/mqtt): respect client ID prefix #13216
Merged
Conversation
This file contains 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
keynslug
reviewed
Jun 10, 2024
| mk_clientid(WorkerId, {Prefix, ClientId}) when ?IS_NO_PREFIX(Prefix) -> | ||
| %% When there is no prefix, try to keep the client ID length within 23 bytes | ||
| emqx_bridge_mqtt_lib:bytes23(ClientId, WorkerId); | ||
| mk_clientid(WorkerId, {Prefix, ClientId}) when size(Prefix) < 20 -> |
There was a problem hiding this comment.
Nit. Put 20 behind a -define?
keynslug
approved these changes
Jun 10, 2024
This was referenced Jun 10, 2024
Le9Wang
reviewed
Jun 12, 2024
| Change Details: | ||
| - Without Prefix: Behavior remains unchanged; EMQX will hash the entire Client ID into a 23-byte space (when longer than 23 bytes). | ||
| - With Prefix: | ||
| - Prefix no more than 19 bytes: The prefix is preserved, and the remaining suffix is hashed into a 4-byte space. |
There was a problem hiding this comment.
It would be easier to understand if it is changed to:
Prefix no more than 19 bytes: The prefix is preserved, and the remaining suffix is hashed, the total length of the clientid is 23 bytes.
Since when the prefix is "org_", the clientid will be something like "org_de50546ff2da307d11d".
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.
Fixes #13214, #13186, #13185 and EMQX-12525
Release version: v/e5.7.1
Summary
Introduced in 5.4.1 PR: #12236
The client ID shortener did not respect client ID prefix.
After this fix, client ID prefix will be kept:
PR Checklist
Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:
changes/(ce|ee)/(feat|perf|fix|breaking)-<PR-id>.en.mdfilesChecklist for CI (.github/workflows) changes
changes/dir for user-facing artifacts update