diff --git a/modules/nats/internal/keeper/keeper_test.go b/modules/nats/internal/keeper/keeper_test.go index 176994029..33593fc00 100644 --- a/modules/nats/internal/keeper/keeper_test.go +++ b/modules/nats/internal/keeper/keeper_test.go @@ -363,6 +363,9 @@ func TestEachTemplateIsPlannedUnderTheModulesNames(t *testing.T) { {name: "objects", entry: entry("files", catalogue.StorageObjectStore, catalogue.TemplateObjects, map[string]string{"max-mib": "32"}), objects: "object-store mesh-knowledge_files {32 MiB, age 0, history 0, new, size 0}", binding: "objects mesh-knowledge_files"}, + {name: "objects kept 7 days", entry: entry("outputs", catalogue.StorageObjectStore, catalogue.TemplateObjects, map[string]string{"max-mib": "1024", "max-age-days": "7"}), + objects: "object-store mesh-knowledge_outputs {1024 MiB, age 604800, history 0, new, size 0}", + binding: "objects mesh-knowledge_outputs"}, {name: "ledger", entry: ledger, objects: "stream mesh-knowledge_records [mesh.ledger.mesh-knowledge.records.history.>] {16 MiB, age 0, history 0, new, size 262144}; " + "key-value mesh-knowledge_records_state {64 MiB, age 0, history 1, new, size 262144}; " + diff --git a/modules/nats/internal/keeper/plan.go b/modules/nats/internal/keeper/plan.go index 12883bdfc..43320154a 100644 --- a/modules/nats/internal/keeper/plan.go +++ b/modules/nats/internal/keeper/plan.go @@ -211,8 +211,13 @@ func PlanOf(module string, e catalogue.BusStateEntry) (Plan, error) { if capMiB <= 0 { return Plan{}, fmt.Errorf("objects %q gives no %s, which the template objects requires", e.Name, catalogue.OptionCapMiB) } + // An object is kept for good unless the objects name max-age-days (design 47 H2 H-A-434): the store's max age. + age, err := opts.int(catalogue.OptionAgeDays, 0) + if err != nil { + return Plan{}, err + } p.Binding.ObjectStore = name - p.Objects = []Object{{Kind: KindObjects, Name: name, Settings: Settings{MaxBytes: capMiB * MiB, Discard: DiscardNew}}} + p.Objects = []Object{{Kind: KindObjects, Name: name, Settings: Settings{MaxBytes: capMiB * MiB, MaxAgeSeconds: days(age), Discard: DiscardNew}}} case e.Storage == catalogue.StorageLedger && e.Template == catalogue.TemplateLedger: history, err := logSettings(opts) if err != nil {