EMQX-10590 data import fix missing config relealse 51 #11322
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
The type resulted in missing `rule_engine` config after importing data from a backup file. Fixes: EMQX-10590
SergeTupchiy
requested review from
a team,
kjellwinblad,
lafirest and
sstrigler
as code owners
…t/export Fixes: EMQX-10590
SergeTupchiy
force-pushed
the
EMQX-10590-data-import-fix-missing-config-rel51
branch
from
6a6413b
to
b37920d
Compare
lafirest
previously approved these changes
Jul 21, 2023
zhongwencool
requested changes
Jul 21, 2023
Comment on lines
164
to
175
| post_config_update(_, _UpdateReq, NewConfig, OldConfig, _AppEnvs) -> | ||
| #{ | ||
| removed := Removed, | ||
| added := Added | ||
| } = emqx_utils:diff_lists(NewConfig, OldConfig, fun(#{topic := T}) -> T end), | ||
| Deregistered = [emqx_topic_metrics:deregister(T) || #{topic := T} <- Removed], | ||
| Registered = [emqx_topic_metrics:register(T) || #{topic := T} <- Added], | ||
| Errs = [Res || Res <- Registered ++ Deregistered, Res =/= ok], | ||
| case Errs of | ||
| [] -> ok; | ||
| _ -> {error, Errs} | ||
| end. |
There was a problem hiding this comment.
Nice catch, I can't believe I don't implment config_handler's callback for topic_metrics before.
Nit:
deregister will return ok or topic_not_found, we should mark topic_not_found as deregister success.
register will return ok or already_existed, maybe already_existed is also register success.
There was a problem hiding this comment.
Thanks, @zhongwencool, fixed.
…removed topic metrics
zhongwencool
approved these changes
Jul 21, 2023
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 EMQX-10590
This is the same as #11296, but ported to release-51.
Summary
🤖 Generated by Copilot at 6a6413b
This pull request adds support for importing backup data for the
emqx_modulesapplication, especially thetopic_metricsandslow_subsconfigurations. It also fixes a typo in theemqx_rule_enginemodule and updates the version number and test cases for theemqx_modulesapplication. The changes are documented in thechanges/ce/fix-11296.en.mdfile.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)-<PR-id>.en.mdfilesChecklist for CI (.github/workflows) changes
changes/dir for user-facing artifacts update