The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(storage): update storage and lease document handling
Steven Enamakel0e3bab52f7b9
diff --git a/crates/openhuman-core/src/modules/storage_grant_schemas.rs b/crates/openhuman-core/src/modules/storage_grant_schemas.rsindex 1b174b5384..55050b9173 100644--- a/crates/openhuman-core/src/modules/storage_grant_schemas.rs+++ b/crates/openhuman-core/src/modules/storage_grant_schemas.rs@@ -90,7 +90,7 @@ const ROWS: &[Row] = &[#[cfg(feature = "inbound-queues")]Row {module: tinyeventqueues::MODULE_ID,- owner: tinyeventqueues_bus::storage::OWNER,+ owner: "teq",secrets: &[],queues: Some(crate::inbound::queue_grant),},@@ -116,10 +116,16 @@ pub(super) async fn migrate_imported(ctx: &crate::core::runtime::DispatchCtx, moreturn;}};- if let Err(error) = crate::storage::boot::remigrate_owner(&backend, &scope, owner).await {+ let result = async {+ let storage = backend.for_scope(&scope)?;+ crate::storage::boot::prepare_scope(&storage).await+ }+ .await;+ if let Err(error) = result {tracing::warn!(module = module_id,%error,+ owner,"[storage_grant] could not migrate the imported legacy records; retried at the next import");}diff --git a/crates/openhuman-core/src/modules/storage_grants.rs b/crates/openhuman-core/src/modules/storage_grants.rsindex f27cb7e0f0..5bc9813c80 100644--- a/crates/openhuman-core/src/modules/storage_grants.rs+++ b/crates/openhuman-core/src/modules/storage_grants.rs@@ -295,7 +295,7 @@ pub(crate) fn authorize(Object::Streams => streams(grant, selector, request),Object::Blobs => blobs(grant, selector, request),Object::Secrets => secrets(grant, selector, request),- Object::Queues => queues(selector, request),+ Object::Queues => queues(grant, selector, request),Object::Kv => Err(Denied::Object),}?;Ok(match plan {diff --git a/crates/openhuman-core/src/modules/storage_host.rs b/crates/openhuman-core/src/modules/storage_host.rsindex 8ad61c6556..8aebd4db9f 100644--- a/crates/openhuman-core/src/modules/storage_host.rs+++ b/crates/openhuman-core/src/modules/storage_host.rs@@ -473,7 +473,8 @@ impl StorageHost {})?;let secrets = Arc::new(DocumentSecrets::from_parts(Arc::clone(storage.documents()),- scope.clone(),+ tinystoragedrivers_types::Scope::new(scope.as_str())+ .map_err(|_| BindError::Backend(StorageKind::Backend))?,keys,));storage = tinystoragedrivers::Storage::new(diff --git a/crates/openhuman-core/src/profiles/lease.rs b/crates/openhuman-core/src/profiles/lease.rsindex 00b0f07bcd..f03553276e 100644--- a/crates/openhuman-core/src/profiles/lease.rs+++ b/crates/openhuman-core/src/profiles/lease.rs@@ -83,16 +83,9 @@ pub(crate) fn store_for() -> Result<Arc<dyn LeaseStore>, String> {match backend {Some(backend) => {- log::info!(- "[profiles][lease] cluster leases on driver={} node={node} ttl_ms={}",- backend.driver(),- ttl.as_millis()- );+ log::info!("[profiles][lease] cluster leases on configured storage node={node} ttl_ms={}", ttl.as_millis());if !crate::storage::backend_has_cross_process_cas(backend.as_ref()) {- log::warn!(- "[profiles][lease] driver={} does not claim SharedAcrossProcesses: its leases exclude only this process",- backend.driver()- );+ log::warn!("[profiles][lease] configured storage does not claim SharedAcrossProcesses: its leases exclude only this process");}DocumentLeases::cluster(backend.as_ref(), node, endpoint, ttl).map(|leases| Arc::new(leases) as Arc<dyn LeaseStore>)diff --git a/crates/openhuman-core/src/storage/lease_documents.rs b/crates/openhuman-core/src/storage/lease_documents.rsindex b6ce236794..b20c45dc95 100644--- a/crates/openhuman-core/src/storage/lease_documents.rs+++ b/crates/openhuman-core/src/storage/lease_documents.rs@@ -11,7 +11,9 @@ use serde::{Deserialize, Serialize};use serde_json::Value;use tinystoragedrivers::{CollectionSpec, Precondition, Scope, StorageBackend};use tinystoragedrivers_api::DocumentStore;-use tinystoragedrivers_types::{Filter, Key, Version, Versioned, WriteCondition, WriteOptions};+use tinystoragedrivers_types::{+ Filter, Key, Scope as DriverScope, Version, Versioned, WriteCondition, WriteOptions,+};use super::lease::{validate_key, LeaseError, LeaseGrant, LeaseRecord, LeaseStore, CLUSTER_SCOPE, LEASE_COLLECTION,@@ -176,14 +178,14 @@ impl DocumentLeases {}fn id(key: &str) -> Result<String, StorageError> {- Ok(Key::of([LEASE_OWNER, key])?.as_str().to_owned())+ Ok(Key::new(format!("{LEASE_OWNER}/{key}"))?.as_str().to_owned())}async fn read(&self, key: &str) -> Result<Option<Versioned<LeaseBody>>, StorageError> {let Some(found) = self.docs.get(LEASE_COLLECTION, &Self::id(key)?).await? else {return Ok(None);};- let body = serde_json::from_value(found.doc).map_err(|error| {+ let body = serde_json::from_value(found.doc.clone()).map_err(|error| {StorageError::backend("lease record is malformed").with_source(error)})?;Ok(Some(found.map(|_| body)))@@ -400,7 +402,8 @@ impl LeaseStore for DocumentLeases {fn write_condition(&self, key: &str, node: &str, epoch: u64) -> Option<WriteCondition> {let scope = self.scope.clone()?;- let id = Key::of([LEASE_OWNER, key]).ok()?;+ let id = Key::new(format!("{LEASE_OWNER}/{key}")).ok()?;+ let scope = DriverScope::new(scope.as_str()).ok()?;WriteCondition::new(scope,LEASE_COLLECTION,