Skip to content

Commit

Permalink
chore(test): fix config for compaction test (#8752)
Browse files Browse the repository at this point in the history
  • Loading branch information
zwang28 committed Mar 24, 2023
1 parent e951cde commit 1c6b246
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
10 changes: 5 additions & 5 deletions src/config/ci-compaction-test-meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
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
6 changes: 3 additions & 3 deletions src/config/ci-compaction-test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
data_directory = "hummock_001"
checkpoint_frequency = 10
barrier_interval_ms = 250
9 changes: 1 addition & 8 deletions src/tests/compaction_test/src/compaction_test_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
);

Expand Down Expand Up @@ -134,8 +133,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",
Expand All @@ -162,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([
Expand All @@ -173,8 +169,6 @@ async fn start_compactor_node(
&advertise_addr,
"--meta-address",
&meta_rpc_endpoint,
"--state-store",
&state_store,
"--config-path",
&config_path,
]);
Expand All @@ -184,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();
Expand All @@ -196,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();
});
Expand Down

0 comments on commit 1c6b246

Please sign in to comment.