Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2061

Change subject: [NO ISSUE][*DB][API] Emit exception text on diag eval error
......................................................................

[NO ISSUE][*DB][API] Emit exception text on diag eval error

Failure to evaluate diagnostic info generates log & emits exception
string as value, instead of generating 500 & displaying no diag info

Change-Id: Ib4997c57ec3aca4b17c975098865486a6cd72531
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/61/2061/1

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java
index 3fe591f..b828b32 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java
@@ -128,10 +128,15 @@
     }
 
     protected Map<String, JsonNode> resolveFutures(Map<String, 
Future<JsonNode>> futureMap)
-            throws ExecutionException, InterruptedException {
+            throws InterruptedException {
         Map<String, JsonNode> result = new HashMap<>();
         for (Map.Entry<String, Future<JsonNode>> entry : futureMap.entrySet()) 
{
-            result.put(entry.getKey(), entry.getValue().get());
+            try {
+                result.put(entry.getKey(), entry.getValue().get());
+            } catch (ExecutionException e) {
+                LOGGER.log(Level.WARNING, "unexpected exception obtaining 
value for " + entry.getKey(), e);
+                result.put(entry.getKey(), new TextNode("unexpected error, see 
logs for details: " + e));
+            }
         }
         return result;
     }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2061
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4997c57ec3aca4b17c975098865486a6cd72531
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>

Reply via email to