Ver código fonte

chore(dssubs): disable DS-based shared subs by default

At least until the feature is mostly complete.
Andrew Mayorov 1 ano atrás
pai
commit
2f6a6a1d3b

+ 1 - 1
apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_schema.erl

@@ -31,7 +31,7 @@ fields(durable_queues) ->
                 boolean(),
                 #{
                     required => false,
-                    default => true,
+                    default => false,
                     desc => ?DESC(enable)
                 }
             )},

+ 15 - 18
apps/emqx_ds_shared_sub/test/emqx_ds_shared_sub_SUITE.erl

@@ -19,26 +19,23 @@ init_per_suite(Config) ->
     Apps = emqx_cth_suite:start(
         [
             {emqx_conf, #{
-                config => #{
-                    <<"durable_sessions">> => #{
-                        <<"enable">> => true,
-                        <<"renew_streams_interval">> => "100ms"
-                    },
-                    <<"durable_storage">> => #{
-                        <<"messages">> => #{
-                            <<"backend">> => <<"builtin_raft">>
-                        },
-                        <<"queues">> => #{
-                            <<"backend">> => <<"builtin_raft">>,
-                            <<"local_write_buffer">> => #{
-                                <<"flush_interval">> => <<"10ms">>
-                            }
-                        }
-                    }
-                }
+                config =>
+                    "\n durable_sessions {"
+                    "\n     enable = true"
+                    "\n     renew_streams_interval = 100ms"
+                    "\n }"
+                    "\n durable_storage.messages {"
+                    "\n     backend = builtin_raft"
+                    "\n }"
+                    "\n durable_storage.queues = {"
+                    "\n     backend = builtin_raft"
+                    "\n     local_write_buffer.flush_interval = 10ms"
+                    "\n }"
             }},
             emqx,
-            emqx_ds_shared_sub
+            {emqx_ds_shared_sub, #{
+                config => "durable_queues { enable = true }"
+            }}
         ],
         #{work_dir => ?config(priv_dir, Config)}
     ),

+ 7 - 1
apps/emqx_ds_shared_sub/test/emqx_ds_shared_sub_api_SUITE.erl

@@ -42,7 +42,13 @@ init_per_suite(Config) ->
                 }
             }},
             emqx,
-            emqx_ds_shared_sub,
+            {emqx_ds_shared_sub, #{
+                config => #{
+                    <<"durable_queues">> => #{
+                        <<"enable">> => true
+                    }
+                }
+            }},
             emqx_management,
             emqx_mgmt_api_test_util:emqx_dashboard()
         ],