You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2016/04/12 02:54:57 UTC

incubator-apex-core git commit: APEXCORE-427 Made pubsub connect timeout configurable

Repository: incubator-apex-core
Updated Branches:
  refs/heads/master 750d90d46 -> d027118cd


APEXCORE-427 Made pubsub connect timeout configurable


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/d027118c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d027118c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d027118c

Branch: refs/heads/master
Commit: d027118cdecdf8b2255dc0a623ccebba2c09af2c
Parents: 750d90d
Author: David Yan <da...@datatorrent.com>
Authored: Mon Apr 11 16:46:43 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Mon Apr 11 17:51:12 2016 -0700

----------------------------------------------------------------------
 api/src/main/java/com/datatorrent/api/Context.java               | 4 ++++
 .../java/com/datatorrent/stram/StreamingContainerManager.java    | 3 ++-
 .../com/datatorrent/stram/StreamingContainerManagerTest.java     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d027118c/api/src/main/java/com/datatorrent/api/Context.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/com/datatorrent/api/Context.java b/api/src/main/java/com/datatorrent/api/Context.java
index 31b36e5..7e19a56 100644
--- a/api/src/main/java/com/datatorrent/api/Context.java
+++ b/api/src/main/java/com/datatorrent/api/Context.java
@@ -438,6 +438,10 @@ public interface Context
      */
     Attribute<String> GATEWAY_PASSWORD = new Attribute<String>(new String2String());
     /**
+     * The timeout when connecting to the pubsub service in gateway
+     */
+    Attribute<Integer> PUBSUB_CONNECT_TIMEOUT_MILLIS = new Attribute<>(500);
+    /**
      * Maximum number of simultaneous heartbeat connections to process. Default value is 30.
      */
     Attribute<Integer> HEARTBEAT_LISTENER_THREAD_COUNT = new Attribute<Integer>(30);

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d027118c/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
index 9e184e7..6a8ee9c 100644
--- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
+++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
@@ -547,10 +547,11 @@ public class StreamingContainerManager implements PlanContext
     boolean gatewayUseSsl = plan.getLogicalPlan().getValue(LogicalPlan.GATEWAY_USE_SSL);
     String gatewayUserName = plan.getLogicalPlan().getValue(LogicalPlan.GATEWAY_USER_NAME);
     String gatewayPassword = plan.getLogicalPlan().getValue(LogicalPlan.GATEWAY_PASSWORD);
+    int timeout = plan.getLogicalPlan().getValue(LogicalPlan.PUBSUB_CONNECT_TIMEOUT_MILLIS);
 
     if (gatewayAddress != null) {
       try {
-        wsClient = new SharedPubSubWebSocketClient((gatewayUseSsl ? "wss://" : "ws://") + gatewayAddress + "/pubsub", 500);
+        wsClient = new SharedPubSubWebSocketClient((gatewayUseSsl ? "wss://" : "ws://") + gatewayAddress + "/pubsub", timeout);
         if (gatewayUserName != null && gatewayPassword != null) {
           wsClient.setLoginUrl((gatewayUseSsl ? "https://" : "http://") + gatewayAddress + GATEWAY_LOGIN_URL_PATH);
           wsClient.setUserName(gatewayUserName);

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d027118c/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
index f29403a..1c052bd 100644
--- a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
@@ -952,6 +952,8 @@ public class StreamingContainerManagerTest
       dag.addStream("o1.outport", o1.outport, o2.inport1);
       dag.setAttribute(LogicalPlan.METRICS_TRANSPORT, new AutoMetricBuiltInTransport(topic));
       dag.setAttribute(LogicalPlan.GATEWAY_CONNECT_ADDRESS, "localhost:" + port);
+      dag.setAttribute(LogicalPlan.PUBSUB_CONNECT_TIMEOUT_MILLIS, 2000);
+
       StramLocalCluster lc = new StramLocalCluster(dag);
       StreamingContainerManager dnmgr = lc.dnmgr;
       StramAppContext appContext = new StramTestSupport.TestAppContext(dag.getAttributes());