maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/store/pathinfosvc): provide listing

Browse source 
This provides an additional method in the PathInfoService trait, as
well as an RPC method on the gRPC layer to list all PathInfo objects in
a PathInfoService.

Change-Id: I7378f6bbd334bd6ac4e9be92505bd099a1c2b19a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9216
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-09-03 17:09:45 +03:00 • committed by clbot
parent e41b5ae3f0
commit da9d706e0a
9 changed files with 310 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs
View file

@ -2,11 +2,14 @@ use crate::nar::RenderError;
use crate::pathinfoservice::PathInfoService;
use crate::proto;
use std::sync::Arc;
use tokio::task;
use tokio_stream::wrappers::ReceiverStream;
use tonic::{async_trait, Request, Response, Result, Status};
use tracing::{instrument, warn};
use tracing::{debug, instrument, warn};
pub struct GRPCPathInfoServiceWrapper {
path_info_service: Arc<dyn PathInfoService>,
// FUTUREWORK: allow exposing without allowing listing
}
impl From<Arc<dyn PathInfoService>> for GRPCPathInfoServiceWrapper {
@ -19,6 +22,8 @@ impl From<Arc<dyn PathInfoService>> for GRPCPathInfoServiceWrapper {
#[async_trait]
impl proto::path_info_service_server::PathInfoService for GRPCPathInfoServiceWrapper {
type ListStream = ReceiverStream<tonic::Result<proto::PathInfo, Status>>;
#[instrument(skip(self))]
async fn get(
&self,
@ -78,6 +83,29 @@ impl proto::path_info_service_server::PathInfoService for GRPCPathInfoServiceWra
}
}
}
#[instrument(skip(self))]
async fn list(
&self,
_request: Request<proto::ListPathInfoRequest>,
) -> Result<Response<Self::ListStream>, Status> {
let (tx, rx) = tokio::sync::mpsc::channel(5);
let path_info_service = self.path_info_service.clone();
let _task = task::spawn(async move {
for e in path_info_service.list() {
let res = e.map_err(|e| Status::internal(e.to_string()));
if tx.send(res).await.is_err() {
debug!("receiver dropped");
break;
}
}
});
let receiver_stream = ReceiverStream::new(rx);
Ok(Response::new(receiver_stream))
}
}
impl From<RenderError> for tonic::Status {

4
tvix/store/src/proto/tests/grpc_pathinfoservice.rs
View file

@ -9,6 +9,7 @@ use crate::tests::utils::gen_blob_service;
use crate::tests::utils::gen_directory_service;
use crate::tests::utils::gen_pathinfo_service;
use std::sync::Arc;
use tokio_stream::wrappers::ReceiverStream;
use tonic::Request;
/// generates a GRPCPathInfoService out of blob, directory and pathinfo services.
@ -16,7 +17,8 @@ use tonic::Request;
/// We only interact with it via the PathInfo GRPC interface.
/// It uses the NonCachingNARCalculationService NARCalculationService to
/// calculate NARs.
fn gen_grpc_service() -> Arc<dyn GRPCPathInfoService> {
fn gen_grpc_service(
) -> Arc<dyn GRPCPathInfoService<ListStream = ReceiverStream<Result<PathInfo, tonic::Status>>>> {
let blob_service = gen_blob_service();
let directory_service = gen_directory_service();
Arc::new(GRPCPathInfoServiceWrapper::from(gen_pathinfo_service(