Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions kv-service/client-rs/tests/local_cluster_e2e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ redis_command_timeout_ms = 1000
[metrics]
enabled = false
listen = "127.0.0.1:0"
[gc]
enabled = true
interval_seconds = 1
grace_seconds = 0
max_tasks_per_run = 100
task_lease_seconds = 5
[cluster]
node_id = "{node}"
grpc_advertise = "127.0.0.1:{port}"
Expand Down Expand Up @@ -336,7 +342,10 @@ async fn assert_four_way_placement(cluster: &Cluster, client: &mut KvClient) {
.await
.expect("lookup object")
.expect("object metadata must exist after put");
assert!(lookup.descriptor.is_striped, "object must use striped placement");
assert!(
lookup.descriptor.is_striped,
"object must use striped placement"
);
assert_eq!(lookup.descriptor.stripe_count, 4, "expected four stripes");
let locations: HashSet<(String, u32)> = lookup
.placement
Expand Down Expand Up @@ -416,7 +425,7 @@ async fn two_node_restart_recovers_shared_metadata_and_stripes() {
}

#[tokio::test]
async fn two_node_distributed_delete_removes_all_stripe_files() {
async fn two_node_distributed_delete_retires_then_reclaims_all_stripe_files() {
let cluster = Cluster::start("distributed_delete").await;
let payload = striped_payload();
let mut client = connect(&cluster, "node-a").await;
Expand All @@ -429,16 +438,22 @@ async fn two_node_distributed_delete_removes_all_stripe_files() {
.delete(TEST_NAMESPACE, TEST_OBJECT_KEY)
.await
.expect("distributed delete"),
"delete must remove the existing object",
"delete must retire the existing object",
);
for node in ["node-a", "node-b"] {
for device in 0..2 {
assert_eq!(
cluster.file_count(node, device),
0,
"distributed delete must remove stripe from {node}/nvme{device}",
);

let deadline = Instant::now() + Duration::from_secs(10);
while Instant::now() < deadline {
if ["node-a", "node-b"]
.into_iter()
.all(|node| (0..2).all(|device| cluster.file_count(node, device) == 0))
{
cluster.log("distributed_delete_reclaimed");
return;
}
tokio::time::sleep(Duration::from_millis(100)).await;
}
cluster.log("distributed_delete_verified");
panic!(
"distributed GC did not reclaim all stripe files before deadline: {}",
cluster.diagnostics()
);
}
7 changes: 7 additions & 0 deletions kv-service/configs/server-nvmeof.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ redis_key_prefix = "contextstore:metadata:"
redis_connect_timeout_ms = 1000
redis_command_timeout_ms = 1000

[gc]
enabled = true
interval_seconds = 300
grace_seconds = 600
max_tasks_per_run = 1000
task_lease_seconds = 300

[metrics]
enabled = true
listen = "0.0.0.0:9090"
Expand Down
7 changes: 7 additions & 0 deletions kv-service/configs/server-test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ redis_key_prefix = "contextstore:metadata:"
redis_connect_timeout_ms = 1000
redis_command_timeout_ms = 1000

[gc]
enabled = true
interval_seconds = 300
grace_seconds = 600
max_tasks_per_run = 1000
task_lease_seconds = 300

[metrics]
enabled = false # Set to true after building with --features metrics
listen = "0.0.0.0:9090"
10 changes: 10 additions & 0 deletions kv-service/configs/server.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ redis_key_prefix = "contextstore:metadata:"
redis_connect_timeout_ms = 1000
redis_command_timeout_ms = 1000

[gc]
# Retire metadata immediately and reclaim superseded physical generations after
# the grace period. TTL remains access-triggered; this worker does not scan for
# expired metadata that has not been accessed.
enabled = true
interval_seconds = 300
grace_seconds = 600
max_tasks_per_run = 1000
task_lease_seconds = 300

[metrics]
# Prometheus HTTP exporter (requires --features metrics at build time).
# Endpoints: GET http://<listen>/metrics, GET http://<listen>/health
Expand Down
Loading
Loading