DRILL-6151: Fragment executors may terminate without sending final batch to a downstream causing query to hang
closes #1151 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/fe05ba00 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/fe05ba00 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/fe05ba00 Branch: refs/heads/master Commit: fe05ba001986f9c8fc3cc34387353383e93b433a Parents: c5ae560 Author: Vlad Rozov <vro...@apache.org> Authored: Tue Mar 6 09:12:32 2018 -0800 Committer: Ben-Zvi <bben-...@mapr.com> Committed: Wed Mar 7 15:32:02 2018 -0800 ---------------------------------------------------------------------- .../org/apache/drill/exec/work/fragment/FragmentExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/fe05ba00/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java index 7b9d524..4f43dc1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java @@ -245,8 +245,8 @@ public class FragmentExecutor implements Runnable { // we have a heap out of memory error. The JVM in unstable, exit. CatastrophicFailure.exit(e, "Unable to handle out of memory condition in FragmentExecutor.", -2); } - } catch (AssertionError | Exception e) { - fail(e); + } catch (Throwable t) { + fail(t); } finally { // no longer allow this thread to be interrupted. We synchronize here to make sure that cancel can't set an
