From 44ab2ffee31672ca2f28f6bc6d878076ba0fa38c Mon Sep 17 00:00:00 2001
From: Chris Lu <chrislusf@users.noreply.github.com>
Date: Thu, 16 Apr 2026 01:35:12 -0700
Subject: [PATCH] fix(plugin): remove Min Volume Age field from vacuum plugin
 worker config (#9095)

* fix(plugin): remove Min Volume Age field from vacuum plugin worker config

The min_volume_age_seconds setting is not needed as a user-configurable
field in the plugin worker form. The detection logic continues to use
the hardcoded default from NewDefaultConfig().

* fix(plugin): disable volume age filtering in plugin worker detection

Set MinVolumeAgeSeconds to 0 in deriveVacuumConfig so the plugin worker
does not filter out volumes by age during detection.

* fix(plugin): remove all volume age filtering from plugin worker detection

Remove age-related fields from detection trace messages, activity
reports, and per-volume diagnostics. The plugin worker now only
filters by garbage threshold.
---
 weed/plugin/worker/vacuum_handler.go      | 55 +++--------------------
 weed/plugin/worker/vacuum_handler_test.go |  8 +---
 2 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/weed/plugin/worker/vacuum_handler.go b/weed/plugin/worker/vacuum_handler.go
index 56cb22e73..3ffa95170 100644
--- a/weed/plugin/worker/vacuum_handler.go
+++ b/weed/plugin/worker/vacuum_handler.go
@@ -169,15 +169,6 @@ func (h *VacuumHandler) Descriptor() *plugin_pb.JobTypeDescriptor {
 							MinValue:    &plugin_pb.ConfigValue{Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: 0}},
 							MaxValue:    &plugin_pb.ConfigValue{Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: 1}},
 						},
-						{
-							Name:        "min_volume_age_seconds",
-							Label:       "Min Volume Age (s)",
-							Description: "Only detect volumes older than this age.",
-							FieldType:   plugin_pb.ConfigFieldType_CONFIG_FIELD_TYPE_INT64,
-							Widget:      plugin_pb.ConfigWidget_CONFIG_WIDGET_NUMBER,
-							Required:    true,
-							MinValue:    &plugin_pb.ConfigValue{Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: 0}},
-						},
 					},
 				},
 			},
@@ -185,9 +176,6 @@ func (h *VacuumHandler) Descriptor() *plugin_pb.JobTypeDescriptor {
 				"garbage_threshold": {
 					Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: 0.3},
 				},
-				"min_volume_age_seconds": {
-					Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: 24 * 60 * 60},
-				},
 			},
 		},
 		AdminRuntimeDefaults: &plugin_pb.AdminRuntimeDefaults{
@@ -206,9 +194,6 @@ func (h *VacuumHandler) Descriptor() *plugin_pb.JobTypeDescriptor {
 			"garbage_threshold": {
 				Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: 0.3},
 			},
-			"min_volume_age_seconds": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: 24 * 60 * 60},
-			},
 		},
 	}
 }
@@ -297,48 +282,34 @@ func emitVacuumDetectionDecisionTrace(
 		return nil
 	}
 
-	minVolumeAge := time.Duration(workerConfig.MinVolumeAgeSeconds) * time.Second
 	totalVolumes := len(metrics)
 
-	debugCount := 0
 	skippedDueToGarbage := 0
-	skippedDueToAge := 0
 	for _, metric := range metrics {
 		if metric == nil {
 			continue
 		}
-		if metric.GarbageRatio >= workerConfig.GarbageThreshold && metric.Age >= minVolumeAge {
+		if metric.GarbageRatio >= workerConfig.GarbageThreshold {
 			continue
 		}
-		if debugCount < 5 {
-			if metric.GarbageRatio < workerConfig.GarbageThreshold {
-				skippedDueToGarbage++
-			}
-			if metric.Age < minVolumeAge {
-				skippedDueToAge++
-			}
-		}
-		debugCount++
+		skippedDueToGarbage++
 	}
 
 	summaryMessage := ""
 	summaryStage := "decision_summary"
 	if len(results) == 0 {
 		summaryMessage = fmt.Sprintf(
-			"VACUUM: No tasks created for %d volumes. Threshold=%.2f%%, MinAge=%s. Skipped: %d (garbage<threshold), %d (age<minimum)",
+			"VACUUM: No tasks created for %d volumes. Threshold=%.2f%%. Skipped: %d (garbage<threshold)",
 			totalVolumes,
 			workerConfig.GarbageThreshold*100,
-			minVolumeAge,
 			skippedDueToGarbage,
-			skippedDueToAge,
 		)
 	} else {
 		summaryMessage = fmt.Sprintf(
-			"VACUUM: Created %d task(s) from %d volumes. Threshold=%.2f%%, MinAge=%s",
+			"VACUUM: Created %d task(s) from %d volumes. Threshold=%.2f%%",
 			len(results),
 			totalVolumes,
 			workerConfig.GarbageThreshold*100,
-			minVolumeAge,
 		)
 	}
 
@@ -352,15 +323,9 @@ func emitVacuumDetectionDecisionTrace(
 		"garbage_threshold_percent": {
 			Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: workerConfig.GarbageThreshold * 100},
 		},
-		"min_volume_age_seconds": {
-			Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(workerConfig.MinVolumeAgeSeconds)},
-		},
 		"skipped_garbage": {
 			Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(skippedDueToGarbage)},
 		},
-		"skipped_age": {
-			Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(skippedDueToAge)},
-		},
 	})); err != nil {
 		return err
 	}
@@ -375,12 +340,10 @@ func emitVacuumDetectionDecisionTrace(
 			continue
 		}
 		message := fmt.Sprintf(
-			"VACUUM: Volume %d: garbage=%.2f%% (need ≥%.2f%%), age=%s (need ≥%s)",
+			"VACUUM: Volume %d: garbage=%.2f%% (need ≥%.2f%%)",
 			metric.VolumeID,
 			metric.GarbageRatio*100,
 			workerConfig.GarbageThreshold*100,
-			metric.Age.Truncate(time.Minute),
-			minVolumeAge.Truncate(time.Minute),
 		)
 		if err := sender.SendActivity(BuildDetectorActivity("decision_volume", message, map[string]*plugin_pb.ConfigValue{
 			"volume_id": {
@@ -392,12 +355,6 @@ func emitVacuumDetectionDecisionTrace(
 			"required_garbage_percent": {
 				Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: workerConfig.GarbageThreshold * 100},
 			},
-			"age_seconds": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(metric.Age.Seconds())},
-			},
-			"required_age_seconds": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(minVolumeAge.Seconds())},
-			},
 		})); err != nil {
 			return err
 		}
@@ -532,7 +489,7 @@ func (h *VacuumHandler) collectVolumeMetrics(
 func deriveVacuumConfig(values map[string]*plugin_pb.ConfigValue) *vacuumtask.Config {
 	config := vacuumtask.NewDefaultConfig()
 	config.GarbageThreshold = readDoubleConfig(values, "garbage_threshold", config.GarbageThreshold)
-	config.MinVolumeAgeSeconds = int(readInt64Config(values, "min_volume_age_seconds", int64(config.MinVolumeAgeSeconds)))
+	config.MinVolumeAgeSeconds = 0 // plugin worker does not filter by volume age
 	return config
 }
 
diff --git a/weed/plugin/worker/vacuum_handler_test.go b/weed/plugin/worker/vacuum_handler_test.go
index 2cecb977f..97a0d275f 100644
--- a/weed/plugin/worker/vacuum_handler_test.go
+++ b/weed/plugin/worker/vacuum_handler_test.go
@@ -84,18 +84,12 @@ func TestDeriveVacuumConfigAllowsZeroValues(t *testing.T) {
 		"garbage_threshold": {
 			Kind: &plugin_pb.ConfigValue_DoubleValue{DoubleValue: 0},
 		},
-		"min_volume_age_seconds": {
-			Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: 0},
-		},
 	}
 
 	cfg := deriveVacuumConfig(values)
 	if cfg.GarbageThreshold != 0 {
 		t.Fatalf("expected garbage_threshold 0, got %v", cfg.GarbageThreshold)
 	}
-	if cfg.MinVolumeAgeSeconds != 0 {
-		t.Fatalf("expected min_volume_age_seconds 0, got %d", cfg.MinVolumeAgeSeconds)
-	}
 }
 
 func TestMasterAddressCandidates(t *testing.T) {
@@ -174,7 +168,7 @@ func TestEmitVacuumDetectionDecisionTraceNoTasks(t *testing.T) {
 	sender := &recordingDetectionSender{}
 	config := vacuumtask.NewDefaultConfig()
 	config.GarbageThreshold = 0.3
-	config.MinVolumeAgeSeconds = int((24 * time.Hour).Seconds())
+	config.MinVolumeAgeSeconds = 0
 
 	metrics := []*workertypes.VolumeHealthMetrics{
 		{