From dbd4448da40e7ff23e17ae09e75b7618c706d73f Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Wed, 22 Mar 2023 06:19:05 -0700 Subject: [PATCH] Always import default data if rabbit_table:needs_default_data/0 is true Fixes #7678 References: * #2384 * #2396 PR #2396 preserved the old behavior where definitions import took priority over the default data and environment data that may be present. This behavior continues to confuse users where they expect `RABBITMQ_DEFAULT_USER` / `RABBITMQ_DEFAULT_PASS` to be imported, especially if there is no `users` data in the definitions file. This PR allows default data and the environment to be imported first, then possibly overwritten by the definitions file. --- deps/rabbit/src/rabbit.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index 236e084e3d1b..67c1f8b23db5 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -1056,14 +1056,13 @@ recover() -> -spec maybe_insert_default_data() -> 'ok'. maybe_insert_default_data() -> - NoDefsToImport = not rabbit_definitions:has_configured_definitions_to_load(), - case rabbit_table:needs_default_data() andalso NoDefsToImport of + case rabbit_table:needs_default_data() of true -> ?LOG_INFO("Will seed default virtual host and user...", #{domain => ?RMQLOG_DOMAIN_GLOBAL}), insert_default_data(); false -> - ?LOG_INFO("Will not seed default virtual host and user: have definitions to load...", + ?LOG_INFO("Will NOT seed default virtual host and user...", #{domain => ?RMQLOG_DOMAIN_GLOBAL}), ok end.