Forráskód Böngészése

refactor: change some default values of resource_opts

Shawn 3 éve
szülő
commit
f41adb0997

+ 2 - 2
apps/emqx_bridge/src/emqx_bridge_api.erl

@@ -208,8 +208,8 @@ info_example_basic(webhook) ->
             auto_restart_interval => 15000,
             query_mode => async,
             async_inflight_window => 100,
-            enable_queue => true,
-            max_queue_bytes => 1024 * 1024 * 1024
+            enable_queue => false,
+            max_queue_bytes => 100 * 1024 * 1024
         }
     };
 info_example_basic(mqtt) ->

+ 4 - 4
apps/emqx_resource/include/emqx_resource.hrl

@@ -84,15 +84,15 @@
 -define(DEFAULT_QUEUE_SEG_SIZE, 10 * 1024 * 1024).
 -define(DEFAULT_QUEUE_SEG_SIZE_RAW, <<"10MB">>).
 
--define(DEFAULT_QUEUE_SIZE, 100 * 1024 * 1024 * 1024).
--define(DEFAULT_QUEUE_SIZE_RAW, <<"100GB">>).
+-define(DEFAULT_QUEUE_SIZE, 100 * 1024 * 1024).
+-define(DEFAULT_QUEUE_SIZE_RAW, <<"100MB">>).
 
 %% count
 -define(DEFAULT_BATCH_SIZE, 100).
 
 %% milliseconds
--define(DEFAULT_BATCH_TIME, 10).
--define(DEFAULT_BATCH_TIME_RAW, <<"10ms">>).
+-define(DEFAULT_BATCH_TIME, 20).
+-define(DEFAULT_BATCH_TIME_RAW, <<"20ms">>).
 
 %% count
 -define(DEFAULT_INFLIGHT, 100).

+ 1 - 1
apps/emqx_resource/src/schema/emqx_resource_schema.erl

@@ -82,7 +82,7 @@ query_mode(_) -> undefined.
 
 enable_batch(type) -> boolean();
 enable_batch(required) -> false;
-enable_batch(default) -> false;
+enable_batch(default) -> true;
 enable_batch(desc) -> ?DESC("enable_batch");
 enable_batch(_) -> undefined.
 

+ 2 - 2
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_influxdb.erl

@@ -93,8 +93,8 @@ values(common, Protocol, SupportUint, TypeOpts) ->
         precision => ms,
         resource_opts => #{
             enable_batch => false,
-            batch_size => 5,
-            batch_time => <<"1m">>
+            batch_size => 100,
+            batch_time => <<"20ms">>
         },
         server => <<"127.0.0.1:8086">>,
         ssl => #{enable => false}

+ 1 - 1
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl

@@ -58,7 +58,7 @@ values(post) ->
             worker_pool_size => 1,
             health_check_interval => ?HEALTHCHECK_INTERVAL_RAW,
             auto_restart_interval => ?AUTO_RESTART_INTERVAL_RAW,
-            enable_batch => false,
+            enable_batch => true,
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => async,