Add rabbit.variable_queue_default_version to the cuttlefish schemamodern-classic-queue-index

2 files changed, 46 insertions, 13 deletions

diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
index 1537639b10..1170496da0 100644
--- a/deps/rabbit/priv/schema/rabbit.schema
+++ b/deps/rabbit/priv/schema/rabbit.schema
@@ -2110,6 +2110,25 @@ end}.
     end
 }.
 
+%%
+%% Backing queue version
+%%
+
+{mapping, "rabbit.variable_queue_default_version", "rabbit.variable_queue_default_version", [
+  {datatype, integer},
+  {validators, ["non_zero_positive_integer"]}
+]}.
+
+{translation, "rabbit.variable_queue_default_version",
+    fun(Conf) ->
+        case cuttlefish:conf_get("rabbit.variable_queue_default_version", Conf, 1) of
+            1 -> 1;
+            2 -> 2;
+            _ -> cuttlefish:unset()
+        end
+    end
+}.
+
 % ===============================
 % Validators
 % ===============================
diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
index e41ae8cd6d..d77bd688d1 100644
--- a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
+++ b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
@@ -785,18 +785,32 @@ credential_validator.regexp = ^abc\\d+",
      ]}],
    []},
 
-   {raft_wal_max_batch_size,
-    "raft.wal_max_batch_size = 4096",
-    [{ra, [
-       {wal_max_batch_size, 4096}
-      ]}],
-    []},
-
-    {raft_snapshot_chunk_size,
-     "raft.snapshot_chunk_size = 1000000",
-     [{ra, [
-        {snapshot_chunk_size, 1000000}
-       ]}],
-     []}
+  {raft_wal_max_batch_size,
+   "raft.wal_max_batch_size = 4096",
+   [{ra, [
+      {wal_max_batch_size, 4096}
+     ]}],
+   []},
+
+  {raft_snapshot_chunk_size,
+   "raft.snapshot_chunk_size = 1000000",
+   [{ra, [
+      {snapshot_chunk_size, 1000000}
+     ]}],
+   []},
 
+  %%
+  %% Backing queue version
+  %%
+
+  {variable_queue_default_version_2,
+   "rabbit.variable_queue_default_version = 2",
+   [{rabbit, [
+      {variable_queue_default_version, 2}
+     ]}],
+   []},
+  {variable_queue_default_version_invalid,
+   "rabbit.variable_queue_default_version = 3",
+   [],
+   []}
 ].