Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(storage_host): update storage initialization logic

Steven Enamakelf8c539e7252d
diff --git a/crates/openhuman-core/src/modules/storage_host.rs b/crates/openhuman-core/src/modules/storage_host.rs
index 9ce51c97ec..ff6d32b3cd 100644
--- a/crates/openhuman-core/src/modules/storage_host.rs
+++ b/crates/openhuman-core/src/modules/storage_host.rs
@@ -50,9 +50,7 @@ use tinystoragedrivers::BlobReader;
use tinystoragedrivers_bus::{
BlobKeyRequest, BlobStreamHead, PutBlobStreamRequest, StorageFailure, StorageKind,
};
-use tinystoragedrivers_busproxy::HostFailure;
-
-use tinystoragedrivers_client::{Admission, StorageServer};
+use tinystoragedrivers_busproxy::{Admission, HostFailure, StorageServer};
use self::endpoint::HostEndpoint;
use super::storage_grants::{authorize, declared, filter_reply, Object, Plan, StorageGrant};
@@ -416,7 +414,7 @@ impl StorageHost {
// server takes it; the default keeps the queues in the scope's documents.
let storage = match (&grant.queues, &grant.queue_backend) {
(Some(_), Some(backend)) if *backend != tinystoragedrivers::QueueConfig::Storage => {
- tinystoragedrivers::open_queues(backend, storage, None)
+ tinystoragedrivers::open_queues(backend, storage, &scope)
.await
.map_err(|error| {
tracing::warn!(
@@ -431,29 +429,30 @@ impl StorageHost {
}
_ => storage,
};
- let mut server = StorageServer::new(storage.clone());
+ let mut storage = storage;
if let Some(manifest) = &grant.queues {
- // The queue port of a document backend keeps its messages in the
- // storage layer's own collections; declare them on this scope
- // before the server takes its first `Queues` call.
- tinystoragedrivers::queue::ensure(&storage)
- .await
- .map_err(|error| {
+ for declaration in manifest.queues() {
+ storage
+ .queues()
+ .ensure_queue(&declaration.name, &declaration.spec())
+ .await
+ .map_err(|error| {
tracing::warn!(
target: "openhuman::storage_host",
module,
+ queue = %declaration.name,
%error,
- "[storage_host] could not declare the queue collections"
+ "[storage_host] could not declare a granted queue"
);
BindError::Backend(StorageKind::Backend)
- })?;
+ })?;
+ }
tracing::debug!(
target: "openhuman::storage_host",
module,
- queues = manifest.queues.len(),
+ queues = manifest.queues().len(),
"[storage_host] serving the granted queue manifest"
);
- server = server.with_queue_manifest(Arc::clone(manifest));
}
if !grant.secret_prefixes.is_empty() {
// A key-provider failure is retryable, so refuse the bind rather
@@ -466,8 +465,21 @@ impl StorageHost {
);
BindError::Backend(StorageKind::Backend)
})?;
- server = server.with_secrets(Arc::new(DocumentSecrets::new(&storage, keys)));
+ let secrets = Arc::new(DocumentSecrets::from_parts(
+ Arc::clone(storage.documents()),
+ scope.clone(),
+ keys,
+ ));
+ storage = tinystoragedrivers::Storage::new(
+ Arc::clone(storage.documents()),
+ Arc::clone(storage.streams()),
+ Arc::clone(storage.kv()),
+ Arc::clone(storage.blobs()),
+ Arc::clone(storage.queues()),
+ secrets,
+ );
}
+ let server = StorageServer::new(storage);
let binding = Arc::new(Binding {
backend,
grant,