trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [2/3] incubator-trafodion git commit: [TRAFODION-2235] Changed EPOLL logic and ZClient to handle transient errors with Zookeeper quorum.
Date Fri, 18 Nov 2016 17:02:09 GMT
[TRAFODION-2235] Changed EPOLL logic and ZClient to handle transient
errors with Zookeeper quorum.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/75ecdc71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/75ecdc71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/75ecdc71

Branch: refs/heads/master
Commit: 75ecdc713e1c6f86cc4339ccd382d73ee771eb18
Parents: 5f89eb2
Author: Zalo Correa <zalo.correa@esgyn.com>
Authored: Fri Nov 18 04:42:27 2016 -0800
Committer: Zalo Correa <zalo.correa@esgyn.com>
Committed: Fri Nov 18 04:42:27 2016 -0800

----------------------------------------------------------------------
 core/sqf/monitor/linux/cluster.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/75ecdc71/core/sqf/monitor/linux/cluster.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/cluster.cxx b/core/sqf/monitor/linux/cluster.cxx
index 916a301..93362a3 100644
--- a/core/sqf/monitor/linux/cluster.cxx
+++ b/core/sqf/monitor/linux/cluster.cxx
@@ -4326,7 +4326,8 @@ int CCluster::AllgatherSock( int nbytes, void *sbuf, char *rbuf, int
tag, MPI_St
     tag = 0; // make compiler happy
     struct timespec currentTime;
     // Set to twice the ZClient session timeout
-    static int sessionTimeout = (ZClient->GetSessionTimeout() * 2);
+    static int sessionTimeout = ZClientEnabled 
+                                ? (ZClient->GetSessionTimeout() * 2) : 120;
 
     int nsent = 0, nrecv = 0;
     for ( int iPeer = 0; iPeer < cfgPNodes_; iPeer++ )


Mime
View raw message