mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nar-bridge): Use store composition

Browse source
This commit is contained in:
sinavir 2024-07-21 11:51:46 +02:00 committed by sinavir
parent c000e67769
commit 71c10cd7d6
3 changed files with 64 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tvix/nar-bridge/src/bin/nar-bridge.rs
View file

@ -17,6 +17,12 @@ struct Cli {
#[arg(long, env, default_value = "grpc+http://[::1]:8000")]
path_info_service_addr: String,
/// URL to a PathInfoService that's considered "remote".
/// If set, the other one is considered "local", and a "cache" for the
/// "remote" one.
#[arg(long, env)]
remote_path_info_service_addr: Option<String>,
/// The priority to announce at the `nix-cache-info` endpoint.
/// A lower number means it's *more preferred.
#[arg(long, env, default_value_t = 39)]
@ -48,12 +54,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
builder.build()?
};
// initialize stores
let (blob_service, directory_service, path_info_service, _nar_calculation_service) =
tvix_store::utils::construct_services(
let (blob_service, directory_service, path_info_service, _) =
tvix_store::utils::initialize_stores(
cli.blob_service_addr,
cli.directory_service_addr,
cli.path_info_service_addr,
cli.remote_path_info_service_addr,
)
.await?;

35
tvix/store/src/bin/tvix-store.rs
View file

@ -208,39 +208,14 @@ async fn run_cli(cli: Cli) -> Result<(), Box<dyn std::error::Error + Send + Sync
path_info_service_addr,
remote_path_info_service_addr,
} => {
// initialize stores
let mut configs = tvix_store::utils::addrs_to_configs(
let (blob_service, directory_service, path_info_service, nar_calculation_service) =
tvix_store::utils::initialize_stores(
blob_service_addr,
directory_service_addr,
path_info_service_addr,
)?;
// if remote_path_info_service_addr has been specified,
// update path_info_service to point to a cache combining the two.
if let Some(addr) = remote_path_info_service_addr {
use tvix_store::composition::{with_registry, DeserializeWithRegistry, REG};
use tvix_store::pathinfoservice::CachePathInfoServiceConfig;
let remote_url = url::Url::parse(&addr)?;
let remote_config = with_registry(&REG, || remote_url.try_into())?;
let local = configs.pathinfoservices.insert(
"default".into(),
DeserializeWithRegistry(Box::new(CachePathInfoServiceConfig {
near: "local".into(),
far: "remote".into(),
})),
);
configs
.pathinfoservices
.insert("local".into(), local.unwrap());
configs
.pathinfoservices
.insert("remote".into(), remote_config);
}
let (blob_service, directory_service, path_info_service, nar_calculation_service) =
tvix_store::utils::construct_services_from_configs(configs).await?;
remote_path_info_service_addr,
)
.await?;
let mut server = Server::builder().layer(
ServiceBuilder::new()

48
tvix/store/src/utils.rs
View file

@ -29,6 +29,54 @@ pub struct CompositionConfigs {
>,
}
pub async fn initialize_stores(
blob_service_addr: impl AsRef<str>,
directory_service_addr: impl AsRef<str>,
path_info_service_addr: impl AsRef<str>,
remote_path_info_service_addr: Option<impl AsRef<str>>,
) -> Result<
(
Arc<dyn BlobService>,
Arc<dyn DirectoryService>,
Arc<dyn PathInfoService>,
Box<dyn NarCalculationService>,
),
Box<dyn std::error::Error + Send + Sync>,
> {
// initialize stores
let mut configs = crate::utils::addrs_to_configs(
blob_service_addr,
directory_service_addr,
path_info_service_addr,
)?;
// if remote_path_info_service_addr has been specified,
// update path_info_service to point to a cache combining the two.
if let Some(addr) = remote_path_info_service_addr {
use crate::composition::{with_registry, DeserializeWithRegistry, REG};
use crate::pathinfoservice::CachePathInfoServiceConfig;
let remote_url = url::Url::parse(addr.as_ref())?;
let remote_config = with_registry(&REG, || remote_url.try_into())?;
let local = configs.pathinfoservices.insert(
"default".into(),
DeserializeWithRegistry(Box::new(CachePathInfoServiceConfig {
near: "local".into(),
far: "remote".into(),
})),
);
configs
.pathinfoservices
.insert("local".into(), local.unwrap());
configs
.pathinfoservices
.insert("remote".into(), remote_config);
}
Ok(crate::utils::construct_services_from_configs(configs).await?)
}
pub fn addrs_to_configs(
blob_service_addr: impl AsRef<str>,
directory_service_addr: impl AsRef<str>,