Bugfixes

Author: dcorbacho

deps/rabbit/src/rabbit_core_ff.erl

@@ -196,12 +196,8 @@ mds_phase1_migration_post_enable(#{feature_name := FeatureName}) ->
     rabbit_db:set_migration_flag(FeatureName).
 
 mds_migration_enable(FeatureName, TablesAndOwners) ->
-    case ensure_khepri_cluster_matches_mnesia(FeatureName) of
-        ok ->
-            migrate_tables_to_khepri(FeatureName, TablesAndOwners);
-        Error ->
-            Error
-    end.
+    ok = ensure_khepri_cluster_matches_mnesia(FeatureName),
+    migrate_tables_to_khepri(FeatureName, TablesAndOwners).
 
 mds_migration_post_enable(FeatureName, TablesAndOwners) ->
     ?assert(rabbit_khepri:is_enabled(non_blocking)),
@@ -222,16 +218,7 @@ ensure_khepri_cluster_matches_mnesia(FeatureName) ->
        "Feature flag `~s`:   updating the Khepri cluster to match "
        "the Mnesia cluster",
        [FeatureName]),
-    case expand_khepri_cluster(FeatureName, AllMnesiaNodes) of
-        ok ->
-            ok;
-        Error ->
-            ?LOG_ERROR(
-               "Feature flag `~s`:   failed to migrate from Mnesia "
-               "to Khepri: failed to create Khepri cluster: ~p",
-               [FeatureName, Error]),
-            Error
-    end.
+    expand_khepri_cluster(FeatureName, AllMnesiaNodes).
 
 expand_khepri_cluster(FeatureName, AllMnesiaNodes) ->
     %% All Mnesia nodes are running (this is a requirement to enable this

deps/rabbit/src/rabbit_db.erl

@@ -78,9 +78,7 @@ recover_mnesia_tables() ->
     %% A failed migration can leave tables in read-only mode before enabling
     %% the feature flag. See rabbit_core_ff:final_sync_from_mnesia_to_khepri/2
     %% Unlock them here as mnesia is still fully functional.
-    Tables = rabbit_channel_tracking:get_all_tracked_channel_table_names_for_node(node())
-        ++ rabbit_connection_tracking:get_all_tracked_connection_table_names_for_node(node())
-        ++ [Table || {Table, _} <- rabbit_table:definitions()],
+    Tables = [Table || {Table, _} <- rabbit_table:definitions()],
     [mnesia:change_table_access_mode(Table, read_write) || Table <- Tables],
     ok.