Skip to content

Commit 3b05391

Browse files
committed
rabbit_feature_flags: Remove pre-3.7.x error messages
They were useful to diagnose failures when upgrading from e.g. 3.6.x to 3.8.x, but this is no longer supported. Therefore, drop this part of the code.
1 parent 7a4ccb4 commit 3b05391

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

deps/rabbit/src/rabbit_feature_flags.erl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,15 +1176,6 @@ does_node_support(Node, FeatureNames, Timeout) ->
11761176
Node, is_supported_locally, [FeatureNames], Timeout)
11771177
end,
11781178
case Ret of
1179-
{error, pre_feature_flags_rabbitmq} ->
1180-
%% See run_feature_flags_mod_on_remote_node/4 for
1181-
%% an explanation why we consider this node a 3.7.x
1182-
%% pre-feature-flags node.
1183-
rabbit_log_feature_flags:debug(
1184-
"Feature flags: no feature flags support on node `~ts`, "
1185-
"consider the feature flags unsupported: ~tp",
1186-
[Node, FeatureNames]),
1187-
false;
11881179
{error, Reason} ->
11891180
rabbit_log_feature_flags:error(
11901181
"Feature flags: error while querying `~tp` support on "

deps/rabbit/src/rabbit_ff_controller.erl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,25 +1084,6 @@ this_node_first(Nodes) ->
10841084

10851085
rpc_call(Node, Module, Function, Args, Timeout) ->
10861086
case rpc:call(Node, Module, Function, Args, Timeout) of
1087-
{badrpc, {'EXIT',
1088-
{undef,
1089-
[{rabbit_feature_flags, Function, Args, []}
1090-
| _]}}} ->
1091-
%% If rabbit_feature_flags:Function() is undefined
1092-
%% on the remote node, we consider it to be a 3.7.x
1093-
%% pre-feature-flags node.
1094-
%%
1095-
%% Theoretically, it could be an older version (3.6.x and
1096-
%% older). But the RabbitMQ version consistency check
1097-
%% (rabbit_misc:version_minor_equivalent/2) called from
1098-
%% rabbit_mnesia:check_rabbit_consistency/2 already blocked
1099-
%% this situation from happening before we reach this point.
1100-
?LOG_DEBUG(
1101-
"Feature flags: ~ts:~ts~tp unavailable on node `~ts`: "
1102-
"assuming it is a RabbitMQ 3.7.x pre-feature-flags node",
1103-
[Module, Function, Args, Node],
1104-
#{domain => ?RMQLOG_DOMAIN_FEAT_FLAGS}),
1105-
{error, pre_feature_flags_rabbitmq};
11061087
{badrpc, Reason} = Error ->
11071088
?LOG_ERROR(
11081089
"Feature flags: error while running:~n"

0 commit comments

Comments
 (0)