Skip to content

Commit 2c40f6a

Browse files
committed
Re-introduce gm_group table
For mixed-version clusters, as the gm table is created even if CMQ have already been deprecated
1 parent 0d1cad5 commit 2c40f6a

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

deps/rabbit/app.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ def all_beam_files(name = "all_beam_files"):
99
erlang_bytecode(
1010
name = "behaviours",
1111
srcs = [
12+
"src/gm.erl",
1213
"src/mc.erl",
1314
"src/rabbit_backing_queue.erl",
1415
"src/rabbit_credential_validator.erl",
@@ -561,6 +562,7 @@ def all_srcs(name = "all_srcs"):
561562
"src/background_gc.erl",
562563
"src/code_server_cache.erl",
563564
"src/gatherer.erl",
565+
"src/gm.erl",
564566
"src/internal_user.erl",
565567
"src/lqueue.erl",
566568
"src/mc.erl",

deps/rabbit/src/gm.erl

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
%% This Source Code Form is subject to the terms of the Mozilla Public
2+
%% License, v. 2.0. If a copy of the MPL was not distributed with this
3+
%% file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
%%
5+
%% Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
6+
%%
7+
8+
-module(gm).
9+
10+
%% Deprecated with CMQ.
11+
%% This module stays here for mixed-version compatibility, because of
12+
%% the `gm_group` table. It can be removed once the migration to Khepri
13+
%% is finalised and Mnesia fully removed.
14+
15+
-export([table_definitions/0]).
16+
17+
-define(GROUP_TABLE, gm_group).
18+
19+
-record(gm_group, { name, version, members }).
20+
21+
-define(TABLE, {?GROUP_TABLE, [{record_name, gm_group},
22+
{attributes, record_info(fields, gm_group)}]}).
23+
-define(TABLE_MATCH, {match, #gm_group { _ = '_' }}).
24+
25+
table_definitions() ->
26+
{Name, Attributes} = ?TABLE,
27+
[{Name, [?TABLE_MATCH | Attributes]}].

deps/rabbit/src/rabbit_table.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ definitions() ->
359359

360360
mandatory_definitions() ->
361361
pre_khepri_definitions()
362+
++ gm:table_definitions()
362363
++ mirrored_supervisor:table_definitions()
363364
++ rabbit_maintenance:table_definitions().
364365

0 commit comments

Comments
 (0)