Repository: tajo Updated Branches: refs/heads/master c294d88e1 -> 59cb66fc4
TAJO-1703: Remove hardcoded value in NodeStatusUpdater. (jinho) Closes #649 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/59cb66fc Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/59cb66fc Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/59cb66fc Branch: refs/heads/master Commit: 59cb66fc40b78d1f884f008796b85312d6ae8c72 Parents: c294d88 Author: Jinho Kim <[email protected]> Authored: Fri Jul 24 18:48:16 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Fri Jul 24 18:48:16 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 1 + .../src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/59cb66fc/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 287c371..1bf16f0 100644 --- a/CHANGES +++ b/CHANGES @@ -32,6 +32,8 @@ Release 0.11.0 - unreleased IMPROVEMENT + TAJO-1703: Remove hardcoded value in NodeStatusUpdater. (jinho) + TAJO-1701: Remove forward or non-forward query concept in TajoClient. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/59cb66fc/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java index b16e55f..3336be6 100644 --- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java +++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java @@ -187,6 +187,7 @@ public class TajoConf extends Configuration { WORKER_HISTORY_EXPIRE_PERIOD("tajo.worker.history.expire-interval-minutes", 60), // 1 hours QUERYMASTER_CACHE_EXPIRE_PERIOD("tajo.qm.history.expire-interval-minutes", 10), // 10 mins + WORKER_HEARTBEAT_QUEUE_THRESHOLD_RATE("tajo.worker.heartbeat.queue.threshold-rate", 0.3f, Validators.min("0")),//30% WORKER_HEARTBEAT_IDLE_INTERVAL("tajo.worker.heartbeat.idle.interval", 10 * 1000), // 10 sec WORKER_HEARTBEAT_ACTIVE_INTERVAL("tajo.worker.heartbeat.active.interval", 1000), // 1 sec http://git-wip-us.apache.org/repos/asf/tajo/blob/59cb66fc/tajo-core/src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java b/tajo-core/src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java index 5d91cc6..bc4f9a1 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/NodeStatusUpdater.java @@ -87,12 +87,13 @@ public class NodeStatusUpdater extends AbstractService implements EventHandler<N @Override public void serviceStart() throws Exception { - // if resource changed over than 50%, send reports DefaultResourceCalculator calculator = new DefaultResourceCalculator(); int maxContainer = calculator.computeAvailableContainers(workerContext.getNodeResourceManager().getTotalResource(), NodeResources.createResource(tajoConf.getIntVar(TajoConf.ConfVars.TASK_RESOURCE_MINIMUM_MEMORY), 1)); - this.queueingThreshold = Math.max((int) Math.floor(maxContainer * 0.5), 1); + // if resource changed over than 30%, send reports + float queueingRate = tajoConf.getFloatVar(TajoConf.ConfVars.WORKER_HEARTBEAT_QUEUE_THRESHOLD_RATE); + this.queueingThreshold = Math.max((int) Math.floor(maxContainer * queueingRate), 1); LOG.info("Queueing threshold:" + queueingThreshold); updaterThread.start();
