From 8ea215a7150bd846377a728b3ac8f3e264d22c99 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 6 Mar 2026 09:03:28 +0000 Subject: [PATCH 1/2] Don't run seq_no pruning tests in release CI These tests require a feature flag to be enabled to pass, which is not available in nightly builds. --- .../index/engine/RecoverySourcePruneMergePolicyTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java index da20ce717101a..da72b1f61a761 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java @@ -372,6 +372,8 @@ private void runTimeSeriesForceMergeToOneSegment( final boolean pruneSequenceNumber, final boolean useSyntheticRecoverySource ) throws IOException { + assumeTrue("Sequence number pruning requires a feature flag", + IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false); try (var dir = newDirectory()) { dir.setCheckIndexOnClose(false); @@ -574,6 +576,8 @@ public void testWrapForMergeUnwrapsSyntheticIdStoredFieldsReader() throws IOExce boolean syntheticRecoverySource = randomBoolean(); boolean pruneIdField = randomBoolean(); boolean pruneSequenceNumber = randomBoolean(); + assumeTrue("Sequence number pruning requires a feature flag", + IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false); String pruneStoredFieldName = syntheticRecoverySource ? null : SourceFieldMapper.RECOVERY_SOURCE_NAME; String pruneNumericDVFieldName = syntheticRecoverySource ? SourceFieldMapper.RECOVERY_SOURCE_SIZE_NAME From 8bee6269bee9c63176cd09feeae0c5fc9176fcf5 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 6 Mar 2026 09:13:11 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../engine/RecoverySourcePruneMergePolicyTests.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java index da72b1f61a761..d70a2002d8acf 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java @@ -372,8 +372,10 @@ private void runTimeSeriesForceMergeToOneSegment( final boolean pruneSequenceNumber, final boolean useSyntheticRecoverySource ) throws IOException { - assumeTrue("Sequence number pruning requires a feature flag", - IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false); + assumeTrue( + "Sequence number pruning requires a feature flag", + IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false + ); try (var dir = newDirectory()) { dir.setCheckIndexOnClose(false); @@ -576,8 +578,10 @@ public void testWrapForMergeUnwrapsSyntheticIdStoredFieldsReader() throws IOExce boolean syntheticRecoverySource = randomBoolean(); boolean pruneIdField = randomBoolean(); boolean pruneSequenceNumber = randomBoolean(); - assumeTrue("Sequence number pruning requires a feature flag", - IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false); + assumeTrue( + "Sequence number pruning requires a feature flag", + IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG || pruneSequenceNumber == false + ); String pruneStoredFieldName = syntheticRecoverySource ? null : SourceFieldMapper.RECOVERY_SOURCE_NAME; String pruneNumericDVFieldName = syntheticRecoverySource ? SourceFieldMapper.RECOVERY_SOURCE_SIZE_NAME