Skip to content

Commit 9b5b5ca

Browse files
committed
[TaskCenter][4/n] Remove TaskCenter/Metadata references from Bifrost
Also, exercises `in_tc()` in some tests. Those will be swapped with `restate_core::test` in next PRs. Example of impact: ```rust let bifrost = node_env .tc .run_in_scope( "bifrost init", None, Bifrost::init_in_memory(node_env.metadata.clone()), ) .await; ``` Becomes: ```rust let bifrost = Bifrost::init_in_memory().in_tc(&node_env.tc).await; ```
1 parent d695e6f commit 9b5b5ca

File tree

15 files changed

+578
-628
lines changed

15 files changed

+578
-628
lines changed

crates/admin/src/cluster_controller/service.rs

+196-203
Large diffs are not rendered by default.

crates/bifrost/benches/append_throughput.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@
88
// the Business Source License, use of this software will be governed
99
// by the Apache License, Version 2.0.
1010

11+
mod util;
12+
1113
use std::ops::Range;
1214

1315
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
1416
use futures::stream::{FuturesOrdered, FuturesUnordered};
1517
use futures::StreamExt;
18+
use tracing::info;
19+
use tracing_subscriber::EnvFilter;
20+
1621
use restate_bifrost::{Bifrost, BifrostService};
17-
use restate_core::metadata;
1822
use restate_rocksdb::{DbName, RocksDbManager};
1923
use restate_types::config::{
2024
BifrostOptionsBuilder, CommonOptionsBuilder, ConfigurationBuilder, LocalLogletOptionsBuilder,
2125
};
2226
use restate_types::live::Live;
2327
use restate_types::logs::LogId;
24-
use tracing::info;
25-
use tracing_subscriber::EnvFilter;
26-
mod util;
2728

2829
async fn append_records_multi_log(bifrost: Bifrost, log_id_range: Range<u32>, count_per_log: u64) {
2930
let mut appends = FuturesUnordered::new();
@@ -105,9 +106,7 @@ fn write_throughput_local_loglet(c: &mut Criterion) {
105106
));
106107

107108
let bifrost = tc.block_on(async {
108-
let metadata = metadata();
109-
let bifrost_svc = BifrostService::new(restate_core::task_center(), metadata)
110-
.enable_local_loglet(&Live::from_value(config));
109+
let bifrost_svc = BifrostService::new().enable_local_loglet(&Live::from_value(config));
111110
let bifrost = bifrost_svc.handle();
112111

113112
// start bifrost service in the background

crates/bifrost/src/appender.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
use std::sync::Arc;
1212
use std::time::Instant;
1313

14-
use restate_types::storage::StorageEncode;
1514
use tracing::{debug, info, instrument, warn};
1615

16+
use restate_core::Metadata;
1717
use restate_types::config::Configuration;
1818
use restate_types::live::Live;
1919
use restate_types::logs::metadata::SegmentIndex;
2020
use restate_types::logs::{LogId, Lsn, Record};
2121
use restate_types::retries::RetryIter;
22+
use restate_types::storage::StorageEncode;
2223

2324
use crate::bifrost::BifrostInner;
2425
use crate::loglet::AppendError;
@@ -167,8 +168,9 @@ impl Appender {
167168
);
168169
return Ok(loglet);
169170
} else {
171+
let log_version = Metadata::with_current(|m| m.logs_version());
170172
debug!(
171-
log_version = %bifrost_inner.metadata.logs_version(),
173+
log_version = %log_version,
172174
"Still waiting for sealing to complete. Elapsed={:?}",
173175
start.elapsed(),
174176
);

0 commit comments

Comments
 (0)