diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2020-03-12 19:39:34 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2020-03-12 19:39:34 +0300 |
| commit | c503d57e884dd440aa6b830bb9835be4dd2d8f69 (patch) | |
| tree | 3fcd0c9051a9ccb2448879630872417d55815027 | |
| parent | 4e970134a55f5ccb2ab4726f62524f3313a3f190 (diff) | |
| download | rabbitmq-server-git-c503d57e884dd440aa6b830bb9835be4dd2d8f69.tar.gz | |
Make sure definition import work pool is started before actual import boot step
| -rw-r--r-- | src/rabbit.erl | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 31983dad24..b806eb8a17 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -101,6 +101,21 @@ {requires, pre_boot}, {enables, external_infrastructure}]}). +-rabbit_boot_step({definition_import_worker_pool, + [{description, "dedicated worker pool for definition import"}, + {mfa, {rabbit_definitions, boot, []}}, + {requires, external_infrastructure}, + {enables, load_core_definitions}]}). + +%% We want to A) make sure we apply definitions before the node begins serving +%% traffic and B) in fact do it before empty_db_check (so the defaults will not +%% get created if we don't need 'em). +-rabbit_boot_step({load_core_definitions, + [{description, "imports definitions"}, + {mfa, {rabbit_definitions, maybe_load_definitions, []}}, + {requires, [recovery, definition_import_worker_pool]}, + {enables, empty_db_check}]}). + -rabbit_boot_step({external_infrastructure, [{description, "external infrastructure ready"}]}). @@ -188,15 +203,6 @@ {requires, [core_initialized]}, {enables, routing_ready}]}). -%% We want to A) make sure we apply definitions before the node begins serving -%% traffic and B) in fact do it before empty_db_check (so the defaults will not -%% get created if we don't need 'em). --rabbit_boot_step({load_core_definitions, - [{description, "imports definitions"}, - {mfa, {rabbit_definitions, maybe_load_definitions, []}}, - {requires, recovery}, - {enables, empty_db_check}]}). - -rabbit_boot_step({empty_db_check, [{description, "empty DB check"}, {mfa, {?MODULE, maybe_insert_default_data, []}}, @@ -236,11 +242,6 @@ [{description, "ready to communicate with peers and clients"}, {requires, [core_initialized, recovery, routing_ready]}]}). --rabbit_boot_step({definition_import_worker_pool, - [{description, "dedicated worker pool for definition import"}, - {mfa, {rabbit_definitions, boot, []}}, - {requires, pre_flight}]}). - -rabbit_boot_step({cluster_name, [{description, "sets cluster name if configured"}, {mfa, {rabbit_nodes, boot, []}}, |