catch exceptions on DistributedContextManager context creation (e.g. …

…circuit break could occur)
crate · Dec 1, 2014 · 0d11461 · 0d11461
1 parent a8f47d8
commit 0d11461
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/sql/src/main/java/io/crate/action/sql/TransportBaseSQLAction.java b/sql/src/main/java/io/crate/action/sql/TransportBaseSQLAction.java
@@ -219,7 +219,7 @@ public void onSuccess(@Nullable List<TaskResult> result) {
                         );
                     }
                 } catch (Throwable e) {
-                    sendResponse(listener, e);
+                    sendResponse(listener, buildSQLActionException(e));
                     return;
                 }
 

diff --git a/sql/src/main/java/io/crate/executor/transport/merge/TransportMergeNodeAction.java b/sql/src/main/java/io/crate/executor/transport/merge/TransportMergeNodeAction.java
@@ -200,7 +200,7 @@ public void onFailure(Throwable e) {
                                     listener.onFailure(e);
                                 }
                             });
-                        } catch (IOException e) {
+                        } catch (Exception e) {
                             logger.error("createContext.catched local exception node: {}", nodeId, e);
                             listener.onFailure(e);
                         }
@@ -249,25 +249,29 @@ public NodeMergeRequest newInstance() {
 
         @Override
         public void messageReceived(final NodeMergeRequest request, final TransportChannel channel) throws Exception {
-            contextManager.createContext(request.mergeNode(), new ActionListener<NodeMergeResponse>() {
-                @Override
-                public void onResponse(NodeMergeResponse nodeMergeResponse) {
-                    try {
-                        channel.sendResponse(nodeMergeResponse);
-                    } catch (IOException e) {
-                        onFailure(e);
+            try {
+                contextManager.createContext(request.mergeNode(), new ActionListener<NodeMergeResponse>() {
+                    @Override
+                    public void onResponse(NodeMergeResponse nodeMergeResponse) {
+                        try {
+                            channel.sendResponse(nodeMergeResponse);
+                        } catch (IOException e) {
+                            onFailure(e);
+                        }
                     }
-                }
-
-                @Override
-                public void onFailure(Throwable e) {
-                    try {
-                        channel.sendResponse(e);
-                    } catch (IOException e1) {
-                        logger.error(e.getMessage(), e);
+
+                    @Override
+                    public void onFailure(Throwable e) {
+                        try {
+                            channel.sendResponse(e);
+                        } catch (IOException e1) {
+                            logger.error(e.getMessage(), e);
+                        }
                     }
-                }
-            });
+                });
+            } catch (Exception e) {
+                channel.sendResponse(e);
+            }
         }
 
         @Override

diff --git a/sql/src/test/java/io/crate/integrationtests/GroupByAggregateBreakerTest.java b/sql/src/test/java/io/crate/integrationtests/GroupByAggregateBreakerTest.java
@@ -67,7 +67,7 @@ public void initTestData() {
     @Test
     public void selectGroupByWithBreaking() throws Exception {
         expectedException.expect(SQLActionException.class);
-        expectedException.expectMessage(Matchers.startsWith("Too much HEAP memory used by [distributing collect:"));
+        expectedException.expectMessage(Matchers.startsWith("Too much HEAP memory used by "));
         execute("select name, department, max(income), min(age) from employees group by name, department order by 3");
     }
 }