From 99c37cb9ff6d8f5cd8947dac48637d14de456033 Mon Sep 17 00:00:00 2001
From: Nhat Nguyen <nhat.nguyen@elastic.co>
Date: Fri, 24 Jul 2026 10:19:05 -0700
Subject: [PATCH] Fix DLM serialization

---
 .../cluster/metadata/DataStreamLifecycle.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
index e3263083328e9..b2ee6a6615366 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
@@ -382,7 +382,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().supports(ADD_SAMPLE_METHOD_DOWNSAMPLE_DLM)) {
             out.writeOptionalWriteable(downsamplingMethod);
         }
-        if (DLM_SEARCHABLE_SNAPSHOTS_FEATURE_FLAG.isEnabled() && out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)) {
+        if (out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)) {
             out.writeOptionalTimeValue(frozenAfter);
         }
     }
@@ -403,9 +403,7 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
         downsamplingMethod = in.getTransportVersion().supports(ADD_SAMPLE_METHOD_DOWNSAMPLE_DLM)
             ? in.readOptionalWriteable(DownsampleConfig.SamplingMethod::read)
             : null;
-        frozenAfter = DLM_SEARCHABLE_SNAPSHOTS_FEATURE_FLAG.isEnabled() && in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)
-            ? in.readOptionalTimeValue()
-            : null;
+        frozenAfter = in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV) ? in.readOptionalTimeValue() : null;
     }
 
     /**
@@ -789,7 +787,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().supports(ADD_SAMPLE_METHOD_DOWNSAMPLE_DLM)) {
                 ResettableValue.write(out, downsamplingMethod, StreamOutput::writeWriteable);
             }
-            if (DLM_SEARCHABLE_SNAPSHOTS_FEATURE_FLAG.isEnabled() && out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)) {
+            if (out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)) {
                 ResettableValue.write(out, frozenAfter, StreamOutput::writeTimeValue);
             }
         }
@@ -852,10 +850,9 @@ public static Template read(StreamInput in) throws IOException {
                 .supports(ADD_SAMPLE_METHOD_DOWNSAMPLE_DLM)
                     ? ResettableValue.read(in, DownsampleConfig.SamplingMethod::read)
                     : ResettableValue.undefined();
-            ResettableValue<TimeValue> frozenAfter = DLM_SEARCHABLE_SNAPSHOTS_FEATURE_FLAG.isEnabled()
-                && in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)
-                    ? ResettableValue.read(in, StreamInput::readTimeValue)
-                    : ResettableValue.undefined();
+            ResettableValue<TimeValue> frozenAfter = in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)
+                ? ResettableValue.read(in, StreamInput::readTimeValue)
+                : ResettableValue.undefined();
             return new Template(lifecycleTarget, enabled, dataRetention, downsamplingRounds, downsamplingMethod, frozenAfter);
         }