You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2017/10/11 21:28:00 UTC

asterixdb git commit: [NO ISSUE][HYR] Only attempt one reconnect when using IPC handle

Repository: asterixdb
Updated Branches:
  refs/heads/master 086cb05bb -> 94b141bc5


[NO ISSUE][HYR] Only attempt one reconnect when using IPC handle

Change-Id: I6801c47c251df0360133b010d16869854ac3b817
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2068
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Integration-Tests: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/94b141bc
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/94b141bc
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/94b141bc

Branch: refs/heads/master
Commit: 94b141bc5a667efddcb3e1af6c8e6cee9544a305
Parents: 086cb05
Author: Michael Blow <mi...@couchbase.com>
Authored: Wed Oct 11 17:24:55 2017 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Wed Oct 11 14:27:42 2017 -0700

----------------------------------------------------------------------
 .../hyracks/control/common/ipc/ClusterControllerRemoteProxy.java   | 2 +-
 .../hyracks/control/common/ipc/NodeControllerRemoteProxy.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/94b141bc/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
index ede2c41..c09f317 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
@@ -53,7 +53,7 @@ public class ClusterControllerRemoteProxy extends ControllerRemoteProxy implemen
     @Override
     protected int getMaxRetries(boolean first) {
         // -1 == retry forever
-        return first ? clusterConnectRetries : -1;
+        return first ? clusterConnectRetries : 0;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/94b141bc/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
index 41284a9..3819ef8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
@@ -50,7 +50,7 @@ public class NodeControllerRemoteProxy extends ControllerRemoteProxy implements
     @Override
     protected int getMaxRetries(boolean first) {
         // -1 == retry forever
-        return -1;
+        return 0;
     }
 
     @Override