(polaris) branch main updated: polaris-runtime,admin/testing: Update fork/jvm settings (#4776)

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snazy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new c6452a8bdb polaris-runtime,admin/testing: Update fork/jvm settings (#4776)
c6452a8bdb is described below

commit c6452a8bdbb676303f87bef505ed2f2af84c5ab9
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Tue Jun 16 10:46:31 2026 +0200

    polaris-runtime,admin/testing: Update fork/jvm settings (#4776)
    
    Use `forkEvery = 1` only for `:polaris-runtime-service:test`.
    Use enlarged heap only for `:polaris-runtime-service:test` and `:polaris-admin:test`.
    `polaris-runtime-service`'s `intTest` and `cloudTest` and `:polaris-admin:test` will use `forkEvery=0`
---
 .../src/main/kotlin/polaris-runtime.gradle.kts     | 12 -----
 runtime/admin/build.gradle.kts                     |  7 +++
 runtime/service/build.gradle.kts                   | 52 +++++++++++-----------
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/build-logic/src/main/kotlin/polaris-runtime.gradle.kts b/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
index c57993e460..55cacb3364 100644
--- a/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
@@ -111,20 +111,8 @@ tasks.withType(Test::class.java).configureEach {
   // Gradle's Jacoco plugin doesn't work well with Quarkus's test coverage
   extensions.configure(JacocoTaskExtension::class) { isEnabled = false }
 
-  // Quarkus tests run "in isolated class loaders", which means that class-statically active
-  // resources pile up used JVM, as those classes cannot be GC'd.
-  // Examples of those statically held active resources are:
-  // - Iceberg's worker pools (thread pools, executors, etc.)
-  // - Hadoop's stats-cleaner (org.apache.hadoop.fs.FileSystem.Statistics.STATS_DATA_CLEANER)
-  // - Guava's 'MoreExecutors' (via Iceberg `ThreadPools`)`
-  // Forcing a new JVM after each test class works around this issue.
-  forkEvery = 1
-
   maxParallelForks = 1
 
-  // enlarge the max heap size to avoid out of memory error
-  maxHeapSize = "4g"
-
   // Silence the 'OpenJDK 64-Bit Server VM warning: Sharing is only supported for boot loader
   // classes because bootstrap classpath has been appended' warning from OpenJDK.
   jvmArgs("-Xshare:off")
diff --git a/runtime/admin/build.gradle.kts b/runtime/admin/build.gradle.kts
index 847ef2814b..acf03e253b 100644
--- a/runtime/admin/build.gradle.kts
+++ b/runtime/admin/build.gradle.kts
@@ -105,3 +105,10 @@ artifacts {
   add("distributionElements", layout.buildDirectory.dir("quarkus-app")) { builtBy("quarkusBuild") }
   add("licenseNoticeElements", layout.projectDirectory.dir("distribution"))
 }
+
+tasks.withType<Test>().configureEach {
+  forkEvery = 0
+
+  // enlarge the max heap size to avoid out of memory error
+  maxHeapSize = "4g"
+}
diff --git a/runtime/service/build.gradle.kts b/runtime/service/build.gradle.kts
index 27d13eccec..d3608738c7 100644
--- a/runtime/service/build.gradle.kts
+++ b/runtime/service/build.gradle.kts
@@ -211,19 +211,6 @@ dependencies {
 
 tasks.named("javadoc") { dependsOn("jandex") }
 
-tasks.withType(Test::class.java).configureEach {
-  if (System.getenv("AWS_REGION") == null) {
-    environment("AWS_REGION", "us-west-2")
-  }
-  // Note: the test secrets are referenced in
-  // org.apache.polaris.service.it.ServerManager
-  environment("POLARIS_BOOTSTRAP_CREDENTIALS", "POLARIS,test-admin,test-secret")
-  jvmArgs("--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED")
-  // Need to allow a java security manager after Java 21, for Subject.getSubject to work
-  // "getSubject is supported only if a security manager is allowed".
-  systemProperty("java.security.manager", "allow")
-}
-
 val buildDir = project.layout.buildDirectory
 
 // Same issue as above: allow a java security manager after Java 21
@@ -243,27 +230,42 @@ val quarkusTestArgLine =
 
 val quarkusProperties = providers.systemPropertiesPrefixedBy("quarkus.")
 
-listOf("intTest", "cloudTest").forEach {
-  tasks.named<Test>(it).configure(IntTestConfig(buildDir, quarkusProperties, quarkusTestArgLine))
-}
+tasks.withType(Test::class.java).configureEach {
+  if (System.getenv("AWS_REGION") == null) {
+    environment("AWS_REGION", "us-west-2")
+  }
+  // Note: the test secrets are referenced in
+  // org.apache.polaris.service.it.ServerManager
+  environment("POLARIS_BOOTSTRAP_CREDENTIALS", "POLARIS,test-admin,test-secret")
+  jvmArgs("--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED")
+  // Need to allow a java security manager after Java 21, for Subject.getSubject to work
+  // "getSubject is supported only if a security manager is allowed".
+  systemProperty("java.security.manager", "allow")
 
-class IntTestConfig(
-  @get:Internal val buildDir: DirectoryProperty,
-  @get:Input val quarkusProperties: Provider<Map<String, String>>,
-  @get:Input val quarkusTestArgLine: String,
-) : Action<Test> {
-  override fun execute(t: Test) {
-    t.maxParallelForks = 1
+  // Quarkus tests run "in isolated class loaders", which means that class-statically active
+  // resources pile up used JVM, as those classes cannot be GC'd.
+  // Examples of those statically held active resources are:
+  // - Iceberg's worker pools (thread pools, executors, etc.)
+  // - Hadoop's stats-cleaner (org.apache.hadoop.fs.FileSystem.Statistics.STATS_DATA_CLEANER)
+  // - Guava's 'MoreExecutors' (via Iceberg `ThreadPools`)`
+  // Forcing a new JVM after each test class works around this issue.
+  if ("test" == name) {
+    forkEvery = 1
+
+    // enlarge the max heap size to avoid out of memory error
+    maxHeapSize = "4g"
+  }
 
+  if ("intTest" == name || "cloutTest" == name) {
     val logsDir = buildDir.map { b -> b.asFile.resolve("logs") }
 
     // JVM arguments provider does not interfere with Gradle's cache keys
-    t.jvmArgumentProviders.add(
+    jvmArgumentProviders.add(
       IntTestArgumentProvider(logsDir, quarkusProperties, quarkusTestArgLine)
     )
 
     // delete files from previous runs
-    t.doFirst(IntTestCleanup(logsDir, buildDir))
+    doFirst(IntTestCleanup(logsDir, buildDir))
   }
 }