Skip to content

[Transform] Do not align checkpoints for transforms created before 7.15. #81729

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

Merged
merged 1 commit into from
Dec 15, 2021
Merged

[Transform] Do not align checkpoints for transforms created before 7.15. #81729

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
5 changes: 5 additions & 0 deletions ...c/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.SearchAction;
import org.elasticsearch.action.search.SearchRequest;
Expand Down Expand Up @@ -116,6 +117,10 @@ private static Function<Long, Long> createAlignTimestampFunction(TransformConfig
if (Boolean.FALSE.equals(transformConfig.getSettings().getAlignCheckpoints())) {
return identity();
}
// In case of transforms created before aligning timestamp optimization was introduced we assume the default was "false".
if (transformConfig.getVersion().before(Version.V_7_15_0)) {
return identity();
}
if (transformConfig.getPivotConfig() == null) {
return identity();
}
Expand Down
26 changes: 25 additions & 1 deletion ...t/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.VersionUtils;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.transform.transforms.SettingsConfig;
import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig;
Expand Down Expand Up @@ -94,18 +95,34 @@ public void testSourceHasChanged_NotChanged() throws InterruptedException {
0,
false,
TransformCheckpoint.EMPTY,
VersionUtils.randomVersionBetween(random(), Version.V_7_15_0, Version.CURRENT),
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.ZERO,
tuple(0L, 123000000L)
);
}

public void testSourceHasChanged_NotChanged_DoNotAlignCheckpointsBecauseOfVersion() throws InterruptedException {
testSourceHasChanged(
0,
false,
TransformCheckpoint.EMPTY,
Version.V_7_14_0,
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.ZERO,
// Checkpoint alignment doesn't work here because the transform was created without alignment.
tuple(0L, 123456789L)
);
}

public void testSourceHasChanged_Changed() throws InterruptedException {
testSourceHasChanged(
1,
true,
TransformCheckpoint.EMPTY,
Version.CURRENT,
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.ZERO,
Expand All @@ -118,6 +135,7 @@ public void testSourceHasChanged_UnfinishedCheckpoint() throws InterruptedExcept
0,
false,
new TransformCheckpoint("", 100000000L, 7, emptyMap(), null),
Version.CURRENT,
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.ZERO,
Expand All @@ -130,6 +148,7 @@ public void testSourceHasChanged_SubsequentCheckpoint() throws InterruptedExcept
0,
false,
new TransformCheckpoint("", 100000000L, 7, emptyMap(), 120000000L),
Version.CURRENT,
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.ZERO,
Expand All @@ -142,6 +161,7 @@ public void testSourceHasChanged_WithDelay() throws InterruptedException {
0,
false,
new TransformCheckpoint("", 100000000L, 7, emptyMap(), 120000000L),
Version.CURRENT,
TIMESTAMP_FIELD,
TimeValue.timeValueMinutes(10),
TimeValue.timeValueMinutes(5),
Expand All @@ -153,6 +173,7 @@ private void testSourceHasChanged(
long totalHits,
boolean expectedHasChangedValue,
TransformCheckpoint lastCheckpoint,
Version transformVersion,
String dateHistogramField,
TimeValue dateHistogramInterval,
TimeValue delay,
Expand All @@ -162,6 +183,7 @@ private void testSourceHasChanged(
String transformId = getTestName();
TransformConfig transformConfig = newTransformConfigWithDateHistogram(
transformId,
transformVersion,
dateHistogramField,
dateHistogramInterval,
delay
Expand Down Expand Up @@ -249,6 +271,7 @@ private void testCreateNextCheckpoint(

TransformConfig transformConfig = newTransformConfigWithDateHistogram(
transformId,
Version.CURRENT,
dateHistogramField,
dateHistogramInterval,
delay
Expand Down Expand Up @@ -280,6 +303,7 @@ private TimeBasedCheckpointProvider newCheckpointProvider(TransformConfig transf

private static TransformConfig newTransformConfigWithDateHistogram(
String transformId,
Version transformVersion,
String dateHistogramField,
TimeValue dateHistogramInterval,
TimeValue delay
Expand Down Expand Up @@ -316,7 +340,7 @@ public SingleGroupSource get() {
} else {
// Leave align_checkpoints setting unset. This will be interpreted as "true".
}
return new TransformConfig.Builder(TransformConfigTests.randomTransformConfig(transformId)).setSettings(
return new TransformConfig.Builder(TransformConfigTests.randomTransformConfig(transformId, transformVersion)).setSettings(
settingsConfigBuilder.build()
).setPivotConfig(pivotConfigWithDateHistogramSource).setSyncConfig(new TimeSyncConfig(TIMESTAMP_FIELD, delay)).build();
}
Expand Down