From ce61bd87a20f6f3bd33f1b0f7b521b7f2d0da71b Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Sun, 24 Sep 2023 17:25:07 +0800 Subject: [PATCH 01/11] wait for tiup playground by grep Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 354a7b5e93..1a66a3b232 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,15 +44,12 @@ jobs: - name: Start TiUP Playground run: | # Start TiKV in APIV1TTL - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 & - - # The first run of `tiup` has to download all components so it'll take longer. - sleep 1m 30s + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 > tiup-v1ttl.log & + grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) # Start TiKV in APIV1 - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 & - - sleep 30s + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 > tiup-v1.log & + grep -q "PD Endpoints:" <(tail -f tiup-v1.log) # Get PD address echo "RAWKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV From da44333eb79401b7a2380e62efa876caa462c9a6 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Sun, 24 Sep 2023 17:28:15 +0800 Subject: [PATCH 02/11] test on one version first Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a66a3b232..5879c23b7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tikv_version: [nightly, v5.0.4, v5.3.0, v5.4.0] + tikv_version: [v6.5.3] steps: - uses: actions/checkout@v2 - name: Set up JDK 8 From 310467ab1e2a59b28d05f41a964328ce5664a725 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Sun, 24 Sep 2023 17:39:06 +0800 Subject: [PATCH 03/11] wip Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5879c23b7c..dc2927c8da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,16 +40,22 @@ jobs: java-version: '8.0' distribution: 'adopt' - name: Install TiUP - run: curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh + run: | + curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh + /home/runner/.tiup/bin/tiup install pd:${{ matrix.tikv_version }} tikv:${{ matrix.tikv_version }} - name: Start TiUP Playground run: | # Start TiKV in APIV1TTL - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 > tiup-v1ttl.log & + touch tiup-v1ttl.log + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) + cat tiup-v1ttl.log # Start TiKV in APIV1 - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 > tiup-v1.log & + touch tiup-v1.log + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & grep -q "PD Endpoints:" <(tail -f tiup-v1.log) + cat tiup-v1.log # Get PD address echo "RAWKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV From f33d29b5e29acc19e19bd7f12153a3e8ac01c242 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 11:55:02 +0800 Subject: [PATCH 04/11] reduce tikv resource usage Signed-off-by: Ping Yu --- .github/config/tikv_rawkv.toml | 9 ++++++--- .github/config/tikv_txnkv.toml | 6 ++++++ .github/workflows/ci.yml | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/config/tikv_rawkv.toml b/.github/config/tikv_rawkv.toml index 5ee1bfe07e..3ba57d5eea 100644 --- a/.github/config/tikv_rawkv.toml +++ b/.github/config/tikv_rawkv.toml @@ -7,12 +7,15 @@ pd-heartbeat-tick-interval = "2s" pd-store-heartbeat-tick-interval = "5s" split-region-check-tick-interval = "1s" -[storage] -enable-ttl = true - [rocksdb] max-open-files = 10000 [raftdb] max-open-files = 10000 +[storage.block-cache] +capacity = "128MB" + +[storage] +reserve-space = "0MB" +enable-ttl = true diff --git a/.github/config/tikv_txnkv.toml b/.github/config/tikv_txnkv.toml index c083cfa31b..b3e45f9f99 100644 --- a/.github/config/tikv_txnkv.toml +++ b/.github/config/tikv_txnkv.toml @@ -12,3 +12,9 @@ max-open-files = 10000 [raftdb] max-open-files = 10000 + +[storage.block-cache] +capacity = "128MB" + +[storage] +reserve-space = "0MB" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc2927c8da..3137b2e654 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,19 +42,19 @@ jobs: - name: Install TiUP run: | curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh - /home/runner/.tiup/bin/tiup install pd:${{ matrix.tikv_version }} tikv:${{ matrix.tikv_version }} + /home/runner/.tiup/bin/tiup install playground pd:${{ matrix.tikv_version }} tikv:${{ matrix.tikv_version }} - name: Start TiUP Playground run: | # Start TiKV in APIV1TTL touch tiup-v1ttl.log /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & - grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) + timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) cat tiup-v1ttl.log # Start TiKV in APIV1 touch tiup-v1.log /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & - grep -q "PD Endpoints:" <(tail -f tiup-v1.log) + timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1.log) cat tiup-v1.log # Get PD address From fe3bfd2c8099ff2419c0f86b1b07cb2904f25f28 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 13:16:41 +0800 Subject: [PATCH 05/11] wip Signed-off-by: Ping Yu --- .github/config/tikv_rawkv.toml | 2 +- .github/config/tikv_txnkv.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/config/tikv_rawkv.toml b/.github/config/tikv_rawkv.toml index 3ba57d5eea..c339b48639 100644 --- a/.github/config/tikv_rawkv.toml +++ b/.github/config/tikv_rawkv.toml @@ -2,7 +2,7 @@ [raftstore] # set store capacity, if no set, use disk capacity. -capacity = "8G" +capacity = "6G" pd-heartbeat-tick-interval = "2s" pd-store-heartbeat-tick-interval = "5s" split-region-check-tick-interval = "1s" diff --git a/.github/config/tikv_txnkv.toml b/.github/config/tikv_txnkv.toml index b3e45f9f99..e327632e58 100644 --- a/.github/config/tikv_txnkv.toml +++ b/.github/config/tikv_txnkv.toml @@ -2,7 +2,7 @@ [raftstore] # set store capacity, if no set, use disk capacity. -capacity = "8G" +capacity = "6G" pd-heartbeat-tick-interval = "2s" pd-store-heartbeat-tick-interval = "5s" split-region-check-tick-interval = "1s" From e4965cdaf229b941d5b7fffab63e08881319b2aa Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 15:19:44 +0800 Subject: [PATCH 06/11] wait for bootstrap Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3137b2e654..41ef6feb5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,12 +50,16 @@ jobs: /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) cat tiup-v1ttl.log + echo "Wait for bootstrap" + sleep 15s # Start TiKV in APIV1 touch tiup-v1.log /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1.log) cat tiup-v1.log + echo "Wait for bootstrap" + sleep 15s # Get PD address echo "RAWKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV From 5c0d93de1f71e236433d96c304721e546d2250e0 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 15:40:09 +0800 Subject: [PATCH 07/11] print logs on error Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41ef6feb5d..0f31e63ae0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: run: | # Start TiKV in APIV1TTL touch tiup-v1ttl.log - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --tag rawkv --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) cat tiup-v1ttl.log echo "Wait for bootstrap" @@ -55,7 +55,7 @@ jobs: # Start TiKV in APIV1 touch tiup-v1.log - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --tag txnkv --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1.log) cat tiup-v1.log echo "Wait for bootstrap" @@ -67,6 +67,14 @@ jobs: - name: Run Integration Test run: mvn clean test + - name: Print TiKV logs + if: failure() + run: | + echo "RawKV TiKV logs" + cat /home/runner/.tiup/data/rawkv/tikv-0/tikv.log + + echo "TxnKV TiKV logs" + cat /home/runner/.tiup/data/txnkv/tikv-0/tikv.log - name: Upload coverage uses: codecov/codecov-action@v2 with: From 7ab3e8197530807f74435c8653c622365a06464d Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 17:01:09 +0800 Subject: [PATCH 08/11] add api v2 test suite Signed-off-by: Ping Yu --- .github/config/tikv_v2.toml | 17 ++++++++++++ .github/workflows/ci.yml | 3 ++- .github/workflows/ci_v2.yml | 52 +++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 .github/config/tikv_v2.toml create mode 100644 .github/workflows/ci_v2.yml diff --git a/.github/config/tikv_v2.toml b/.github/config/tikv_v2.toml new file mode 100644 index 0000000000..a1b5b65706 --- /dev/null +++ b/.github/config/tikv_v2.toml @@ -0,0 +1,17 @@ +# TiKV Configuration. + +[raftstore] +pd-heartbeat-tick-interval = "2s" +pd-store-heartbeat-tick-interval = "5s" +split-region-check-tick-interval = "1s" + +[rocksdb] +max-open-files = 10000 + +[raftdb] +max-open-files = 10000 + +[storage] +reserve-space = "0MB" +api-version = 2 +enable-ttl = true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f31e63ae0..81e2e63ab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tikv_version: [v6.5.3] + tikv_version: [v5.0.4] + fail-fast: false steps: - uses: actions/checkout@v2 - name: Set up JDK 8 diff --git a/.github/workflows/ci_v2.yml b/.github/workflows/ci_v2.yml new file mode 100644 index 0000000000..7729ca7660 --- /dev/null +++ b/.github/workflows/ci_v2.yml @@ -0,0 +1,52 @@ +name: CI (APIv2) + +on: + pull_request: + push: + branches: + - master + +jobs: + integration-test: + name: Integration Test - ${{ matrix.tikv_version }} + runs-on: ubuntu-latest + strategy: + matrix: + tikv_version: [v6.5.3] + fail-fast: false + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8.0' + distribution: 'adopt' + - name: Install TiUP + run: | + curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh + /home/runner/.tiup/bin/tiup install playground pd:${{ matrix.tikv_version }} tikv:${{ matrix.tikv_version }} + - name: Start TiUP Playground + run: | + # Start TiKV in APIV2 + touch tiup.log + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --tag kv --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_v2.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup.log & + timeout 300 grep -q "PD Endpoints:" <(tail -f tiup.log) + cat tiup.log + + # Get PD address + echo "RAWKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV + echo "TXNKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV + + - name: Run Integration Test + run: mvn clean test + - name: Print TiKV logs + if: failure() + run: | + echo "TiKV logs" + cat /home/runner/.tiup/data/kv/tikv-0/tikv.log + - name: Upload coverage + uses: codecov/codecov-action@v2 + with: + files: ${{ github.workspace }}/target/site/jacoco/jacoco.xml + fail_ci_if_error: true + verbose: true From cc8ec5606563e29b66038bc09b487aa3a0eacf7e Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 17:18:38 +0800 Subject: [PATCH 09/11] use different port Signed-off-by: Ping Yu --- .github/config/tikv_rawkv.toml | 4 ++++ .github/config/tikv_txnkv.toml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/config/tikv_rawkv.toml b/.github/config/tikv_rawkv.toml index c339b48639..931ad52d39 100644 --- a/.github/config/tikv_rawkv.toml +++ b/.github/config/tikv_rawkv.toml @@ -19,3 +19,7 @@ capacity = "128MB" [storage] reserve-space = "0MB" enable-ttl = true + +[server] +addr = "127.0.0.1:20160" +status-addr = "127.0.0.1:20180" \ No newline at end of file diff --git a/.github/config/tikv_txnkv.toml b/.github/config/tikv_txnkv.toml index e327632e58..016d8e6bde 100644 --- a/.github/config/tikv_txnkv.toml +++ b/.github/config/tikv_txnkv.toml @@ -18,3 +18,7 @@ capacity = "128MB" [storage] reserve-space = "0MB" + +[server] +addr = "127.0.0.1:30160" +status-addr = "127.0.0.1:30180" From 682c3c2a7aae101e016f59ccc0e29aa6a252f1d8 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 17:50:56 +0800 Subject: [PATCH 10/11] specify kv.port Signed-off-by: Ping Yu --- .github/config/tikv_rawkv.toml | 4 ---- .github/config/tikv_txnkv.toml | 4 ---- .github/workflows/ci.yml | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/config/tikv_rawkv.toml b/.github/config/tikv_rawkv.toml index 931ad52d39..c339b48639 100644 --- a/.github/config/tikv_rawkv.toml +++ b/.github/config/tikv_rawkv.toml @@ -19,7 +19,3 @@ capacity = "128MB" [storage] reserve-space = "0MB" enable-ttl = true - -[server] -addr = "127.0.0.1:20160" -status-addr = "127.0.0.1:20180" \ No newline at end of file diff --git a/.github/config/tikv_txnkv.toml b/.github/config/tikv_txnkv.toml index 016d8e6bde..e327632e58 100644 --- a/.github/config/tikv_txnkv.toml +++ b/.github/config/tikv_txnkv.toml @@ -18,7 +18,3 @@ capacity = "128MB" [storage] reserve-space = "0MB" - -[server] -addr = "127.0.0.1:30160" -status-addr = "127.0.0.1:30180" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81e2e63ab1..1c3e8d1a12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: run: | # Start TiKV in APIV1TTL touch tiup-v1ttl.log - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --tag rawkv --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --host 127.0.0.1 --tag rawkv --mode tikv-slim --kv 1 --without-monitor --kv.port 20160 --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_rawkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2379 2>&1 >> tiup-v1ttl.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) cat tiup-v1ttl.log echo "Wait for bootstrap" @@ -56,7 +56,7 @@ jobs: # Start TiKV in APIV1 touch tiup-v1.log - /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --tag txnkv --mode tikv-slim --kv 1 --without-monitor --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & + /home/runner/.tiup/bin/tiup playground ${{ matrix.tikv_version }} --host 127.0.0.1 --tag txnkv --mode tikv-slim --kv 1 --without-monitor --kv.port 30160 --kv.config /home/runner/work/client-java/client-java/.github/config/tikv_txnkv.toml --pd.config /home/runner/work/client-java/client-java/.github/config/pd.toml --pd.port 2381 2>&1 >> tiup-v1.log & timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1.log) cat tiup-v1.log echo "Wait for bootstrap" From 964c3bc5af1ccacd9aba53d4f11e288251df91df Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Tue, 3 Oct 2023 18:31:10 +0800 Subject: [PATCH 11/11] add more versions Signed-off-by: Ping Yu --- .github/workflows/ci.yml | 6 +++--- .github/workflows/ci_v2.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c3e8d1a12..6511ec63c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tikv_version: [v5.0.4] + tikv_version: [v5.0.6, v5.3.4, v5.4.3] fail-fast: false steps: - uses: actions/checkout@v2 @@ -52,7 +52,7 @@ jobs: timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1ttl.log) cat tiup-v1ttl.log echo "Wait for bootstrap" - sleep 15s + sleep 10s # Start TiKV in APIV1 touch tiup-v1.log @@ -60,7 +60,7 @@ jobs: timeout 300 grep -q "PD Endpoints:" <(tail -f tiup-v1.log) cat tiup-v1.log echo "Wait for bootstrap" - sleep 15s + sleep 10s # Get PD address echo "RAWKV_PD_ADDRESSES=127.0.0.1:2379" >> $GITHUB_ENV diff --git a/.github/workflows/ci_v2.yml b/.github/workflows/ci_v2.yml index 7729ca7660..be69782a47 100644 --- a/.github/workflows/ci_v2.yml +++ b/.github/workflows/ci_v2.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tikv_version: [v6.5.3] + tikv_version: [v6.5.3, v7.1.1, nightly] fail-fast: false steps: - uses: actions/checkout@v2