storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: STORM-2551: Add socket timeout for Thrift client
Date Thu, 22 Jun 2017 16:02:25 GMT
Repository: storm
Updated Branches:
  refs/heads/master 980c65573 -> 27e3f6a8d


STORM-2551: Add socket timeout for Thrift client


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3811e5c7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3811e5c7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3811e5c7

Branch: refs/heads/master
Commit: 3811e5c7a97d3d502d5b79f905017e1ad78acfe4
Parents: 38e997e
Author: Jordi Esteban <jesteban@iris.cat>
Authored: Tue Jun 13 17:52:08 2017 +0200
Committer: Jordi Esteban <jesteban@iris.cat>
Committed: Thu Jun 22 15:38:29 2017 +0200

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/security/auth/ThriftClient.java     | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3811e5c7/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
index febf5e2..ff3227f 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
@@ -56,6 +56,10 @@ public class ThriftClient implements AutoCloseable {
             port = type.getPort(topoConf);
         }
 
+        if (timeout == null) {
+            timeout = type.getSocketTimeOut(topoConf);
+        }
+
         if (port<=0 && !type.isFake()) {
             throw new IllegalArgumentException("invalid port: "+port);
         }          


Mime
View raw message