drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From par...@apache.org
Subject [1/2] drill git commit: DRIL-2994: Incorrect error message when disconnecting from a direct drillbit connection
Date Fri, 08 May 2015 23:48:32 GMT
Repository: drill
Updated Branches:
  refs/heads/master 7abd7cf4e -> c2bd69879


DRIL-2994: Incorrect error message when disconnecting from a direct drillbit connection


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/33713f84
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/33713f84
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/33713f84

Branch: refs/heads/master
Commit: 33713f8459929c16f3f8308a31cdcb55f8c8574b
Parents: 7abd7cf
Author: Parth Chandra <parthc@apache.org>
Authored: Fri May 8 11:38:49 2015 -0700
Committer: Parth Chandra <parthc@apache.org>
Committed: Fri May 8 16:45:10 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/drill/exec/client/DrillClient.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/33713f84/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
index 5b28f16..9924704 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
@@ -123,7 +123,7 @@ public class DrillClient implements Closeable, ConnectionThrottle {
     // if isDirect is true, the client will connect directly to the drillbit instead of
     // going thru the zookeeper
     this.isDirectConnection = isDirect;
-    this.ownsZkConnection = coordinator == null;
+    this.ownsZkConnection = coordinator == null && !isDirect;
     this.ownsAllocator = allocator == null;
     this.allocator = ownsAllocator ? new TopLevelAllocator(config) : allocator;
     this.config = config;


Mime
View raw message