Wip on tests

Author: emmanuel-keller

.github/workflows/ci.yml

@@ -52,8 +52,13 @@ jobs:
 
   integration-test:
     name: integration test
+    strategy:
+      fail-fast: false
+      matrix:
+        case: ["integration-test-txn", "integration-test-raw"]
     env:
       CARGO_INCREMENTAL: 0
+      TIKV_VERSION: v8.5.1
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -69,14 +74,22 @@ jobs:
       - name: start tiup playground
         run: |
           # use latest stable version
-          ~/.tiup/bin/tiup install tikv pd
-          ~/.tiup/bin/tiup playground --mode tikv-slim --kv 3 --without-monitor --kv.config config/tikv.toml --pd.config config/pd.toml &
+          ~/.tiup/bin/tiup install tikv:${{ env.TIKV_VERSION }} pd:${{ env.TIKV_VERSION }}
+          ~/.tiup/bin/tiup playground ${{ env.TIKV_VERSION }} --mode tikv-slim --kv 3 --tag cluster --without-monitor --kv.config config/tikv.toml --pd.config config/pd.toml &
           while :; do
             echo "waiting cluster to be ready"
             [[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
             sleep 1
           done
       - name: Install latest nextest release
         uses: taiki-e/install-action@nextest
-      - name: integration test
-        run: MULTI_REGION=1 make integration-test
+      - name: Integration test
+        run: MULTI_REGION=1 make ${{ matrix.case }}
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cluster-logs
+          path: |
+            ~/.tiup/data/cluster/tikv*/*.log
+            ~/.tiup/data/cluster/pd*/*.log

Makefile

@@ -1,13 +1,17 @@
 export RUSTFLAGS=-Dwarnings
 
-.PHONY: default check unit-test integration-tests test doc docker-pd docker-kv docker all
+.PHONY: default check unit-test generate integration-tests integration-tests-txn integration-tests-raw test doc docker-pd docker-kv docker all
 
 export PD_ADDRS     ?= 127.0.0.1:2379
 export MULTI_REGION ?= 1
 
 ALL_FEATURES := integration-tests
 
-INTEGRATION_TEST_ARGS := --features "integration-tests"
+NEXTEST_ARGS := --config-file $(shell pwd)/config/nextest.toml -P ci
+
+INTEGRATION_TEST_ARGS := --features "integration-tests" --test-threads 1
+
+RUN_INTEGRATION_TEST := cargo nextest run ${NEXTEST_ARGS} --all ${INTEGRATION_TEST_ARGS}
 
 default: check
 
@@ -20,12 +24,15 @@ check: generate
 	cargo clippy --all-targets --features "${ALL_FEATURES}" -- -D clippy::all
 
 unit-test: generate
-	cargo nextest run --all --no-default-features
+	cargo nextest run ${NEXTEST_ARGS} --all --no-default-features
+
+integration-test: integration-test-txn integration-test-raw
+
+integration-test-txn: generate
+	$(RUN_INTEGRATION_TEST) txn_
 
-integration-test: generate
-	cargo test txn_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
-	cargo test raw_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
-	cargo test misc_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
+integration-test-raw: generate
+	$(RUN_INTEGRATION_TEST) raw_
 
 test: unit-test integration-test
 

config/nextest.toml

@@ -0,0 +1,8 @@
+[profile.ci]
+retries = 0
+fail-fast = false
+slow-timeout = { period = "60s", terminate-after = 3 } # Timeout 3m.
+failure-output = "final"
+
+[profile.ci.junit]
+path = "junit.xml"

config/tikv.toml

@@ -1,14 +1,14 @@
 [coprocessor]
 region-max-keys = 10
-region-split-keys = 7
+region-split-keys = 150
 batch-split-limit = 100
 
 [raftstore]
 region-split-check-diff = "1B"
 pd-heartbeat-tick-interval = "2s"
 pd-store-heartbeat-tick-interval = "5s"
 split-region-check-tick-interval = "1s"
-raft-entry-max-size = "1MB"
+raft-entry-max-size = "256KiB"
 
 [rocksdb]
 max-open-files = 10000

src/lib.rs

@@ -100,6 +100,8 @@
 
 pub mod backoff;
 #[doc(hidden)]
+pub mod proto; // export `proto` to enable user customized codec
+#[doc(hidden)]
 pub mod raw;
 pub mod request;
 #[doc(hidden)]
@@ -110,7 +112,6 @@ mod compat;
 mod config;
 mod kv;
 mod pd;
-mod proto;
 mod region;
 mod region_cache;
 mod stats;

src/proto.rs

@@ -2,6 +2,7 @@
 
 #![allow(clippy::large_enum_variant)]
 #![allow(clippy::enum_variant_names)]
+#![allow(clippy::doc_lazy_continuation)]
 
 pub use protos::*;
 

tests/failpoint_tests.rs

@@ -374,7 +374,7 @@ async fn must_rollbacked(client: &TransactionClient, keys: HashSet<Vec<u8>>) {
 
 async fn count_locks(client: &TransactionClient) -> Result<usize> {
     let ts = client.current_timestamp().await.unwrap();
-    let locks = client.scan_locks(&ts, .., 1024).await?;
+    let locks = client.scan_locks(&ts, vec![].., 1024).await?;
     // De-duplicated as `scan_locks` will return duplicated locks due to retry on region changes.
     let locks_set: HashSet<Vec<u8>> = HashSet::from_iter(locks.into_iter().map(|l| l.key));
     Ok(locks_set.len())

tests/integration_tests.rs

@@ -12,14 +12,15 @@
 //! requirements on the region boundaries.
 
 mod common;
+use std::collections::HashMap;
+use std::iter;
+
 use common::*;
 use futures::prelude::*;
 use rand::seq::IteratorRandom;
 use rand::thread_rng;
 use rand::Rng;
 use serial_test::serial;
-use std::collections::HashMap;
-use std::iter;
 use tikv_client::backoff::DEFAULT_REGION_BACKOFF;
 use tikv_client::transaction::HeartbeatOption;
 use tikv_client::transaction::Mutation;
@@ -207,7 +208,11 @@ async fn txn_split_batch() -> Result<()> {
     let val_len = 15000;
 
     let values: Vec<_> = (0..keys_count)
-        .map(|_| (0..val_len).map(|_| rng.gen::<u8>()).collect::<Vec<_>>())
+        .map(|_| {
+            let mut buf = vec![0; val_len];
+            rng.fill(&mut buf[..]);
+            buf
+        })
         .collect();
 
     for (i, value) in values.iter().enumerate() {