From 15dfc0d3f159f14054ac0f81ec0fcf4e0a53e6cf Mon Sep 17 00:00:00 2001 From: Little-Wallace Date: Wed, 31 Jan 2024 11:54:02 +0800 Subject: [PATCH 1/2] remove delete range runner test Signed-off-by: Little-Wallace --- risedev.yml | 5 ----- src/config/ci-delete-range-test.toml | 8 -------- src/tests/compaction_test/Makefile.toml | 9 --------- src/tests/compaction_test/src/bin/delete_range.rs | 1 + 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/config/ci-delete-range-test.toml diff --git a/risedev.yml b/risedev.yml index 93c7c0c1e90d0..69b0c23b05dd3 100644 --- a/risedev.yml +++ b/risedev.yml @@ -862,11 +862,6 @@ profile: - use: etcd - use: minio - ci-delete-range-test: - config-path: src/config/ci-delete-range-test.toml - steps: - - use: minio - ci-iceberg-test: config-path: src/config/ci-iceberg-test.toml steps: diff --git a/src/config/ci-delete-range-test.toml b/src/config/ci-delete-range-test.toml deleted file mode 100644 index 33313ca092c4d..0000000000000 --- a/src/config/ci-delete-range-test.toml +++ /dev/null @@ -1,8 +0,0 @@ -[meta] -vacuum_interval_sec = 10 - -[server] -telemetry_enabled = false - -[system] -max_concurrent_creating_streaming_jobs = 0 \ No newline at end of file diff --git a/src/tests/compaction_test/Makefile.toml b/src/tests/compaction_test/Makefile.toml index 2b1c0405edbfd..2ca5332975c17 100644 --- a/src/tests/compaction_test/Makefile.toml +++ b/src/tests/compaction_test/Makefile.toml @@ -7,12 +7,3 @@ script = """ set -e cargo run --bin compaction-test --profile "${RISINGWAVE_BUILD_PROFILE}" -- "$@" """ - -[tasks.delete-range-test] -category = "RiseDev - Test" -description = "Run hummock compaction delete-range for test" -script = """ -#!/usr/bin/env bash -set -e -cargo run --bin delete-range-test --profile "${RISINGWAVE_BUILD_PROFILE}" -- "$@" -""" diff --git a/src/tests/compaction_test/src/bin/delete_range.rs b/src/tests/compaction_test/src/bin/delete_range.rs index 5950a4111f71e..f154314fb5c8a 100644 --- a/src/tests/compaction_test/src/bin/delete_range.rs +++ b/src/tests/compaction_test/src/bin/delete_range.rs @@ -16,6 +16,7 @@ #[cfg_attr(coverage, coverage(off))] fn main() { + // Since we decide to record watermark in every state-table to replace delete-range, this test is not need again. We keep it because we may need delete-range in some day for other features. use clap::Parser; let opts = risingwave_compaction_test::CompactionTestOpts::parse(); From ad5ac7b9dcccf07ecdb2da4b039f7f22a2192a92 Mon Sep 17 00:00:00 2001 From: Little-Wallace Date: Wed, 31 Jan 2024 13:04:22 +0800 Subject: [PATCH 2/2] remove test from scripts Signed-off-by: Little-Wallace --- ci/scripts/cron-e2e-test.sh | 1 - ci/scripts/pr.env.sh | 4 +--- ci/scripts/run-e2e-test.sh | 16 ---------------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/ci/scripts/cron-e2e-test.sh b/ci/scripts/cron-e2e-test.sh index 52c7a6faa366c..434fc6dea2985 100755 --- a/ci/scripts/cron-e2e-test.sh +++ b/ci/scripts/cron-e2e-test.sh @@ -6,5 +6,4 @@ set -euo pipefail source ci/scripts/common.sh export RUN_COMPACTION=0; export RUN_META_BACKUP=1; -export RUN_DELETE_RANGE=1; source ci/scripts/run-e2e-test.sh diff --git a/ci/scripts/pr.env.sh b/ci/scripts/pr.env.sh index dff62c33383a2..84fe372d5d574 100755 --- a/ci/scripts/pr.env.sh +++ b/ci/scripts/pr.env.sh @@ -6,6 +6,4 @@ set -euo pipefail # Don't run e2e compaction test in PR build export RUN_COMPACTION=0; # Don't run meta store backup/recovery test -export RUN_META_BACKUP=0; -# Don't run delete-range random test -export RUN_DELETE_RANGE=0; \ No newline at end of file +export RUN_META_BACKUP=0; \ No newline at end of file diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh index 86eae7a146f5f..95bf4fc679add 100755 --- a/ci/scripts/run-e2e-test.sh +++ b/ci/scripts/run-e2e-test.sh @@ -133,22 +133,6 @@ RUST_BACKTRACE=1 target/debug/risingwave_e2e_extended_mode_test --host 127.0.0.1 echo "--- Kill cluster" cluster_stop -if [[ "$RUN_DELETE_RANGE" -eq "1" ]]; then - echo "--- e2e, ci-delete-range-test" - cargo make clean-data - RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ - cargo make ci-start ci-delete-range-test - download-and-decompress-artifact delete-range-test-"$profile" target/debug/ - mv target/debug/delete-range-test-"$profile" target/debug/delete-range-test - chmod +x ./target/debug/delete-range-test - - config_path=".risingwave/config/risingwave.toml" - ./target/debug/delete-range-test --ci-mode --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 --config-path "${config_path}" - - echo "--- Kill cluster" - cluster_stop -fi - if [[ "$RUN_COMPACTION" -eq "1" ]]; then echo "--- e2e, ci-compaction-test, nexmark_q7" RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \