configadmin binding detection due to race condition

Author: the-clam

dev/io.openliberty.microprofile.health.3.1.internal_fat/fat/src/io/openliberty/microprofile/health31/fat/ConfigAdminHealthCheckTest.java

@@ -153,14 +153,40 @@ public void testMatchingAppNamesDropinsTest() throws Exception {
         log("testMatchingAppNamesDropinsTest", "Deploying the ConfigAdmin App into the dropins directory.");
         loadServerAndApplication(server1, APP_NAME, "io.openliberty.microprofile.health31.config.admin.dropins.checks.app", false);
 
-        //Hitting health endpoint to trigger configAdmin app registration.
+        // Wait for the health bundle's setConfigAdmin() to be invoked
+        // This ensures ConfigAdmin binding has occurred before we check for app detection
+        log("testMatchingAppNamesDropinsTest", "Waiting for ConfigAdmin binding to health bundle.");
+        String setConfigAdminLine = server1.waitForStringInTrace("invoking bind: setConfigAdmin", 10000);
+        assertNotNull("ConfigAdmin was not bound to health bundle.", setConfigAdminLine);
+        
+        log("testMatchingAppNamesDropinsTest", "ConfigAdmin binding detected, now checking app detection.");
+
+        // Now hit the health endpoint to trigger the check
         HttpURLConnection conReady = HttpUtils.getHttpConnectionWithAnyResponseCode(server1, READY_ENDPOINT);
         getJSONPayload(conReady);
 
-        String configAdminLine = server1.waitForStringInTrace(" configAdminAppName = ConfigAdminDropinsCheckApp", 10000);
-        String stateMapLine = server1.waitForStringInTrace(": appName = ConfigAdminDropinsCheckApp");
+        // Check if the app was detected by ConfigAdmin
+        String configAdminLine = server1.waitForStringInTrace(" configAdminAppName = ConfigAdminDropinsCheckApp", 5000);
+
+        // If not found, it might be the race condition - check for the "could not find" message
+        if (configAdminLine == null) {
+            String notFoundLine = server1.waitForStringInTrace("configAdmin could not find any configured apps", 1000);
+            if (notFoundLine != null) {
+                // Race condition detected - ConfigAdmin was queried before app registered
+                // Hit the endpoint again to trigger a re-check
+                log("testMatchingAppNamesDropinsTest", "Race condition detected, retrying health endpoint.");
+                conReady = HttpUtils.getHttpConnectionWithAnyResponseCode(server1, READY_ENDPOINT);
+                getJSONPayload(conReady);
+                
+                // Wait for the app detection after retry
+                configAdminLine = server1.waitForStringInTrace(" configAdminAppName = ConfigAdminDropinsCheckApp", 5000);
+            }
+        }
 
         assertNotNull("App was not detected by ConfigAdmin.", configAdminLine);
+
+        // Check appTracker detection
+        String stateMapLine = server1.waitForStringInTrace(": appName = ConfigAdminDropinsCheckApp");
         assertNotNull("App was not detected by appTracker.", stateMapLine);
 
     }
@@ -299,16 +325,40 @@ public void testMultiWarDetectionDropinsTest() throws Exception {
             assertTrue("Failure to start server. ", server1.isStarted());
         }
 
-        log("testReadinessEndpointOnServerStart", "Waiting for Application to start.");
+        log("testMultiWarDetectionDropinsTest", "Waiting for Application to start.");
         String line = server1.waitForStringInLog("Application MultiWarApps started", 30000);
-        log("testReadinessEndpointOnServerStart", "Application started. Line Found : " + line);
+        log("testMultiWarDetectionDropinsTest", "Application started. Line Found : " + line);
         assertNotNull("The CWWKZ0001I Application started message did not appear in messages.log", line);
 
-        //Hitting health endpoint to trigger configAdmin app registration.
+        // Wait for the health bundle's setConfigAdmin() to be invoked
+        // This ensures ConfigAdmin binding has occurred before we check for app detection
+        log("testMultiWarDetectionDropinsTest", "Waiting for ConfigAdmin binding to health bundle.");
+        String setConfigAdminLine = server1.waitForStringInTrace("invoking bind: setConfigAdmin", 10000);
+        assertNotNull("ConfigAdmin was not bound to health bundle.", setConfigAdminLine);
+        
+        log("testMultiWarDetectionDropinsTest", "ConfigAdmin binding detected, now checking app detection.");
+
+        // Now hit the health endpoint to trigger the check
         HttpURLConnection conReady = HttpUtils.getHttpConnectionWithAnyResponseCode(server1, READY_ENDPOINT);
         getJSONPayload(conReady);
 
-        String configAdminLine = server1.waitForStringInTrace("configAdminAppName = MultiWarApps");
+        // Check if the app was detected by ConfigAdmin
+        String configAdminLine = server1.waitForStringInTrace("configAdminAppName = MultiWarApps", 5000);
+
+        // If not found, it might be the race condition - check for the "could not find" message
+        if (configAdminLine == null) {
+            String notFoundLine = server1.waitForStringInTrace("configAdmin could not find any configured apps", 1000);
+            if (notFoundLine != null) {
+                // Race condition detected - ConfigAdmin was queried before app registered
+                // Hit the endpoint again to trigger a re-check
+                log("testMultiWarDetectionDropinsTest", "Race condition detected, retrying health endpoint.");
+                conReady = HttpUtils.getHttpConnectionWithAnyResponseCode(server1, READY_ENDPOINT);
+                getJSONPayload(conReady);
+                
+                // Wait for the app detection after retry
+                configAdminLine = server1.waitForStringInTrace("configAdminAppName = MultiWarApps", 5000);
+            }
+        }
 
         assertNotNull("App was not detected by ConfigAdmin.", configAdminLine);