yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10995 from thalesmg/iotdb-request-ttl-v50 

fix(iotdb): remove root `request_timeout` option
This commit is contained in:
Stefan Strigler 2023-06-09 17:12:50 +02:00 committed by GitHub
parent 20a7ce64cd 4a9f2247ca
commit 219b424c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_packages.yaml vendored
View File

@ -88,7 +88,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- uses: ilammy/msvc-dev-cmd@v1.12.0 - uses: ilammy/msvc-dev-cmd@v1.12.0
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- name: build - name: build

2
.github/workflows/build_slim_packages.yaml vendored
View File

@ -96,7 +96,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ilammy/msvc-dev-cmd@v1.12.0 - uses: ilammy/msvc-dev-cmd@v1.12.0
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: ${{ matrix.otp }} otp-version: ${{ matrix.otp }}
- name: build - name: build

4
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -58,7 +58,7 @@ jobs:
arch: arch:
- amd64 - amd64
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
@ -133,7 +133,7 @@ jobs:
# - emqx-enterprise # TODO test enterprise # - emqx-enterprise # TODO test enterprise
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3

12
.github/workflows/run_jmeter_tests.yaml vendored
View File

@ -14,7 +14,7 @@ jobs:
outputs: outputs:
version: ${{ steps.build_docker.outputs.version}} version: ${{ steps.build_docker.outputs.version}}
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- name: download jmeter - name: download jmeter
@ -57,7 +57,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -153,7 +153,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -259,7 +259,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -361,7 +361,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -460,7 +460,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3

2
.github/workflows/run_relup_tests.yaml vendored
View File

@ -71,7 +71,7 @@ jobs:
shell: bash shell: bash
steps: steps:
# setup Erlang to run lux # setup Erlang to run lux
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.15.4
with: with:
otp-version: 25.3.2 otp-version: 25.3.2
- uses: actions/checkout@v3 - uses: actions/checkout@v3

8
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
View File

@ -141,14 +141,6 @@ request_config() ->
default => 2, default => 2,
desc => ?DESC("config_max_retries") desc => ?DESC("config_max_retries")
} }
)},
{request_timeout,
mk(
emqx_schema:timeout_duration_ms(),
#{
default => <<"15s">>,
desc => ?DESC("config_request_timeout")
}
)} )}
]. ].

2
apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl
View File

@ -132,7 +132,7 @@ bridge_config(TestCase, _TestGroup, Config) ->
" username = \"root\"\n" " username = \"root\"\n"
" password = \"root\"\n" " password = \"root\"\n"
" }\n" " }\n"
"iotdb_version = \"~s\"\n" " iotdb_version = \"~s\"\n"
" pool_size = 1\n" " pool_size = 1\n"
" resource_opts = {\n" " resource_opts = {\n"
" health_check_interval = 5000\n" " health_check_interval = 5000\n"

6
apps/emqx_conf/test/emqx_conf_app_SUITE.erl
View File

@ -107,11 +107,13 @@ t_copy_deprecated_data_dir(Config) ->
stop_cluster(Nodes) stop_cluster(Nodes)
end. end.
t_no_copy_from_newer_version_node(_Config) -> t_no_copy_from_newer_version_node(Config) ->
net_kernel:start(['master2@127.0.0.1', longnames]), net_kernel:start(['master2@127.0.0.1', longnames]),
ct:timetrap({seconds, 120}), ct:timetrap({seconds, 120}),
snabbkaffe:fix_ct_logging(), snabbkaffe:fix_ct_logging(),
Cluster = cluster([cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})]), Cluster = cluster(
[cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})], Config
),
OKs = [ok, ok, ok], OKs = [ok, ok, ok],
[First | Rest] = Nodes = start_cluster(Cluster), [First | Rest] = Nodes = start_cluster(Cluster),
try try

6
rel/i18n/emqx_bridge_iotdb.hocon
View File

@ -59,12 +59,6 @@ config_max_retries.desc:
config_max_retries.label: config_max_retries.label:
"""HTTP Request Max Retries""" """HTTP Request Max Retries"""
config_request_timeout.desc:
"""HTTP request timeout."""
config_request_timeout.label:
"""HTTP Request Timeout"""
desc_config.desc: desc_config.desc:
"""Configuration for Apache IoTDB bridge.""" """Configuration for Apache IoTDB bridge."""