DRILL-6007: Use default refresh timeout (10 seconds) if graceful shutdown timeout is set to 0.
closes #1062 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/aa6666e6 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/aa6666e6 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/aa6666e6 Branch: refs/heads/master Commit: aa6666e6700566719c00614a58ce5b861c79e2a5 Parents: b346795 Author: Arina Ielchiieva <arina.yelchiy...@gmail.com> Authored: Tue Dec 5 19:13:09 2017 +0200 Committer: Arina Ielchiieva <arina.yelchiy...@gmail.com> Committed: Sat Dec 9 15:50:56 2017 +0200 ---------------------------------------------------------------------- .../apache/drill/exec/client/DrillClient.java | 2 +- .../drill/exec/server/rest/DrillRoot.java | 2 +- .../java-exec/src/main/resources/rest/index.ftl | 27 ++++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/aa6666e6/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java index 248058f..71acfb1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java @@ -440,7 +440,7 @@ public class DrillClient implements Closeable, ConnectionThrottle { private void connect(DrillbitEndpoint endpoint) throws RpcException { client.connect(endpoint, properties, getUserCredentials()); - logger.info("Foreman drillbit is" + endpoint.getAddress()); + logger.info("Foreman drillbit is {}", endpoint.getAddress()); } public BufferAllocator getAllocator() { http://git-wip-us.apache.org/repos/asf/drill/blob/aa6666e6/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java index 94e607c..02f2731 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java @@ -103,7 +103,7 @@ public class DrillRoot { final DrillConfig config = work.getContext().getConfig(); final int gracePeriod = config.getInt(ExecConstants.GRACE_PERIOD); Map<String, Integer> gracePeriodMap = new HashMap<String, Integer>(); - gracePeriodMap.put("graceperiod", gracePeriod); + gracePeriodMap.put("gracePeriod", gracePeriod); return gracePeriodMap; } http://git-wip-us.apache.org/repos/asf/drill/blob/aa6666e6/exec/java-exec/src/main/resources/rest/index.ftl ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/rest/index.ftl b/exec/java-exec/src/main/resources/rest/index.ftl index 18be7a9..6466701 100644 --- a/exec/java-exec/src/main/resources/rest/index.ftl +++ b/exec/java-exec/src/main/resources/rest/index.ftl @@ -187,11 +187,10 @@ </div> </div> <script charset="utf-8"> - var refreshTime = 2000; + var refreshTime = 10000; var refresh = getRefreshTime(); var portNum = 0; var port = getPortNum(); - console.log(portNum); var timeout; var size = $("#size").html(); @@ -208,19 +207,21 @@ } function getRefreshTime() { - var refresh = $.ajax({ - type: 'GET', - url: '/gracePeriod', - dataType: "json", - complete: function(data) { - refreshTime = data.responseJSON["graceperiod"]; - refreshTime = refreshTime/3; - timeout = setTimeout(reloadStatus,refreshTime ); - } - }); + $.ajax({ + type: 'GET', + url: '/gracePeriod', + dataType: "json", + complete: function (data) { + var gracePeriod = data.responseJSON["gracePeriod"]; + if (gracePeriod > 0) { + refreshTime = gracePeriod / 3; + } + timeout = setTimeout(reloadStatus, refreshTime); + } + }); } + function reloadStatus () { - console.log(refreshTime); var result = $.ajax({ type: 'GET', url: '/state',