Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

refactor: remove old pod crates

Browse Source
This commit is contained in:
Hare
2026-06-29 04:44:55 +09:00
parent 0fd99075f0
commit 17a9488a4a
56 changed files with 415 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/yoi/Cargo.toml
-1
View File
@@ -15,7 +15,6 @@ client = { workspace = true }
memory = { workspace = true }
manifest = { workspace = true }
worker = { workspace = true }
pod-store = { workspace = true }
session-store = { workspace = true }
session-analytics = { workspace = true }
ticket = { workspace = true }
crates/yoi/src/session_cli.rs
+11 -9
View File
@@ -4,8 +4,8 @@ use std::path::PathBuf;
use std::time::{Duration, SystemTime};
use manifest::paths;
use pod_store::{FsWorkerStore, WorkerMetadataStore};
use session_store::{FsStore, SessionId, Store};
use session_store::{FsWorkerStore, WorkerMetadataStore};
use crate::worker_cleanup_cli::parse_duration;
@@ -203,8 +203,8 @@ pub fn run_prune_with_roots(
));
}
let session_store = FsStore::new(data_dir.join("sessions")).map_err(to_error)?;
let pod_store = FsWorkerStore::new(data_dir.join("pods")).map_err(to_error)?;
let referenced_sessions = referenced_sessions(&pod_store)?;
let worker_metadata_store = FsWorkerStore::new(data_dir.join("workers")).map_err(to_error)?;
let referenced_sessions = referenced_sessions(&worker_metadata_store)?;
let cutoff = options
.older_than
.map(|older_than| {
@@ -315,10 +315,12 @@ pub fn run_prune_with_roots(
})
}
fn referenced_sessions(pod_store: &FsWorkerStore) -> Result<BTreeSet<SessionId>, SessionCliError> {
fn referenced_sessions(
worker_metadata_store: &FsWorkerStore,
) -> Result<BTreeSet<SessionId>, SessionCliError> {
let mut sessions = BTreeSet::new();
for name in pod_store.list_names().map_err(to_error)? {
let metadata = pod_store
for name in worker_metadata_store.list_names().map_err(to_error)? {
let metadata = worker_metadata_store
.read_by_name(&name)
.map_err(to_error)?
.ok_or_else(|| {
@@ -358,8 +360,8 @@ pub fn help_text() -> &'static str {
#[cfg(test)]
mod tests {
use super::*;
use pod_store::{WorkerActiveSegmentRef, WorkerMetadata};
use session_store::{Store, new_segment_id, new_session_id};
use session_store::{WorkerActiveSegmentRef, WorkerMetadata};
use std::io::Write;
#[test]
@@ -441,7 +443,7 @@ mod tests {
let tmp = tempfile::TempDir::new().unwrap();
let data_dir = tmp.path().join("data");
let session_store = FsStore::new(data_dir.join("sessions")).unwrap();
let pod_store = FsWorkerStore::new(data_dir.join("pods")).unwrap();
let worker_metadata_store = FsWorkerStore::new(data_dir.join("workers")).unwrap();
let referenced_session = new_session_id();
let referenced_segment = new_segment_id();
let orphan_session = new_session_id();
@@ -452,7 +454,7 @@ mod tests {
session_store
.create_segment(orphan_session, orphan_segment, &[])
.unwrap();
pod_store
worker_metadata_store
.write(&WorkerMetadata::new(
"agent",
Some(WorkerActiveSegmentRef::active_segment(
crates/yoi/src/worker_cleanup_cli.rs
+28 -13
View File
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
use std::time::{Duration, SystemTime};
use manifest::paths;
use pod_store::{FsWorkerStore, WorkerMetadata, WorkerMetadataStore, validate_worker_name};
use session_store::{FsWorkerStore, WorkerMetadata, WorkerMetadataStore, validate_worker_name};
const MAX_REPORT_ITEMS: usize = 50;
@@ -234,7 +234,7 @@ async fn run_delete(
data_dir: PathBuf,
runtime_dir: PathBuf,
) -> Result<WorkerCleanupCliOutput, WorkerCleanupCliError> {
let store = FsWorkerStore::new(data_dir.join("pods")).map_err(to_error)?;
let store = FsWorkerStore::new(data_dir.join("workers")).map_err(to_error)?;
let metadata = store.read_by_name(&options.name).map_err(to_error)?;
let Some(metadata) = metadata else {
return Ok(WorkerCleanupCliOutput {
@@ -290,7 +290,7 @@ async fn run_prune(
data_dir: PathBuf,
runtime_dir: PathBuf,
) -> Result<WorkerCleanupCliOutput, WorkerCleanupCliError> {
let store = FsWorkerStore::new(data_dir.join("pods")).map_err(to_error)?;
let store = FsWorkerStore::new(data_dir.join("workers")).map_err(to_error)?;
let names = store.list_names().map_err(to_error)?;
let cutoff = SystemTime::now()
.checked_sub(options.older_than)
@@ -498,7 +498,7 @@ fn prune_help_text() -> &'static str {
#[cfg(test)]
mod tests {
use super::*;
use pod_store::WorkerActiveSegmentRef;
use session_store::WorkerActiveSegmentRef;
use session_store::{Store, new_segment_id, new_session_id};
fn string_args(args: &[&str]) -> Vec<String> {
@@ -543,14 +543,14 @@ mod tests {
let tmp = tempfile::TempDir::new().unwrap();
let data_dir = tmp.path().join("data");
let runtime_dir = tmp.path().join("run");
let pod_store = FsWorkerStore::new(data_dir.join("pods")).unwrap();
let worker_metadata_store = FsWorkerStore::new(data_dir.join("workers")).unwrap();
let session_store = session_store::FsStore::new(data_dir.join("sessions")).unwrap();
let session_id = new_session_id();
let segment_id = new_segment_id();
session_store
.create_segment(session_id, segment_id, &[])
.unwrap();
pod_store
worker_metadata_store
.write(&WorkerMetadata::new(
"agent",
Some(WorkerActiveSegmentRef::active_segment(
@@ -573,7 +573,12 @@ mod tests {
assert_eq!(output.status, WorkerCleanupCliStatus::Success);
assert!(output.stdout.contains("deleted: worker metadata"));
assert!(pod_store.read_by_name("agent").unwrap().is_none());
assert!(
worker_metadata_store
.read_by_name("agent")
.unwrap()
.is_none()
);
assert!(session_store.exists(session_id, segment_id).unwrap());
}
@@ -582,8 +587,8 @@ mod tests {
let tmp = tempfile::TempDir::new().unwrap();
let data_dir = tmp.path().join("data");
let runtime_dir = tmp.path().join("run");
let pod_store = FsWorkerStore::new(data_dir.join("pods")).unwrap();
pod_store
let worker_metadata_store = FsWorkerStore::new(data_dir.join("workers")).unwrap();
worker_metadata_store
.write(&WorkerMetadata::new("agent", None))
.unwrap();
@@ -601,7 +606,12 @@ mod tests {
assert_eq!(output.status, WorkerCleanupCliStatus::Success);
assert!(output.stdout.contains("mode: dry-run"));
assert!(pod_store.read_by_name("agent").unwrap().is_some());
assert!(
worker_metadata_store
.read_by_name("agent")
.unwrap()
.is_some()
);
}
#[cfg(unix)]
@@ -612,8 +622,8 @@ mod tests {
let tmp = tempfile::TempDir::new().unwrap();
let data_dir = tmp.path().join("data");
let runtime_dir = tmp.path().join("run");
let pod_store = FsWorkerStore::new(data_dir.join("pods")).unwrap();
pod_store
let worker_metadata_store = FsWorkerStore::new(data_dir.join("workers")).unwrap();
worker_metadata_store
.write(&WorkerMetadata::new("agent", None))
.unwrap();
std::fs::create_dir_all(runtime_dir.join("agent")).unwrap();
@@ -634,6 +644,11 @@ mod tests {
drop(listener);
assert_eq!(output.status, WorkerCleanupCliStatus::Failure);
assert!(output.stdout.contains("status: refused"));
assert!(pod_store.read_by_name("agent").unwrap().is_some());
assert!(
worker_metadata_store
.read_by_name("agent")
.unwrap()
.is_some()
);
}
}