yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(dsrepl): apply unnecessary rebalancing transitions cleanly

This commit is contained in:
Andrew Mayorov 2024-04-08 13:25:45 +02:00
parent dcde30c38a
commit 4c0cc079c2
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_durable_storage/src/emqx_ds_replication_layer_meta.erl
View File

@ -481,15 +481,19 @@ modify_db_sites_trans(DB, Modifications) ->
case Sites of case Sites of
Sites0 -> Sites0 ->
ok; ok;
_Chagned -> _Changed ->
assign_db_sites_trans(DB, Sites) assign_db_sites_trans(DB, Sites)
end. end.
update_replica_set_trans(DB, Shard, Trans) -> update_replica_set_trans(DB, Shard, Trans) ->
case mnesia:read(?SHARD_TAB, {DB, Shard}, write) of case mnesia:read(?SHARD_TAB, {DB, Shard}, write) of
[Record = #?SHARD_TAB{replica_set = ReplicaSet0, target_set = TargetSet0}] -> [Record = #?SHARD_TAB{replica_set = ReplicaSet0, target_set = TargetSet0}] ->
%% NOTE
%% It's possible to complete a transition that's no longer planned. We
%% should anticipate that we may stray _away_ from the target set.
TargetSet1 = emqx_maybe:define(TargetSet0, ReplicaSet0),
ReplicaSet = apply_transition(Trans, ReplicaSet0), ReplicaSet = apply_transition(Trans, ReplicaSet0),
case lists:usort(TargetSet0) of case lists:usort(TargetSet1) of
ReplicaSet -> ReplicaSet ->
TargetSet = undefined; TargetSet = undefined;
TS -> TS ->