Repository: incubator-hawq Updated Branches: refs/heads/master 14c2d492d -> 7c05a23f0
HAWQ-1188. Fix guc type issue for Gp_interconnect_transmit_timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/7c05a23f Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/7c05a23f Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/7c05a23f Branch: refs/heads/master Commit: 7c05a23f0ef6ccb8d5d6d5f613683f8d18e29426 Parents: 14c2d49 Author: ivan <[email protected]> Authored: Mon Dec 5 15:27:32 2016 +0800 Committer: ivan <[email protected]> Committed: Mon Dec 5 15:27:32 2016 +0800 ---------------------------------------------------------------------- src/backend/cdb/cdbvars.c | 2 +- src/backend/cdb/motion/ic_udp.c | 4 ++-- src/include/cdb/cdbvars.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7c05a23f/src/backend/cdb/cdbvars.c ---------------------------------------------------------------------- diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c index 026a765..c2fca21 100644 --- a/src/backend/cdb/cdbvars.c +++ b/src/backend/cdb/cdbvars.c @@ -148,7 +148,7 @@ int Gp_interconnect_timer_checking_period=20; int Gp_interconnect_default_rtt=20; int Gp_interconnect_min_rto=20; int Gp_interconnect_fc_method=INTERCONNECT_FC_METHOD_LOSS; -int64 Gp_interconnect_transmit_timeout=3600; +int Gp_interconnect_transmit_timeout=3600; int Gp_interconnect_min_retries_before_timeout=100; int Gp_interconnect_hash_multiplier=2; /* sets the size of the hash table used by the UDP-IC */ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7c05a23f/src/backend/cdb/motion/ic_udp.c ---------------------------------------------------------------------- diff --git a/src/backend/cdb/motion/ic_udp.c b/src/backend/cdb/motion/ic_udp.c index 2b68f15..bcc959b 100644 --- a/src/backend/cdb/motion/ic_udp.c +++ b/src/backend/cdb/motion/ic_udp.c @@ -5202,7 +5202,7 @@ checkNetworkTimeout(ICBuffer *buf, uint64 now) * by OS for a long time. In this case, only a few times are tried. * Thus, the GUC Gp_interconnect_min_retries_before_timeout is added here. */ - if ((buf->nRetry > Gp_interconnect_min_retries_before_timeout) && (now - buf->sentTime) > (Gp_interconnect_transmit_timeout * 1000 * 1000)) + if ((buf->nRetry > Gp_interconnect_min_retries_before_timeout) && (now - buf->sentTime) > ((uint64)Gp_interconnect_transmit_timeout * 1000 * 1000)) { ereport(ERROR, (errcode(ERRCODE_GP_INTERCONNECTION_ERROR), errmsg("Interconnect encountered a network error, please check your network"), @@ -5316,7 +5316,7 @@ checkDeadlock(ChunkTransportStateEntry *pEntry, MotionConn *conn) ic_statistics.statusQueryMsgNum++; /* check network error. */ - if ((now - conn->deadlockCheckBeginTime) > (Gp_interconnect_transmit_timeout * 1000 * 1000)) + if ((now - conn->deadlockCheckBeginTime) > ((uint64)Gp_interconnect_transmit_timeout * 1000 * 1000)) { ereport(ERROR, (errcode(ERRCODE_GP_INTERCONNECTION_ERROR), errmsg("Interconnect encountered a network error, please check your network"), http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7c05a23f/src/include/cdb/cdbvars.h ---------------------------------------------------------------------- diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h index 8a15877..9f6c3b1 100644 --- a/src/include/cdb/cdbvars.h +++ b/src/include/cdb/cdbvars.h @@ -463,7 +463,7 @@ extern int Gp_interconnect_timer_period; extern int Gp_interconnect_timer_checking_period; extern int Gp_interconnect_default_rtt; extern int Gp_interconnect_min_rto; -extern int64 Gp_interconnect_transmit_timeout; +extern int Gp_interconnect_transmit_timeout; extern int Gp_interconnect_min_retries_before_timeout; /* UDP recv buf size in KB. For testing */
