Skip to content

Commit 1c6b246

Browse files
authored
chore(test): fix config for compaction test (risingwavelabs#8752)
1 parent e951cde commit 1c6b246

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

src/config/ci-compaction-test-meta.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ enable_compaction_deterministic = true
33
max_heartbeat_interval_secs = 600
44

55
[streaming]
6-
barrier_interval_ms = 250
76
in_flight_barrier_nums = 40
8-
# We set a large checkpoint frequency to prevent the embedded meta node
9-
# to commit new epochs to avoid bumping the hummock version during version log replay.
10-
checkpoint_frequency = 99999999
117

128
[storage]
139
shared_buffer_capacity_mb = 4096
@@ -26,4 +22,8 @@ cache_file_max_write_size_mb = 4
2622
sstable_size_mb = 256
2723
block_size_kb = 1024
2824
bloom_false_positive = 0.001
29-
data_directory = "hummock_001"
25+
data_directory = "hummock_001"
26+
# We set a large checkpoint frequency to prevent the embedded meta node
27+
# to commit new epochs to avoid bumping the hummock version during version log replay.
28+
checkpoint_frequency = 99999999
29+
barrier_interval_ms = 250

src/config/ci-compaction-test.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ enable_compaction_deterministic = true
33
max_heartbeat_interval_secs = 600
44

55
[streaming]
6-
barrier_interval_ms = 250
76
in_flight_barrier_nums = 40
8-
checkpoint_frequency = 10
97

108
[storage]
119
shared_buffer_capacity_mb = 4096
@@ -24,4 +22,6 @@ cache_file_max_write_size_mb = 4
2422
sstable_size_mb = 256
2523
block_size_kb = 1024
2624
bloom_false_positive = 0.001
27-
data_directory = "hummock_001"
25+
data_directory = "hummock_001"
26+
checkpoint_frequency = 10
27+
barrier_interval_ms = 250

src/tests/compaction_test/src/compaction_test_runner.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ pub async fn compaction_test_main(
9393
let (compactor_thrd, compactor_shutdown_tx) = start_compactor_thread(
9494
opts.meta_address.clone(),
9595
advertise_addr.to_string(),
96-
opts.state_store.clone(),
9796
opts.config_path.clone(),
9897
);
9998

@@ -134,8 +133,6 @@ pub async fn start_meta_node(listen_addr: String, state_store: String, config_pa
134133
&listen_addr,
135134
"--backend",
136135
"mem",
137-
"--checkpoint-frequency",
138-
&CHECKPOINT_FREQ_FOR_REPLAY.to_string(),
139136
"--state-store",
140137
&state_store,
141138
"--config-path",
@@ -162,7 +159,6 @@ pub async fn start_meta_node(listen_addr: String, state_store: String, config_pa
162159
async fn start_compactor_node(
163160
meta_rpc_endpoint: String,
164161
advertise_addr: String,
165-
state_store: String,
166162
config_path: String,
167163
) {
168164
let opts = risingwave_compactor::CompactorOpts::parse_from([
@@ -173,8 +169,6 @@ async fn start_compactor_node(
173169
&advertise_addr,
174170
"--meta-address",
175171
&meta_rpc_endpoint,
176-
"--state-store",
177-
&state_store,
178172
"--config-path",
179173
&config_path,
180174
]);
@@ -184,7 +178,6 @@ async fn start_compactor_node(
184178
pub fn start_compactor_thread(
185179
meta_endpoint: String,
186180
advertise_addr: String,
187-
state_store: String,
188181
config_path: String,
189182
) -> (JoinHandle<()>, std::sync::mpsc::Sender<()>) {
190183
let (tx, rx) = std::sync::mpsc::channel();
@@ -196,7 +189,7 @@ pub fn start_compactor_thread(
196189
runtime.block_on(async {
197190
tokio::spawn(async {
198191
tracing::info!("Starting compactor node");
199-
start_compactor_node(meta_endpoint, advertise_addr, state_store, config_path).await
192+
start_compactor_node(meta_endpoint, advertise_addr, config_path).await
200193
});
201194
rx.recv().unwrap();
202195
});

0 commit comments

Comments
 (0)