Merge pull request #42260 from xstefank/incorrect-data-in-ReactiveDat…

…asourceHealthCheck-42133

Fix a race condition in ReactiveDatasourceHealthCheck data field population

extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java

@@ -76,7 +76,6 @@ public HealthCheckResponse call() {
                 //20 seconds is rather high, but using just 10 is often not enough on slow CI
                 //systems, especially if the connections have to be established for the first time.
                 databaseConnectionAttempt.get(20, TimeUnit.SECONDS);
-                builder.withData(dataSourceName, "UP");
             } catch (RuntimeException | ExecutionException exception) {
                 operationsError(dataSourceName, exception);
                 builder.down();
@@ -105,6 +104,8 @@ private void checkFailure(AsyncResult<RowSet<Row>> ar, HealthCheckResponseBuilde
             operationsError(dataSourceName, ar.cause());
             builder.down();
             builder.withData(dataSourceName, "down - connection failed: " + ar.cause().getMessage());
+        } else {
+            builder.withData(dataSourceName, "UP");
         }
     }
 

extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DataSourceHealthCheckPayloadTest.java

@@ -0,0 +1,28 @@
+package io.quarkus.reactive.mssql.client;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DataSourceHealthCheckPayloadTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withEmptyApplication()
+            .overrideConfigKey("quarkus.datasource.health.enabled", "true")
+            .overrideConfigKey("quarkus.devservices.enabled", "false");
+
+    @Test
+    public void testDataSourceHealthCheckPayload() {
+        RestAssured.when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("DOWN"))
+                .body("checks.data", CoreMatchers
+                        .hasItem(Matchers.hasValue(CoreMatchers.containsString("down - connection failed"))));
+    }
+
+}

extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DataSourceHealthCheckPayloadTest.java

@@ -0,0 +1,28 @@
+package io.quarkus.reactive.mysql.client;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DataSourceHealthCheckPayloadTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withEmptyApplication()
+            .overrideConfigKey("quarkus.datasource.health.enabled", "true")
+            .overrideConfigKey("quarkus.devservices.enabled", "false");
+
+    @Test
+    public void testDataSourceHealthCheckPayload() {
+        RestAssured.when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("DOWN"))
+                .body("checks.data", CoreMatchers
+                        .hasItem(Matchers.hasValue(CoreMatchers.containsString("down - connection failed"))));
+    }
+
+}

extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DataSourceHealthCheckPayloadTest.java

@@ -0,0 +1,28 @@
+package io.quarkus.reactive.oracle.client;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DataSourceHealthCheckPayloadTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withEmptyApplication()
+            .overrideConfigKey("quarkus.datasource.health.enabled", "true")
+            .overrideConfigKey("quarkus.devservices.enabled", "false");
+
+    @Test
+    public void testDataSourceHealthCheckPayload() {
+        RestAssured.when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("DOWN"))
+                .body("checks.data", CoreMatchers
+                        .hasItem(Matchers.hasValue(CoreMatchers.containsString("down - connection failed"))));
+    }
+
+}

extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DataSourceHealthCheckPayloadTest.java

@@ -0,0 +1,28 @@
+package io.quarkus.reactive.pg.client;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DataSourceHealthCheckPayloadTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withEmptyApplication()
+            .overrideConfigKey("quarkus.datasource.health.enabled", "true")
+            .overrideConfigKey("quarkus.devservices.enabled", "false");
+
+    @Test
+    public void testDataSourceHealthCheckPayload() {
+        RestAssured.when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("DOWN"))
+                .body("checks.data", CoreMatchers
+                        .hasItem(Matchers.hasValue(CoreMatchers.containsString("down - connection failed"))));
+    }
+
+}