built-store-paths: finish pbh code rearrangement
This commit is contained in:
Cole Mickens
parent
0f476bd775
commit
3a001d12e5
|
|
@ -337,122 +337,13 @@ async fn main_cli() -> Result<()> {
|
|||
let dnixd_uds_socket_path = dnixd_uds_socket_dir.join(DETERMINATE_NIXD_SOCKET_NAME);
|
||||
|
||||
if dnixd_uds_socket_path.exists() {
|
||||
let stream = TokioIo::new(UnixStream::connect(dnixd_uds_socket_path).await?);
|
||||
|
||||
// TODO(colemickens): loop retry/reconnect/etc
|
||||
|
||||
let executor = TokioExecutor::new();
|
||||
let (mut sender, conn): (hyper::client::conn::http2::SendRequest<Body>, _) =
|
||||
hyper::client::conn::http2::handshake(executor, stream)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// NOTE(colemickens): for now we just drop the joinhandle and let it keep running
|
||||
let _join_handle = tokio::task::spawn(async move {
|
||||
if let Err(err) = conn.await {
|
||||
tracing::error!("Connection failed: {:?}", err);
|
||||
}
|
||||
});
|
||||
|
||||
let request = http::Request::builder()
|
||||
.method(http::Method::GET)
|
||||
.uri("http://localhost/built-paths")
|
||||
.body(axum::body::Body::empty())?;
|
||||
|
||||
let response = sender.send_request(request).await?;
|
||||
let mut data = response.into_data_stream();
|
||||
|
||||
while let Some(event_str) = data.next().await {
|
||||
let event_str = event_str.unwrap(); // TODO(colemickens): error handle
|
||||
|
||||
let event_str = match event_str.strip_prefix("data: ".as_bytes()) {
|
||||
Some(s) => s,
|
||||
None => {
|
||||
tracing::debug!("built-paths subscription: ignoring non-data frame");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
let event: BuiltPathResponseEventV1 = serde_json::from_slice(&event_str)?;
|
||||
|
||||
// TODO(colemickens): error handling:::
|
||||
let store_paths = event
|
||||
.outputs
|
||||
.iter()
|
||||
.map(|path| {
|
||||
state
|
||||
.store
|
||||
.follow_store_path(path)
|
||||
.map_err(|_| anyhow!("ahhhhh"))
|
||||
})
|
||||
.collect::<Result<Vec<_>>>()?;
|
||||
|
||||
tracing::debug!("about to enqueue paths: {:?}", store_paths);
|
||||
crate::api::enqueue_paths(&state, store_paths).await?;
|
||||
}
|
||||
crate::pbh::subscribe_uds_post_build_hook(&dnixd_uds_socket_path, state.clone()).await?;
|
||||
} else {
|
||||
// TODO: split into own function(s)
|
||||
|
||||
/* Write the post-build hook script. Note that the shell script
|
||||
* ignores errors, to avoid the Nix build from failing. */
|
||||
let post_build_hook_script = {
|
||||
let mut file = NamedTempFile::with_prefix("magic-nix-cache-build-hook-")
|
||||
.with_context(|| "Creating a temporary file for the post-build hook")?;
|
||||
file.write_all(
|
||||
format!(
|
||||
// NOTE(cole-h): We want to exit 0 even if the hook failed, otherwise it'll fail the
|
||||
// build itself
|
||||
"#! /bin/sh\nRUST_LOG=trace RUST_BACKTRACE=full {} --server {} || :\n",
|
||||
std::env::current_exe()
|
||||
.with_context(|| "Getting the path of magic-nix-cache")?
|
||||
.display(),
|
||||
args.listen
|
||||
)
|
||||
.as_bytes(),
|
||||
)
|
||||
.with_context(|| "Writing the post-build hook")?;
|
||||
let path = file
|
||||
.keep()
|
||||
.with_context(|| "Keeping the post-build hook")?
|
||||
.1;
|
||||
|
||||
fs::set_permissions(&path, fs::Permissions::from_mode(0o755))
|
||||
.with_context(|| "Setting permissions on the post-build hook")?;
|
||||
|
||||
/* Copy the script to the Nix store so we know for sure that
|
||||
* it's accessible to the Nix daemon, which might have a
|
||||
* different /tmp from us. */
|
||||
let res = Command::new("nix")
|
||||
.args([
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"store",
|
||||
"add-path",
|
||||
&path.display().to_string(),
|
||||
])
|
||||
.output()
|
||||
.await?;
|
||||
if res.status.success() {
|
||||
tokio::fs::remove_file(path).await?;
|
||||
PathBuf::from(String::from_utf8_lossy(&res.stdout).trim())
|
||||
} else {
|
||||
path
|
||||
}
|
||||
};
|
||||
|
||||
/* Update nix.conf. */
|
||||
nix_conf
|
||||
.write_all(
|
||||
format!(
|
||||
"fallback = true\npost-build-hook = {}\n",
|
||||
post_build_hook_script.display()
|
||||
)
|
||||
.as_bytes(),
|
||||
)
|
||||
.with_context(|| "Writing to nix.conf")?;
|
||||
|
||||
drop(nix_conf);
|
||||
crate::pbh::setup_legacy_post_build_hook(&args.listen, &mut nix_conf).await?;
|
||||
}
|
||||
|
||||
drop(nix_conf);
|
||||
|
||||
let app = Router::new()
|
||||
.route("/", get(root))
|
||||
.merge(api::get_router())
|
||||
|
|
@ -529,7 +420,7 @@ async fn main_cli() -> Result<()> {
|
|||
#[tokio::main]
|
||||
async fn main() -> Result<()> {
|
||||
match std::env::var("OUT_PATHS") {
|
||||
Ok(out_paths) => pbh::post_build_hook(&out_paths).await,
|
||||
Ok(out_paths) => pbh::handle_legacy_post_build_hook(&out_paths).await,
|
||||
Err(_) => main_cli().await,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,151 @@
|
|||
use std::io::Write as _;
|
||||
use std::net::SocketAddr;
|
||||
use std::os::unix::fs::PermissionsExt as _;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use anyhow::anyhow;
|
||||
use anyhow::Context as _;
|
||||
use anyhow::Result;
|
||||
use axum::body::Body;
|
||||
use clap::Parser;
|
||||
use futures::StreamExt as _;
|
||||
use http_body_util::BodyExt as _;
|
||||
use hyper_util::rt::TokioExecutor;
|
||||
use hyper_util::rt::TokioIo;
|
||||
use tempfile::NamedTempFile;
|
||||
use tokio::net::UnixStream;
|
||||
use tokio::process::Command;
|
||||
|
||||
pub async fn post_build_hook(out_paths: &str) -> Result<()> {
|
||||
use crate::BuiltPathResponseEventV1;
|
||||
use crate::State;
|
||||
|
||||
pub async fn subscribe_uds_post_build_hook(
|
||||
dnixd_uds_socket_path: &Path,
|
||||
state: State,
|
||||
) -> Result<()> {
|
||||
let stream = TokioIo::new(UnixStream::connect(dnixd_uds_socket_path).await?);
|
||||
|
||||
// TODO(colemickens): loop retry/reconnect/etc
|
||||
|
||||
let executor = TokioExecutor::new();
|
||||
let (mut sender, conn): (hyper::client::conn::http2::SendRequest<Body>, _) =
|
||||
hyper::client::conn::http2::handshake(executor, stream)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// NOTE(colemickens): for now we just drop the joinhandle and let it keep running
|
||||
let _join_handle = tokio::task::spawn(async move {
|
||||
if let Err(err) = conn.await {
|
||||
tracing::error!("Connection failed: {:?}", err);
|
||||
}
|
||||
});
|
||||
|
||||
let request = http::Request::builder()
|
||||
.method(http::Method::GET)
|
||||
.uri("http://localhost/built-paths")
|
||||
.body(axum::body::Body::empty())?;
|
||||
|
||||
let response = sender.send_request(request).await?;
|
||||
let mut data = response.into_data_stream();
|
||||
|
||||
while let Some(event_str) = data.next().await {
|
||||
let event_str = event_str.unwrap(); // TODO(colemickens): error handle
|
||||
|
||||
let event_str = match event_str.strip_prefix("data: ".as_bytes()) {
|
||||
Some(s) => s,
|
||||
None => {
|
||||
tracing::debug!("built-paths subscription: ignoring non-data frame");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
let event: BuiltPathResponseEventV1 = serde_json::from_slice(&event_str)?;
|
||||
|
||||
// TODO(colemickens): error handling:::
|
||||
let store_paths = event
|
||||
.outputs
|
||||
.iter()
|
||||
.map(|path| {
|
||||
state
|
||||
.store
|
||||
.follow_store_path(path)
|
||||
.map_err(|_| anyhow!("ahhhhh"))
|
||||
})
|
||||
.collect::<Result<Vec<_>>>()?;
|
||||
|
||||
tracing::debug!("about to enqueue paths: {:?}", store_paths);
|
||||
crate::api::enqueue_paths(&state, store_paths).await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn setup_legacy_post_build_hook(
|
||||
listen: &SocketAddr,
|
||||
nix_conf: &mut std::fs::File,
|
||||
) -> Result<()> {
|
||||
/* Write the post-build hook script. Note that the shell script
|
||||
* ignores errors, to avoid the Nix build from failing. */
|
||||
let post_build_hook_script = {
|
||||
let mut file = NamedTempFile::with_prefix("magic-nix-cache-build-hook-")
|
||||
.with_context(|| "Creating a temporary file for the post-build hook")?;
|
||||
file.write_all(
|
||||
format!(
|
||||
// NOTE(cole-h): We want to exit 0 even if the hook failed, otherwise it'll fail the
|
||||
// build itself
|
||||
"#! /bin/sh\nRUST_LOG=trace RUST_BACKTRACE=full {} --server {} || :\n",
|
||||
std::env::current_exe()
|
||||
.with_context(|| "Getting the path of magic-nix-cache")?
|
||||
.display(),
|
||||
listen
|
||||
)
|
||||
.as_bytes(),
|
||||
)
|
||||
.with_context(|| "Writing the post-build hook")?;
|
||||
let path = file
|
||||
.keep()
|
||||
.with_context(|| "Keeping the post-build hook")?
|
||||
.1;
|
||||
|
||||
std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o755))
|
||||
.with_context(|| "Setting permissions on the post-build hook")?;
|
||||
|
||||
/* Copy the script to the Nix store so we know for sure that
|
||||
* it's accessible to the Nix daemon, which might have a
|
||||
* different /tmp from us. */
|
||||
let res = Command::new("nix")
|
||||
.args([
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"store",
|
||||
"add-path",
|
||||
&path.display().to_string(),
|
||||
])
|
||||
.output()
|
||||
.await?;
|
||||
if res.status.success() {
|
||||
tokio::fs::remove_file(path).await?;
|
||||
PathBuf::from(String::from_utf8_lossy(&res.stdout).trim())
|
||||
} else {
|
||||
path
|
||||
}
|
||||
};
|
||||
|
||||
/* Update nix.conf. */
|
||||
nix_conf
|
||||
.write_all(
|
||||
format!(
|
||||
"fallback = true\npost-build-hook = {}\n",
|
||||
post_build_hook_script.display()
|
||||
)
|
||||
.as_bytes(),
|
||||
)
|
||||
.with_context(|| "Writing to nix.conf")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn handle_legacy_post_build_hook(out_paths: &str) -> Result<()> {
|
||||
#[derive(Parser, Debug)]
|
||||
struct Args {
|
||||
/// `magic-nix-cache` daemon to connect to.
|
||||
|
|
|
|||
Loading…
Reference in a new issue