From ad43d8216ba7c2bf04ea02fa244ee72a583cd203 Mon Sep 17 00:00:00 2001
From: zwang28 <84491488@qq.com>
Date: Fri, 24 Mar 2023 10:25:19 +0800
Subject: [PATCH 1/2] chore(test): fix config for compaction test

---
 src/config/ci-compaction-test-meta.toml                | 10 +++++-----
 src/config/ci-compaction-test.toml                     |  6 +++---
 .../compaction_test/src/compaction_test_runner.rs      |  2 --
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/config/ci-compaction-test-meta.toml b/src/config/ci-compaction-test-meta.toml
index e75ce33af3e6b..7e4f6a6704c40 100644
--- a/src/config/ci-compaction-test-meta.toml
+++ b/src/config/ci-compaction-test-meta.toml
@@ -3,11 +3,7 @@ enable_compaction_deterministic = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 40
-# We set a large checkpoint frequency to prevent the embedded meta node
-# to commit new epochs to avoid bumping the hummock version during version log replay.
-checkpoint_frequency = 99999999
 
 [storage]
 shared_buffer_capacity_mb = 4096
@@ -26,4 +22,8 @@ cache_file_max_write_size_mb = 4
 sstable_size_mb = 256
 block_size_kb = 1024
 bloom_false_positive = 0.001
-data_directory = "hummock_001"
\ No newline at end of file
+data_directory = "hummock_001"
+# We set a large checkpoint frequency to prevent the embedded meta node
+# to commit new epochs to avoid bumping the hummock version during version log replay.
+checkpoint_frequency = 99999999
+barrier_interval_ms = 250
diff --git a/src/config/ci-compaction-test.toml b/src/config/ci-compaction-test.toml
index 1ab4f6b1286b3..3a13e35c03e51 100644
--- a/src/config/ci-compaction-test.toml
+++ b/src/config/ci-compaction-test.toml
@@ -3,9 +3,7 @@ enable_compaction_deterministic = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 40
-checkpoint_frequency = 10
 
 [storage]
 shared_buffer_capacity_mb = 4096
@@ -24,4 +22,6 @@ cache_file_max_write_size_mb = 4
 sstable_size_mb = 256
 block_size_kb = 1024
 bloom_false_positive = 0.001
-data_directory = "hummock_001"
\ No newline at end of file
+data_directory = "hummock_001"
+checkpoint_frequency = 10
+barrier_interval_ms = 250
diff --git a/src/tests/compaction_test/src/compaction_test_runner.rs b/src/tests/compaction_test/src/compaction_test_runner.rs
index 86e194916d0d2..88508311b54f6 100644
--- a/src/tests/compaction_test/src/compaction_test_runner.rs
+++ b/src/tests/compaction_test/src/compaction_test_runner.rs
@@ -134,8 +134,6 @@ pub async fn start_meta_node(listen_addr: String, state_store: String, config_pa
         &listen_addr,
         "--backend",
         "mem",
-        "--checkpoint-frequency",
-        &CHECKPOINT_FREQ_FOR_REPLAY.to_string(),
         "--state-store",
         &state_store,
         "--config-path",

From 10a3ffe89a2c1e774127d5b66b0d7214a7acd06a Mon Sep 17 00:00:00 2001
From: zwang28 <84491488@qq.com>
Date: Fri, 24 Mar 2023 11:05:32 +0800
Subject: [PATCH 2/2] remove --state-store for compactor node

---
 src/tests/compaction_test/src/compaction_test_runner.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/tests/compaction_test/src/compaction_test_runner.rs b/src/tests/compaction_test/src/compaction_test_runner.rs
index 88508311b54f6..1a84d4406872a 100644
--- a/src/tests/compaction_test/src/compaction_test_runner.rs
+++ b/src/tests/compaction_test/src/compaction_test_runner.rs
@@ -93,7 +93,6 @@ pub async fn compaction_test_main(
     let (compactor_thrd, compactor_shutdown_tx) = start_compactor_thread(
         opts.meta_address.clone(),
         advertise_addr.to_string(),
-        opts.state_store.clone(),
         opts.config_path.clone(),
     );
 
@@ -160,7 +159,6 @@ pub async fn start_meta_node(listen_addr: String, state_store: String, config_pa
 async fn start_compactor_node(
     meta_rpc_endpoint: String,
     advertise_addr: String,
-    state_store: String,
     config_path: String,
 ) {
     let opts = risingwave_compactor::CompactorOpts::parse_from([
@@ -171,8 +169,6 @@ async fn start_compactor_node(
         &advertise_addr,
         "--meta-address",
         &meta_rpc_endpoint,
-        "--state-store",
-        &state_store,
         "--config-path",
         &config_path,
     ]);
@@ -182,7 +178,6 @@ async fn start_compactor_node(
 pub fn start_compactor_thread(
     meta_endpoint: String,
     advertise_addr: String,
-    state_store: String,
     config_path: String,
 ) -> (JoinHandle<()>, std::sync::mpsc::Sender<()>) {
     let (tx, rx) = std::sync::mpsc::channel();
@@ -194,7 +189,7 @@ pub fn start_compactor_thread(
         runtime.block_on(async {
             tokio::spawn(async {
                 tracing::info!("Starting compactor node");
-                start_compactor_node(meta_endpoint, advertise_addr, state_store, config_path).await
+                start_compactor_node(meta_endpoint, advertise_addr, config_path).await
             });
             rx.recv().unwrap();
         });