Merge remote-tracking branch 'upstream/main' into instanceof

Author: gaobinlong

CHANGELOG.md

@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Onboarding new maven snapshots publishing to s3 ([#19619](https://github.com/opensearch-project/OpenSearch/pull/19619))
 - Remove MultiCollectorWrapper and use MultiCollector in Lucene instead ([#19595](https://github.com/opensearch-project/OpenSearch/pull/19595))
 - Change implementation for `percentiles` aggregation for latency improvement ([#19648](https://github.com/opensearch-project/OpenSearch/pull/19648))
+- Wrap checked exceptions in painless.DefBootstrap to support JDK-25 ([#19706](https://github.com/opensearch-project/OpenSearch/pull/19706))
 - Refactor the ThreadPoolStats.Stats class to use the Builder pattern instead of constructors ([#19306](https://github.com/opensearch-project/OpenSearch/pull/19306))
 - Refactor the IndexingStats.Stats class to use the Builder pattern instead of constructors ([#19306](https://github.com/opensearch-project/OpenSearch/pull/19306))
 
@@ -32,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix pull-based ingestion out-of-bounds offset scenarios and remove persisted offsets ([#19607](https://github.com/opensearch-project/OpenSearch/pull/19607))
 - Fix issue with updating core with a patch number other than 0 ([#19377](https://github.com/opensearch-project/OpenSearch/pull/19377))
 - [Java Agent] Allow JRT protocol URLs in protection domain extraction ([#19683](https://github.com/opensearch-project/OpenSearch/pull/19683))
+- Fix potential concurrent modification exception when updating allocation filters ([#19701])(https://github.com/opensearch-project/OpenSearch/pull/19701))
 
 ### Dependencies
 - Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575))
@@ -41,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.azure:azure-storage-common` from 12.30.2 to 12.30.3 ([#19615](https://github.com/opensearch-project/OpenSearch/pull/19615))
 - Bump `peter-evans/create-issue-from-file` from 5 to 6 ([#19616](https://github.com/opensearch-project/OpenSearch/pull/19616))
 - Bump `com.squareup.okhttp3:okhttp` from 5.1.0 to 5.2.1 ([#19614](https://github.com/opensearch-project/OpenSearch/pull/19614))
+- Bump `com.microsoft.azure:msal4j` from 1.21.0 to 1.23.1 ([#19688](https://github.com/opensearch-project/OpenSearch/pull/19688))
 - Bump `commons-net:commons-net` from 3.11.1 to 3.12.0 ([#19687](https://github.com/opensearch-project/OpenSearch/pull/19687))
 - Bump `org.apache.avro:avro` from 1.12.0 to 1.12.1 ([#19692](https://github.com/opensearch-project/OpenSearch/pull/19692))
 - Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.6 to 4.9.8 ([#19691](https://github.com/opensearch-project/OpenSearch/pull/19691))

modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java

@@ -112,6 +112,17 @@ private DefBootstrap() {} // no instance!
      */
     public static final int OPERATOR_EXPLICIT_CAST = 1 << 2;
 
+    /**
+     * ClassValue.getFromHashMap will wrap checked exceptions with Errors. To get
+     * around that we wrap any checked exceptions with this RuntimeException and
+     * unwrap them later.
+     */
+    static final class WrappedCheckedException extends RuntimeException {
+        private WrappedCheckedException(Exception cause) {
+            super(cause);
+        }
+    }
+
     /**
      * CallSite that implements the polymorphic inlining cache (PIC).
      */
@@ -204,7 +215,10 @@ protected MethodHandle computeValue(Class<?> receiverType) {
                     try {
                         return lookup(flavor, name, receiverType).asType(type);
                     } catch (Throwable t) {
-                        Def.rethrow(t);
+                        switch (t) {
+                            case Exception e -> throw new WrappedCheckedException(e);
+                            default -> Def.rethrow(t);
+                        }
                         throw new AssertionError();
                     }
                 }

modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java

@@ -65,14 +65,18 @@ public interface PainlessScript {
     /**
      * Adds stack trace and other useful information to exceptions thrown
      * from a Painless script.
-     * @param t The throwable to build an exception around.
+     * @param originalThrowable The throwable to build an exception around.
      * @return The generated ScriptException.
      */
-    default ScriptException convertToScriptException(Throwable t, Map<String, List<String>> extraMetadata) {
+    default ScriptException convertToScriptException(Throwable originalThrowable, Map<String, List<String>> extraMetadata) {
+        final Throwable unwrapped = switch (originalThrowable) {
+            case DefBootstrap.WrappedCheckedException w -> w.getCause();
+            default -> originalThrowable;
+        };
         // create a script stack: this is just the script portion
         List<String> scriptStack = new ArrayList<>();
         ScriptException.Position pos = null;
-        for (StackTraceElement element : t.getStackTrace()) {
+        for (StackTraceElement element : unwrapped.getStackTrace()) {
             if (WriterConstants.CLASS_NAME.equals(element.getClassName())) {
                 // found the script portion
                 int originalOffset = element.getLineNumber();
@@ -106,7 +110,14 @@ default ScriptException convertToScriptException(Throwable t, Map<String, List<S
                 scriptStack.add(element.toString());
             }
         }
-        ScriptException scriptException = new ScriptException("runtime error", t, scriptStack, getName(), PainlessScriptEngine.NAME, pos);
+        ScriptException scriptException = new ScriptException(
+            "runtime error",
+            unwrapped,
+            scriptStack,
+            getName(),
+            PainlessScriptEngine.NAME,
+            pos
+        );
         for (Map.Entry<String, List<String>> entry : extraMetadata.entrySet()) {
             scriptException.addMetadata(entry.getKey(), entry.getValue());
         }

modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java

@@ -46,6 +46,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 
+import static org.hamcrest.Matchers.instanceOf;
+
 public class DefBootstrapTests extends OpenSearchTestCase {
     private final PainlessLookup painlessLookup = PainlessLookupBuilder.buildFromAllowlists(Allowlist.BASE_ALLOWLISTS);
 
@@ -157,9 +159,11 @@ public void testMegamorphic() throws Throwable {
         map.put("a", "b");
         assertEquals(2, (int) handle.invokeExact((Object) map));
 
-        final IllegalArgumentException iae = expectThrows(IllegalArgumentException.class, () -> {
+        final DefBootstrap.WrappedCheckedException wrapped = expectThrows(DefBootstrap.WrappedCheckedException.class, () -> {
             Integer.toString((int) handle.invokeExact(new Object()));
         });
+        assertThat(wrapped.getCause(), instanceOf(IllegalArgumentException.class));
+        final IllegalArgumentException iae = (IllegalArgumentException) wrapped.getCause();
         assertEquals("dynamic method [java.lang.Object, size/0] not found", iae.getMessage());
         assertTrue("Does not fail inside ClassValue.computeValue()", Arrays.stream(iae.getStackTrace()).anyMatch(e -> {
             return e.getMethodName().equals("computeValue") && e.getClassName().startsWith("org.opensearch.painless.DefBootstrap$PIC$");

plugins/ingestion-fs/src/test/java/org/opensearch/plugin/ingestion/fs/FileBasedIngestionSingleNodeTests.java

@@ -71,6 +71,15 @@ public void setupIngestionFile() throws Exception {
         try (FileChannel channel = FileChannel.open(shardFile, StandardOpenOption.READ)) {
             channel.force(true);
         }
+
+        // Wait for file to be fully visible by reading it back
+        // This prevents race conditions where tests start before file is ready
+        assertBusy(() -> {
+            java.util.List<String> lines = Files.readAllLines(shardFile, StandardCharsets.UTF_8);
+            assertEquals("File should have exactly 2 lines", 2, lines.size());
+            assertTrue("First line should contain alice", lines.get(0).contains("alice"));
+            assertTrue("Second line should contain bob", lines.get(1).contains("bob"));
+        });
     }
 
     public void testFileIngestion() throws Exception {

plugins/repository-azure/build.gradle

@@ -61,7 +61,7 @@ dependencies {
   // Start of transitive dependencies for azure-identity
   api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0'
   api "net.java.dev.jna:jna-platform:${versions.jna}"
-  api 'com.microsoft.azure:msal4j:1.21.0'
+  api 'com.microsoft.azure:msal4j:1.23.1'
   api 'com.nimbusds:oauth2-oidc-sdk:11.29.2'
   api 'com.nimbusds:nimbus-jose-jwt:10.5'
   api 'com.nimbusds:content-type:2.3'

plugins/repository-azure/licenses/msal4j-1.21.0.jar.sha1

@@ -0,0 +1 @@
+6c722b514873b24a4e1ce9c22dca36ea3c22bdbe

plugins/repository-azure/licenses/msal4j-1.23.1.jar.sha1

@@ -83,11 +83,11 @@ public void testPruneCacheWithRealData() throws Exception {
         }
 
         assertBusy(() -> {
-            long usage = getFileCacheUsage();
+            long usage = getFileCacheUsage(client);
             assertTrue("Cache should be populated after index access", usage > 0);
         }, 30, TimeUnit.SECONDS);
 
-        long usageBefore = getFileCacheUsage();
+        long usageBefore = getFileCacheUsage(client);
         logger.info("--> File cache usage before prune: {} bytes", usageBefore);
         assertTrue("File cache should have data before prune", usageBefore > 0);
 
@@ -109,7 +109,7 @@ public void testPruneCacheWithRealData() throws Exception {
         assertTrue("Should have pruned bytes", response.getTotalPrunedBytes() > 0);
 
         // Verify cache usage after prune
-        long usageAfter = getFileCacheUsage();
+        long usageAfter = getFileCacheUsage(client);
         logger.info("--> File cache usage after prune: {} bytes", usageAfter);
 
         // Cache should be reduced (might not be zero if files are still referenced)
@@ -148,11 +148,11 @@ public void testPruneResponseMetrics() throws Exception {
         assertDocCount(restoredIndexName, 100L);
 
         assertBusy(() -> {
-            long usage = getFileCacheUsage();
+            long usage = getFileCacheUsage(client);
             assertTrue("Cache should be populated", usage > 0);
         }, 30, TimeUnit.SECONDS);
 
-        long usageBefore = getFileCacheUsage();
+        long usageBefore = getFileCacheUsage(client);
 
         PruneFileCacheRequest request = new PruneFileCacheRequest();
         PlainActionFuture<PruneFileCacheResponse> future = new PlainActionFuture<>();
@@ -170,7 +170,7 @@ public void testPruneResponseMetrics() throws Exception {
         assertTrue("Node should have cache capacity", nodeResponse.getCacheCapacity() > 0);
         assertTrue("Node should report pruned bytes", nodeResponse.getPrunedBytes() >= 0);
 
-        long usageAfter = getFileCacheUsage();
+        long usageAfter = getFileCacheUsage(client);
         long expectedPruned = usageBefore - usageAfter;
         assertEquals("Response should match actual cache reduction", expectedPruned, response.getTotalPrunedBytes());
     }
@@ -261,8 +261,8 @@ private void assertRemoteSnapshotIndexSettings(Client client, String... indexNam
     /**
      * Returns total file cache usage across all warm nodes in bytes.
      */
-    private long getFileCacheUsage() {
-        NodesStatsResponse response = client().admin().cluster().nodesStats(new NodesStatsRequest().all()).actionGet();
+    private long getFileCacheUsage(Client client) {
+        NodesStatsResponse response = client.admin().cluster().nodesStats(new NodesStatsRequest().all()).actionGet();
 
         long totalUsage = 0L;
         for (NodeStats stats : response.getNodes()) {

server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/filecache/PruneFileCacheIT.java

@@ -97,7 +97,7 @@ public static DiscoveryNodeFilters buildOrUpdateFromKeyValue(
             updated = new DiscoveryNodeFilters(opType, new HashMap<>());
         } else {
             assert opType == original.opType : "operation type should match with node filter parameter";
-            updated = new DiscoveryNodeFilters(original.opType, original.filters);
+            updated = new DiscoveryNodeFilters(original.opType, new HashMap<>(original.filters));
         }
         for (Map.Entry<String, String> entry : filters.entrySet()) {
             String[] values = Strings.tokenizeToStringArray(entry.getValue(), ",");