Fix security policy

Signed-off-by: Rishabh Maurya <[email protected]>
rishabhmaurya · Feb 9, 2025 · 1543071 · 1543071
1 parent 72ea129
commit 1543071
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 51 deletions.
diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle
@@ -60,6 +60,10 @@ dependencies {
   }
 }
 
+tasks.internalClusterTest {
+  jvmArgs += ["--add-opens", "java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"]
+}
+
 tasks.named('test').configure {
   jacoco {
     excludes = ['org/apache/arrow/flight/**']

diff --git a/plugins/arrow-flight-rpc/src/main/plugin-metadata/plugin-security.policy b/plugins/arrow-flight-rpc/src/main/plugin-metadata/plugin-security.policy
@@ -16,7 +16,7 @@ grant codeBase "${codebase.grpc-core}" {
    permission java.lang.RuntimePermission "*", "setContextClassLoader";
 };
 
-grant codeBase "${codebase.arrow-flight-rpc}" {
+grant {
   // arrow flight service permissions
   permission java.util.PropertyPermission "arrow.allocation.manager.type", "write";
   permission java.util.PropertyPermission "arrow.enable_null_check_for_get", "write";

diff --git a/...ght-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightClientManagerTests.java b/...ght-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightClientManagerTests.java
@@ -219,7 +219,7 @@ public void testClusterChangedWithNodesChanged() throws Exception {
         for (DiscoveryNode node : newState.nodes()) {
             assertBusy(
                 () -> { assertNotNull("Flight client isn't built in time limit", clientManager.getFlightClient(node.getId())); },
-                2,
+                5,
                 TimeUnit.SECONDS
             );
         }
@@ -375,17 +375,16 @@ public void testFailedClusterUpdateButSuccessfulDirectRequest() throws Exception
 
         ClusterChangedEvent event = new ClusterChangedEvent("test", newState, ClusterState.EMPTY_STATE);
         clientManager.clusterChanged(event);
-
+        assertBusy(() -> { assertFalse("first call should be invoked", firstCall.get()); }, 5, TimeUnit.SECONDS);
         // Verify that the client can still be created successfully on direct request
         clientManager.buildClientAsync(nodeId);
         assertBusy(
             () -> {
                 assertNotNull("Flight client should be created successfully on direct request", clientManager.getFlightClient(nodeId));
             },
-            2,
+            5,
             TimeUnit.SECONDS
         );
-        assertFalse("first call should be invoked", firstCall.get());
     }
 
     private void validateNodes() {

diff --git a/plugins/arrow-flight-rpc/src/test/resources/org/opensearch/bootstrap/test.policy b/plugins/arrow-flight-rpc/src/test/resources/org/opensearch/bootstrap/test.policy
diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -129,7 +129,7 @@ public class FeatureFlags {
     );
 
     public static final String ARROW_STREAMS = "opensearch.experimental.feature.arrow.streams.enabled";
-    public static final Setting<Boolean> ARROW_STREAMS_SETTING = Setting.boolSetting(ARROW_STREAMS, true, Property.NodeScope);
+    public static final Setting<Boolean> ARROW_STREAMS_SETTING = Setting.boolSetting(ARROW_STREAMS, false, Property.NodeScope);
 
     private static final List<Setting<Boolean>> ALL_FEATURE_FLAG_SETTINGS = List.of(
         REMOTE_STORE_MIGRATION_EXPERIMENTAL_SETTING,