Added more logging and fixed waitFor

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

appserver/tests/embedded/runnable/src/test/java/org/glassfish/tests/embedded/runnable/MonitoringTest.java

@@ -22,12 +22,12 @@
 import java.lang.System.Logger;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.management.JMException;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
@@ -65,10 +65,11 @@ public class MonitoringTest {
     @AfterEach
     void deleteFiles() throws Exception {
         if (jmxConnector != null) {
+            LOG.log(INFO, () -> "Closing JMX Connector: " + jmxConnector);
             try {
                 jmxConnector.close();
             } catch (Exception e) {
-                LOG.log(ERROR, e);
+                LOG.log(ERROR, "JMX Connector close failed!", e);
             }
         }
         if (gfEmbeddedProcess != null && gfEmbeddedProcess.isAlive()) {
@@ -87,6 +88,7 @@ void testJmxMonitoringWithFlashlightAgent() throws Exception {
         assertTrue(gfEmbeddedProcess.isAlive(), "gf is alive");
 
         jmxConnector = getJMXConnector();
+        LOG.log(INFO, () -> "Connecting with JMX Connector: " + jmxConnector);
         assertNotNull(jmxConnector, "JMX Connector");
         jmxConnector.connect();
         MBeanServerConnection connection = jmxConnector.getMBeanServerConnection();
@@ -141,7 +143,7 @@ private String getJmxUrl() throws Exception {
      * Find GlassFish process by looking for our jar
      */
     private VirtualMachineDescriptor findVirtualMachineDescriptor() throws Exception {
-        return waitFor("Virtual machine descriptor", () -> {
+        return waitFor(Duration.ofSeconds(10L), "Virtual machine descriptor", () -> {
             for (VirtualMachineDescriptor vmd : VirtualMachine.list()) {
                 if (vmd.displayName().contains("glassfish-embedded")) {
                     LOG.log(INFO, () -> "Detected virtual machine descriptor: " + vmd);
@@ -153,13 +155,22 @@ private VirtualMachineDescriptor findVirtualMachineDescriptor() throws Exception
     }
 
     private void bootAmx(MBeanServerConnection connection) throws Exception {
+        LOG.log(INFO, "Booting AMX!");
         ObjectName bootAMXObjectName = new ObjectName("amx-support:type=boot-amx");
-        waitFor("bootAMX", () -> connection.isRegistered(bootAMXObjectName) ? true : null);
-        assertNotNull(connection.invoke(bootAMXObjectName, "bootAMX", null, null), "bootAMX operation");
+        waitFor(Duration.ofSeconds(10L), "bootAMX", () -> {
+            final boolean registered = connection.isRegistered(bootAMXObjectName);
+            LOG.log(INFO, () -> "bootAMX registered: " + registered);
+            return registered ? true : null;
+        });
+        LOG.log(INFO, "Invoking bootAMX...");
+        Object response = connection.invoke(bootAMXObjectName, "bootAMX", null, null);
+        LOG.log(INFO, () -> "AMX booted: " + response);
+        assertNotNull(response, "bootAMX operation");
     }
 
-    private void verifyMonitoringMBeans(final MBeanServerConnection connection) throws InterruptedException, IOException, JMException {
-        Set<ObjectName> requestBeans = waitFor("equest-mon bean", () -> {
+    private void verifyMonitoringMBeans(final MBeanServerConnection connection) throws Exception {
+        LOG.log(INFO, () -> "Retrieving monitor data using connection: " + connection);
+        Set<ObjectName> requestBeans = waitFor(Duration.ofSeconds(10L), "equest-mon bean", () -> {
             Set<ObjectName> result = connection.queryNames(new ObjectName("amx:type=request-mon,*"), null);
             return result.isEmpty() ? null : result;
         });

appserver/tests/embedded/runnable/src/test/java/org/glassfish/tests/embedded/runnable/TestUtils.java

@@ -15,15 +15,16 @@
  */
 package org.glassfish.tests.embedded.runnable;
 
+import java.time.Duration;
+import java.time.Instant;
+
 import org.junit.jupiter.api.function.ThrowingSupplier;
 
 /**
  * @author Ondro Mihalyi
  */
 public final class TestUtils {
 
-    private static final int WAIT_SECONDS = 30;
-
     private TestUtils() {
     }
 
@@ -33,28 +34,32 @@ private TestUtils() {
      * Ignores null and all exceptions except {@link InterruptedException}.
      *
      * @param <T> Expected return type
-     * @param what description of the expected result.
-     * @param supplier
+     * @param maxTime maximal duration of waiting for the non-null result.
+     * @param actionDescription description of the expected result.
+     * @param action
      * @return result.
      * @throws InterruptedException
      */
-    public static <T> T waitFor(String what, ThrowingSupplier<T> supplier) throws InterruptedException {
+    public static <T> T waitFor(Duration maxTime, String actionDescription, ThrowingSupplier<T> action) throws InterruptedException {
         Throwable lastThrowable = null;
-        for (int i = 0; i < WAIT_SECONDS * 10; i++) {
+        final Instant deadline = Instant.now().plus(maxTime);
+        while (true) {
             try {
-                T result = supplier.get();
+                T result = action.get();
                 if (result != null) {
                     return result;
                 }
+                if (deadline.isBefore(Instant.now())) {
+                    throw new RuntimeException(actionDescription + " not received within timeout", lastThrowable);
+                }
+                Thread.sleep(100);
             } catch (InterruptedException e) {
                 throw e;
             } catch (UnsupportedOperationException unrecoverableError) {
                 throw unrecoverableError;
             } catch (Throwable ignore) {
                 lastThrowable = ignore;
             }
-            Thread.sleep(100);
         }
-        throw new RuntimeException(what + " not received within timeout", lastThrowable);
     }
 }