Skip to content

Fix DLM serialization #154989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dnhatn wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −14
Draft

Fix DLM serialization #154989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().supports(ADD_SAMPLE_METHOD_DOWNSAMPLE_DLM)) {
out.writeOptionalWriteable(downsamplingMethod);
}
if (out.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV)
|| (DLM_SEARCHABLE_SNAPSHOTS_FEATURE_FLAG.isEnabled() && out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV))) {
if (out.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV) || out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)) {
out.writeOptionalTimeValue(frozenAfter);
}
}
Expand All @@ -405,8 +404,11 @@ 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.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV)) ? in.readOptionalTimeValue() : null;
if (in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV) || in.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV)) {
frozenAfter = in.readOptionalTimeValue();
} else {
frozenAfter = null;
}
}

/**
Expand Down Expand Up @@ -790,8 +792,8 @@ 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)
|| out.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV))) {
if (out.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)
|| out.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV)) {
ResettableValue.write(out, frozenAfter, StreamOutput::writeTimeValue);
}
}
Expand Down Expand Up @@ -854,9 +856,8 @@ 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)
|| in.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV))
ResettableValue<TimeValue> frozenAfter = in.getTransportVersion().supports(SEARCHABLE_SNAPSHOTS_DLM_TV)
|| in.getTransportVersion().supports(DLM_FROZEN_TIER_GA_TV)
? ResettableValue.read(in, StreamInput::readTimeValue)
: ResettableValue.undefined();
return new Template(lifecycleTarget, enabled, dataRetention, downsamplingRounds, downsamplingMethod, frozenAfter);
Expand Down
6 changes: 1 addition & 5 deletions ...r/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ public static ElasticsearchCluster mixedVersionCluster(Path csvDataPath, boolean
.configFile("ingest-geoip/GeoLite2-City.mmdb", Resource.fromClasspath("GeoLite2-City.mmdb"))
.configFile("ingest-geoip/GeoLite2-Country.mmdb", Resource.fromClasspath("GeoLite2-Country.mmdb"))
.configFile("ingest-geoip/GeoLite2-ASN.mmdb", Resource.fromClasspath("GeoLite2-ASN.mmdb"))
.setting("ingest.geoip.downloader.enabled", "false")
// DLM frozen tier serialization is gated on both a feature flag and a transport version, so nodes in a mixed cluster can
// disagree on the wire format when their build types differ (snapshot vs release). Disable the flag on every node so
// serialization is consistent regardless of build type. See https://github.com/elastic/elasticsearch/issues/153679.
.systemProperty("es.dlm_searchable_snapshots_feature_flag_enabled", "false");
.setting("ingest.geoip.downloader.enabled", "false");
if (supportRetryOnShardFailures(oldVersion) == false) {
cluster.setting("cluster.routing.rebalance.enable", "none");
}
Expand Down
Loading