diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-06-01 22:08:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 22:08:17 +0300 |
| commit | 9083a01b59195bf1202b74f504b5ae47ba110a6a (patch) | |
| tree | 70a7a2fda435b0e366103413af51024cfce0f227 | |
| parent | a53ec39f0eb64e4c99c68067f733b160b2cf8f8f (diff) | |
| parent | d367bf88e3177371f76fc2ddf51c6d8ee7d8f787 (diff) | |
| download | rabbitmq-server-git-9083a01b59195bf1202b74f504b5ae47ba110a6a.tar.gz | |
Merge pull request #2355 from rabbitmq/rabbitmq-server-2354
Introduce raft.data_dir to new style configuration schema
| -rw-r--r-- | priv/schema/rabbit.schema | 12 | ||||
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 7 |
3 files changed, 21 insertions, 1 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 7fed1372cf..9552fb0cf3 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -1666,6 +1666,18 @@ end}. end }. +{mapping, "raft.data_dir", "ra.data_dir", [ + {datatype, string} +]}. + +{translation, "ra.data_dir", + fun(Conf) -> + case cuttlefish:conf_get("raft.data_dir", Conf, undefined) of + undefined -> cuttlefish:unset(); + Val -> Val + end + end +}. % =============================== % Validators diff --git a/src/rabbit.erl b/src/rabbit.erl index 5bf1ca0155..fa55ac05d1 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -708,7 +708,8 @@ status() -> {enabled_plugin_file, rabbit_plugins:enabled_plugins_file()}], S6 = [{config_files, config_files()}, {log_files, log_locations()}, - {data_directory, rabbit_mnesia:dir()}], + {data_directory, rabbit_mnesia:dir()}, + {raft_data_directory, ra_env:data_dir()}], Totals = case rabbit:is_running() of true -> [{virtual_host_count, rabbit_vhost:count()}, diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index fcf0851b52..96930a375b 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -667,6 +667,13 @@ credential_validator.regexp = ^abc\\d+", %% Raft %% + {raft_data_dir, + "raft.data_dir = /data/rabbitmq/raft/log", + [{ra, [ + {data_dir, "/data/rabbitmq/raft/log"} + ]}], + []}, + {raft_segment_max_entries, "raft.segment_max_entries = 65536", [{ra, [ |