summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-05-29 20:58:50 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-05-29 21:01:30 +0300
commite4464aabbf5902f804145fbc3dcc89124672eab9 (patch)
tree1323e2c4febcee0e7a22de4a58b094ddfee95fb9
parentefed9b0a6c13847778689851b5c2a079187ba9a1 (diff)
downloadrabbitmq-server-git-e4464aabbf5902f804145fbc3dcc89124672eab9.tar.gz
Introduce raft.data_dir to new style configuration schema
As an experimental feature for now. To be sure that this value has the desired effect we may have to tweak the way Ra dependency is started. Some ealy tests suggest this works as expected already. Per discussion with @kjnilsson. Closes #2354.
-rw-r--r--priv/schema/rabbit.schema12
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets7
2 files changed, 19 insertions, 0 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/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, [