Repository: incubator-trafodion Updated Branches: refs/heads/master 2d93f397b -> c619c1e81
[TRAFODION-2235] Changed EPOLL timeout default values. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0ddd1093 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0ddd1093 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0ddd1093 Branch: refs/heads/master Commit: 0ddd1093a7003ff9f05ec9b1fcdeb17cab20fd63 Parents: 2c3c7c5 Author: Zalo Correa <[email protected]> Authored: Sun Oct 30 08:41:18 2016 -0700 Committer: Zalo Correa <[email protected]> Committed: Sun Oct 30 08:41:18 2016 -0700 ---------------------------------------------------------------------- core/sqf/monitor/linux/cluster.cxx | 6 +++--- core/sqf/sqenvcom.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ddd1093/core/sqf/monitor/linux/cluster.cxx ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/linux/cluster.cxx b/core/sqf/monitor/linux/cluster.cxx index b33950d..2407c04 100644 --- a/core/sqf/monitor/linux/cluster.cxx +++ b/core/sqf/monitor/linux/cluster.cxx @@ -4373,9 +4373,9 @@ int CCluster::AllgatherSock( int nbytes, void *sbuf, char *rbuf, int tag, MPI_St } else { - // default to 60 seconds - sv_epoll_wait_timeout = 1000; - sv_epoll_retry_count = 60; + // default to 64 seconds + sv_epoll_wait_timeout = 4000; + sv_epoll_retry_count = 16; } char buf[MON_STRING_BUF_SIZE]; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ddd1093/core/sqf/sqenvcom.sh ---------------------------------------------------------------------- diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh index 5be3c75..79e46d7 100644 --- a/core/sqf/sqenvcom.sh +++ b/core/sqf/sqenvcom.sh @@ -683,9 +683,9 @@ export SQ_MON_KEEPINTVL=6 export SQ_MON_KEEPCNT=5 # Monitor sync thread epoll wait timeout is in seconds -# Currently set to 60 seconds internally (1 second timeout, 60 retries) -#export SQ_MON_EPOLL_WAIT_TIMEOUT=5 -#export SQ_MON_EPOLL_RETRY_COUNT=12 +# Currently set to 64 seconds (4 second timeout, 16 retries) +export SQ_MON_EPOLL_WAIT_TIMEOUT=4 +export SQ_MON_EPOLL_RETRY_COUNT=16 # Monitor Zookeeper client # - A zero value disables the zclient logic in the monitor process.
