From f327b2155702207040fb28d4373119e0688c9266 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 5 Dec 2023 01:14:36 -0800 Subject: [PATCH] handle crashes with ILM expiry changes (#18590) --- cmd/site-replication.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/site-replication.go b/cmd/site-replication.go index 921037682..c6341b0d9 100644 --- a/cmd/site-replication.go +++ b/cmd/site-replication.go @@ -3724,6 +3724,10 @@ func (c *SiteReplicationSys) SiteReplicationMetaInfo(ctx context.Context, objAPI } if meta.lifecycleConfig != nil && meta.lifecycleConfig.HasExpiry() { + var updatedAt time.Time + if meta.lifecycleConfig.ExpiryUpdatedAt != nil { + updatedAt = *meta.lifecycleConfig.ExpiryUpdatedAt + } for _, rule := range meta.lifecycleConfig.Rules { if !rule.Expiration.IsNull() || !rule.NoncurrentVersionExpiration.IsNull() { // copy the non transition details of the rule @@ -3731,7 +3735,7 @@ func (c *SiteReplicationSys) SiteReplicationMetaInfo(ctx context.Context, objAPI if err != nil { return info, errSRBackendIssue(err) } - allRules[rule.ID] = madmin.ILMExpiryRule{ILMRule: string(ruleData), Bucket: bucket, UpdatedAt: *(meta.lifecycleConfig.ExpiryUpdatedAt)} + allRules[rule.ID] = madmin.ILMExpiryRule{ILMRule: string(ruleData), Bucket: bucket, UpdatedAt: updatedAt} } } }