Fix lingering test failures

- Add missing LockFeatureFlag annotations.
- Cannot use annotation in tests which expect exception thrown.
- SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY has no setting? Adding.
- Flight server tests need flag enabled on setup.

Signed-off-by: Finn Carroll <[email protected]>

Author: finnegancarroll

plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightClientManagerTests.java

@@ -24,6 +24,7 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.transport.BoundTransportAddress;
 import org.opensearch.core.common.transport.TransportAddress;
@@ -63,6 +64,7 @@
 
 @SuppressWarnings("unchecked")
 public class FlightClientManagerTests extends OpenSearchTestCase {
+    private static FeatureFlags.TestUtils.FlagLock ffLock = null;
 
     private static BufferAllocator allocator;
     private static EventLoopGroup elg;
@@ -77,13 +79,13 @@ public class FlightClientManagerTests extends OpenSearchTestCase {
 
     @BeforeClass
     public static void setupClass() throws Exception {
+        ffLock = new FeatureFlags.TestUtils.FlagLock(ARROW_STREAMS);
         ServerConfig.init(Settings.EMPTY);
         allocator = new RootAllocator();
         elg = ServerConfig.createELG("test-grpc-worker-elg", NettyRuntime.availableProcessors() * 2);
         executorService = ServerConfig.createELG("test-grpc-worker", NettyRuntime.availableProcessors() * 2);
     }
 
-    @LockFeatureFlag(ARROW_STREAMS)
     @Override
     public void setUp() throws Exception {
         super.setUp();
@@ -175,6 +177,7 @@ private DiscoveryNode createNode(String nodeId, String host, int port) throws Ex
     @AfterClass
     public static void tearClass() {
         allocator.close();
+        ffLock.close();
     }
 
     public void testGetFlightClientForExistingNode() {

server/src/main/java/org/opensearch/common/util/FeatureFlags.java

@@ -42,6 +42,11 @@ public class FeatureFlags {
      */
     public static final String SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY = FEATURE_FLAG_PREFIX
         + "searchable_snapshot.extended_compatibility.enabled";
+    public static final Setting<Boolean> SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY_SETTING = Setting.boolSetting(
+        SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY,
+        false,
+        Property.NodeScope
+    );
 
     /**
      * Gates the functionality of extensions.
@@ -162,6 +167,10 @@ static class FeatureFlagsImpl {
                 put(READER_WRITER_SPLIT_EXPERIMENTAL_SETTING, READER_WRITER_SPLIT_EXPERIMENTAL_SETTING.getDefault(Settings.EMPTY));
                 put(TERM_VERSION_PRECOMMIT_ENABLE_SETTING, TERM_VERSION_PRECOMMIT_ENABLE_SETTING.getDefault(Settings.EMPTY));
                 put(ARROW_STREAMS_SETTING, ARROW_STREAMS_SETTING.getDefault(Settings.EMPTY));
+                put(
+                    SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY_SETTING,
+                    SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY_SETTING.getDefault(Settings.EMPTY)
+                );
             }
         };
 

server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexTemplateServiceTests.java

@@ -972,10 +972,12 @@ public void onFailure(Exception e) {
         );
     }
 
+    @LockFeatureFlag(APPLICATION_BASED_CONFIGURATION_TEMPLATES)
     public void testPutGlobalV2TemplateWhichProvidesContextWithSpecificVersion() throws Exception {
         verifyTemplateCreationUsingContext("1");
     }
 
+    @LockFeatureFlag(APPLICATION_BASED_CONFIGURATION_TEMPLATES)
     public void testPutGlobalV2TemplateWhichProvidesContextWithLatestVersion() throws Exception {
         verifyTemplateCreationUsingContext("_latest");
     }
@@ -1014,6 +1016,7 @@ public void testModifySystemTemplateViaUnknownSource() throws Exception {
         );
     }
 
+    @LockFeatureFlag(APPLICATION_BASED_CONFIGURATION_TEMPLATES)
     public void testResolveSettingsWithContextVersion() throws Exception {
         ClusterService clusterService = node().injector().getInstance(ClusterService.class);
         final String indexTemplateName = verifyTemplateCreationUsingContext("1");
@@ -1022,6 +1025,7 @@ public void testResolveSettingsWithContextVersion() throws Exception {
         assertThat(settings.get("index.codec"), equalTo(CodecService.BEST_COMPRESSION_CODEC));
     }
 
+    @LockFeatureFlag(APPLICATION_BASED_CONFIGURATION_TEMPLATES)
     public void testResolveSettingsWithContextLatest() throws Exception {
         ClusterService clusterService = node().injector().getInstance(ClusterService.class);
         final String indexTemplateName = verifyTemplateCreationUsingContext(Context.LATEST_VERSION);

server/src/test/java/org/opensearch/cluster/routing/OperationRoutingTests.java

@@ -72,6 +72,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED;
+import static org.opensearch.common.util.FeatureFlags.WRITABLE_WARM_INDEX_EXPERIMENTAL_FLAG;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
@@ -1058,9 +1059,9 @@ public void testSearchableSnapshotPrimaryDefault() throws Exception {
         }
     }
 
+    @LockFeatureFlag(WRITABLE_WARM_INDEX_EXPERIMENTAL_FLAG)
     @SuppressForbidden(reason = "feature flag overrides")
     public void testPartialIndexPrimaryDefault() throws Exception {
-        System.setProperty(FeatureFlags.WRITABLE_WARM_INDEX_EXPERIMENTAL_FLAG, "true");
         final int numIndices = 1;
         final int numShards = 2;
         final int numReplicas = 2;
@@ -1116,7 +1117,6 @@ public void testPartialIndexPrimaryDefault() throws Exception {
         } finally {
             IOUtils.close(clusterService);
             terminate(threadPool);
-            System.setProperty(FeatureFlags.WRITABLE_WARM_INDEX_EXPERIMENTAL_FLAG, "false");
         }
     }
 

server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java

@@ -35,6 +35,7 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.unit.ByteSizeUnit;
@@ -498,7 +499,6 @@ public void testDerivedFields() throws Exception {
         assertEquals("date", mapper.typeName());
     }
 
-    @LockFeatureFlag(STAR_TREE_INDEX)
     public void testCompositeFields() throws Exception {
         String mapping = XContentFactory.jsonBuilder()
             .startObject()
@@ -556,18 +556,20 @@ public void testCompositeFields() throws Exception {
             ex.getMessage()
         );
 
-        DocumentMapper documentMapper = createIndex("test", settings).mapperService()
-            .documentMapperParser()
-            .parse("tweet", new CompressedXContent(mapping));
-
-        Mapper mapper = documentMapper.root().getMapper("startree");
-        assertTrue(mapper instanceof StarTreeMapper);
-        StarTreeMapper starTreeMapper = (StarTreeMapper) mapper;
-        assertEquals("star_tree", starTreeMapper.fieldType().typeName());
-        // Check that field in properties was parsed correctly as well
-        mapper = documentMapper.root().getMapper("@timestamp");
-        assertNotNull(mapper);
-        assertEquals("date", mapper.typeName());
+        FeatureFlags.TestUtils.with(STAR_TREE_INDEX, () -> {
+            DocumentMapper documentMapper = createIndex("test", settings).mapperService()
+                .documentMapperParser()
+                .parse("tweet", new CompressedXContent(mapping));
+
+            Mapper mapper = documentMapper.root().getMapper("startree");
+            assertTrue(mapper instanceof StarTreeMapper);
+            StarTreeMapper starTreeMapper = (StarTreeMapper) mapper;
+            assertEquals("star_tree", starTreeMapper.fieldType().typeName());
+            // Check that field in properties was parsed correctly as well
+            mapper = documentMapper.root().getMapper("@timestamp");
+            assertNotNull(mapper);
+            assertEquals("date", mapper.typeName());
+        });
     }
 
     public void testNestedIsParent() throws Exception {

test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java

@@ -247,11 +247,7 @@ public abstract class OpenSearchTestCase extends LuceneTestCase {
      * Enables and locks a feature flag for the duration of the test case.
      * This annotation guarantees the feature flag will be enabled for the duration of
      * the test case. Feature flag is returned to previous value on test exit.
-     * Usage:
-     * @LockFeatureFlag("example.featureflag.setting.key.enabled")
-     * public void testFeatureFlagExample() {
-     *     // Test flag dependant feature
-     * }
+     * Usage: LockFeatureFlag("example.featureflag.setting.key.enabled")
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ ElementType.METHOD })