Skip to content

Commit 589ed43

Browse files
Merge pull request #5408 from rabbitmq/ik-import-vhost-default-queue-type-5399
Import default queue type when virtual host is imported
2 parents 0c9b41b + 0f541f4 commit 589ed43

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

deps/rabbit/src/rabbit_definitions.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,9 @@ add_vhost(VHost, ActingUser) ->
660660
Metadata = rabbit_data_coercion:atomize_keys(maps:get(metadata, VHost, #{})),
661661
Description = maps:get(description, VHost, maps:get(description, Metadata, <<"">>)),
662662
Tags = maps:get(tags, VHost, maps:get(tags, Metadata, [])),
663+
DefaultQueueType = maps:get(default_queue_type, Metadata, undefined),
663664

664-
rabbit_vhost:put_vhost(Name, Description, Tags, IsTracingEnabled, ActingUser).
665+
rabbit_vhost:put_vhost(Name, Description, Tags, DefaultQueueType, IsTracingEnabled, ActingUser).
665666

666667
add_permission(Permission, ActingUser) ->
667668
rabbit_auth_backend_internal:set_permissions(maps:get(user, Permission, undefined),

deps/rabbit/test/definition_import_SUITE.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ import_case16(Config) ->
263263
rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
264264
VHostRec = vhost_lookup(Config, VHost),
265265
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
266+
?assertEqual(<<"quorum">>, vhost:get_default_queue_type(VHostRec)),
266267
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
267268

268269
ok.

deps/rabbit/test/definition_import_SUITE_data/case16.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
{
4646
"limits": [],
4747
"metadata": {
48+
"default_queue_type":"quorum",
4849
"description": "A case16 description",
4950
"tags": [
5051
"multi_dc_replication",

0 commit comments

Comments
 (0)