You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2013/09/10 03:48:53 UTC
git commit: TAJO-172: TajoWorker allocate wrong container
slots.(jinho)
Updated Branches:
refs/heads/master 2a26edffe -> 23c046990
TAJO-172: TajoWorker allocate wrong container slots.(jinho)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/23c04699
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/23c04699
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/23c04699
Branch: refs/heads/master
Commit: 23c046990d5d57ac7642d267762e76d1f3e56837
Parents: 2a26edf
Author: jinossy <ji...@gmail.com>
Authored: Tue Sep 10 10:47:55 2013 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Tue Sep 10 10:47:55 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../src/main/java/org/apache/tajo/worker/TajoWorker.java | 6 ++----
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/23c04699/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7186074..2dd2cd6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -133,6 +133,8 @@ Release 0.2.0 - unreleased
BUG FIXES
+ TAJO-172: TajoWorker allocate wrong container slots.(jinho)
+
TAJO-174: SQL error handler sometimes occurred NPE. (jinho)
TAJO-170: mvn compile error when building tar file. (jaehwa)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/23c04699/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
index ff25fb3..da8c062 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorker.java
@@ -23,14 +23,12 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.service.CompositeService;
import org.apache.hadoop.yarn.util.RackResolver;
import org.apache.tajo.QueryId;
import org.apache.tajo.TajoConstants;
import org.apache.tajo.TajoProtos;
import org.apache.tajo.catalog.CatalogClient;
-import org.apache.tajo.catalog.CatalogConstants;
import org.apache.tajo.catalog.CatalogService;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.ipc.TajoMasterProtocol;
@@ -317,7 +315,7 @@ public class TajoWorker extends CompositeService {
int workerMemoryMBSlots;
int workerCpuCoreSlots;
- boolean useSystemInfo = tajoConf.getBoolean("tajo.worker.slots.use.os.info", true);
+ boolean useSystemInfo = tajoConf.getBoolean("tajo.worker.slots.use.os.info", false);
try {
mountPaths = getMountPath();
@@ -476,7 +474,7 @@ public class TajoWorker extends CompositeService {
(com.sun.management.OperatingSystemMXBean)
java.lang.management.ManagementFactory.getOperatingSystemMXBean();
long max = bean.getTotalPhysicalMemorySize();
- return ((int)(max/1024));
+ return ((int) (max / (1024 * 1024)));
}
public static void main(String[] args) throws Exception {