feat(tvix/store): Support listening on UNIX domain sockets
This adds support for listening on UNIX domain sockets via the tokio-listener crate. The crate will automatically determine whether to start a TCP or UNIX domain socket server based on the listen address. Unfortunately, it's not compatible with tonic right out of the box so I added some wrapper types to implement the necessary traits to make things work. We should investigate upstreaming a `tonic` option to the tokio-listener crate which implements the relevant `tonic` traits. Example: ``` $ tvix-store daemon -l /run/tvix-store.sock INFO tvix_store: tvix-store listening on /run/tvix-store.sock $ tvix-store mount -l /mnt/tvix --blob-service-addr grpc+unix:///run/tvix-store.sock --directory-service-addr grpc+unix:///run/tvix-store.sock --path-info-service-addr grpc+unix:///run/tvix-store.sock $ ls /mnt/tvix ``` Change-Id: I91c4a4b0c5a177b3b90e6c01a4e5d263130e6bdb Reviewed-on: https://cl.tvl.fyi/c/depot/+/9429 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
parent
1b3d6975ed
commit
f8746fcab0
6 changed files with 388 additions and 71 deletions
|
|
@ -17,6 +17,7 @@ use tvix_castore::proto::node::Node;
|
|||
use tvix_castore::proto::GRPCBlobServiceWrapper;
|
||||
use tvix_castore::proto::GRPCDirectoryServiceWrapper;
|
||||
use tvix_castore::proto::NamedNode;
|
||||
use tvix_store::listener::ListenerStream;
|
||||
use tvix_store::pathinfoservice;
|
||||
use tvix_store::proto::path_info_service_server::PathInfoServiceServer;
|
||||
use tvix_store::proto::GRPCPathInfoServiceWrapper;
|
||||
|
|
@ -220,7 +221,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
|
||||
info!("tvix-store listening on {}", listen_address);
|
||||
|
||||
router.serve(listen_address).await?;
|
||||
let listener = ListenerStream::bind(&listen_address).await?;
|
||||
|
||||
router.serve_with_incoming(listener).await?;
|
||||
}
|
||||
Commands::Import {
|
||||
paths,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#[cfg(feature = "fs")]
|
||||
pub mod fs;
|
||||
|
||||
pub mod listener;
|
||||
pub mod nar;
|
||||
pub mod pathinfoservice;
|
||||
pub mod proto;
|
||||
|
|
|
|||
115
tvix/store/src/listener/mod.rs
Normal file
115
tvix/store/src/listener/mod.rs
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
use std::{
|
||||
io,
|
||||
ops::{Deref, DerefMut},
|
||||
pin::Pin,
|
||||
task::{Context, Poll},
|
||||
};
|
||||
|
||||
use futures::Stream;
|
||||
use pin_project_lite::pin_project;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
use tokio_listener::{Listener, ListenerAddress};
|
||||
use tonic::transport::server::Connected;
|
||||
|
||||
/// A wrapper around a [Listener] which implements the [Stream] trait.
|
||||
/// Mainly used to bridge [tokio_listener] with [tonic].
|
||||
pub struct ListenerStream {
|
||||
inner: Listener,
|
||||
}
|
||||
|
||||
impl ListenerStream {
|
||||
/// Convert a [Listener] into a [Stream].
|
||||
pub fn new(inner: Listener) -> Self {
|
||||
Self { inner }
|
||||
}
|
||||
|
||||
/// Binds to the specified address and returns a [Stream] of connections.
|
||||
pub async fn bind(addr: &ListenerAddress) -> io::Result<Self> {
|
||||
let listener = Listener::bind(addr, &Default::default(), &Default::default()).await?;
|
||||
|
||||
Ok(Self::new(listener))
|
||||
}
|
||||
}
|
||||
|
||||
impl Stream for ListenerStream {
|
||||
type Item = io::Result<Connection>;
|
||||
|
||||
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
||||
match self.inner.poll_accept(cx) {
|
||||
Poll::Ready(Ok((connection, _))) => Poll::Ready(Some(Ok(Connection::new(connection)))),
|
||||
Poll::Ready(Err(err)) => Poll::Ready(Some(Err(err))),
|
||||
Poll::Pending => Poll::Pending,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pin_project! {
|
||||
/// A wrapper around a [tokio_listener::Connection] that implements the [Connected] trait
|
||||
/// so it is compatible with [tonic].
|
||||
pub struct Connection {
|
||||
#[pin]
|
||||
inner: tokio_listener::Connection,
|
||||
}
|
||||
}
|
||||
|
||||
impl Connection {
|
||||
fn new(inner: tokio_listener::Connection) -> Self {
|
||||
Self { inner }
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for Connection {
|
||||
type Target = tokio_listener::Connection;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.inner
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut for Connection {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.inner
|
||||
}
|
||||
}
|
||||
|
||||
impl Connected for Connection {
|
||||
type ConnectInfo = ();
|
||||
|
||||
fn connect_info(&self) -> Self::ConnectInfo {
|
||||
()
|
||||
}
|
||||
}
|
||||
|
||||
impl AsyncRead for Connection {
|
||||
fn poll_read(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut std::task::Context<'_>,
|
||||
buf: &mut tokio::io::ReadBuf<'_>,
|
||||
) -> Poll<io::Result<()>> {
|
||||
self.project().inner.poll_read(cx, buf)
|
||||
}
|
||||
}
|
||||
|
||||
impl AsyncWrite for Connection {
|
||||
fn poll_write(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut std::task::Context<'_>,
|
||||
buf: &[u8],
|
||||
) -> Poll<std::result::Result<usize, io::Error>> {
|
||||
self.project().inner.poll_write(cx, buf)
|
||||
}
|
||||
|
||||
fn poll_flush(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut std::task::Context<'_>,
|
||||
) -> Poll<std::result::Result<(), io::Error>> {
|
||||
self.project().inner.poll_flush(cx)
|
||||
}
|
||||
|
||||
fn poll_shutdown(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut std::task::Context<'_>,
|
||||
) -> Poll<std::result::Result<(), io::Error>> {
|
||||
self.project().inner.poll_shutdown(cx)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue