diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 089b88c..5c87d97 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2574,7 +2574,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "The port of ZooKeeper servers to talk to.\n" + "If the list of Zookeeper servers specified in hive.zookeeper.quorum\n" + "does not contain port numbers, this value is used."), - HIVE_ZOOKEEPER_SESSION_TIMEOUT("hive.zookeeper.session.timeout", "1200000ms", + HIVE_ZOOKEEPER_SESSION_TIMEOUT("hive.zookeeper.session.timeout", "120000ms", new TimeValidator(TimeUnit.MILLISECONDS), "ZooKeeper client's session timeout (in milliseconds). The client is disconnected, and as a result, all locks released, \n" + "if a heartbeat is not sent in the timeout."), diff --git ql/src/test/results/clientpositive/show_conf.q.out ql/src/test/results/clientpositive/show_conf.q.out index 7e65dfd..a867d76 100644 --- ql/src/test/results/clientpositive/show_conf.q.out +++ ql/src/test/results/clientpositive/show_conf.q.out @@ -7,4 +7,4 @@ PREHOOK: query: show conf "hive.zookeeper.session.timeout" PREHOOK: type: SHOWCONF POSTHOOK: query: show conf "hive.zookeeper.session.timeout" POSTHOOK: type: SHOWCONF -1200000ms STRING(TIME) Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is msec if not specified. ZooKeeper client's session timeout (in milliseconds). The client is disconnected, and as a result, all locks released, if a heartbeat is not sent in the timeout. +120000ms STRING(TIME) Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is msec if not specified. ZooKeeper client's session timeout (in milliseconds). The client is disconnected, and as a result, all locks released, if a heartbeat is not sent in the timeout.