fix(monitor): Probe check must be done from a dedicated thread to avo…

…id blocked event-loop thread Closes gravitee-io/issues#2125
gravitee-io · Apr 12, 2019 · 9f62bb0 · 9f62bb0
1 parent 87c9826
commit 9f62bb0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...y/src/main/java/io/gravitee/gateway/repository/healthcheck/ManagementRepositoryProbe.java b/...y/src/main/java/io/gravitee/gateway/repository/healthcheck/ManagementRepositoryProbe.java
@@ -39,11 +39,17 @@ public String id() {
 
     @Override
     public CompletableFuture<Result> check() {
-        // Search for an event to check repository connection
         try {
-            eventRepository.search(new EventCriteria.Builder()
-                    .from(System.currentTimeMillis()).to(System.currentTimeMillis()).build());
-            return CompletableFuture.completedFuture(Result.healthy());
+            // Search for an event to check repository connection
+            return CompletableFuture.supplyAsync(() -> {
+                try {
+                    eventRepository.search(new EventCriteria.Builder()
+                            .from(System.currentTimeMillis()).to(System.currentTimeMillis()).build());
+                    return Result.healthy();
+                } catch (Exception ex) {
+                    return Result.unhealthy(ex);
+                }
+            });
         } catch (Exception ex) {
             return CompletableFuture.completedFuture(Result.unhealthy(ex));
         }

diff --git a/...ry/src/main/java/io/gravitee/gateway/repository/healthcheck/RateLimitRepositoryProbe.java b/...ry/src/main/java/io/gravitee/gateway/repository/healthcheck/RateLimitRepositoryProbe.java
@@ -40,10 +40,16 @@ public String id() {
 
     @Override
     public CompletableFuture<Result> check() {
-        // Search for a rate-limit value to check repository connection
         try {
-            rateLimitRepository.get(RATE_LIMIT_UNKNOWN_IDENTIFIER);
-            return CompletableFuture.completedFuture(Result.healthy());
+            // Search for a rate-limit value to check repository connection
+            return CompletableFuture.supplyAsync(() -> {
+                try {
+                    rateLimitRepository.get(RATE_LIMIT_UNKNOWN_IDENTIFIER);
+                    return Result.healthy();
+                } catch (Exception ex) {
+                    return Result.unhealthy(ex);
+                }
+            });
         } catch (Exception ex) {
             return CompletableFuture.completedFuture(Result.unhealthy(ex));
         }