tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-2065: Increase default heap size.
Date Thu, 28 Jan 2016 06:55:12 GMT
Repository: tajo
Updated Branches:
  refs/heads/branch-0.11.1 fcc2215fb -> b198935cd


TAJO-2065: Increase default heap size.


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/b198935c
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/b198935c
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/b198935c

Branch: refs/heads/branch-0.11.1
Commit: b198935cd94fc57bfc35347c4bf1665257900ef3
Parents: fcc2215
Author: Jinho Kim <jhkim@apache.org>
Authored: Thu Jan 28 15:54:31 2016 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Thu Jan 28 15:54:31 2016 +0900

----------------------------------------------------------------------
 CHANGES                                               |  2 ++
 .../src/main/java/org/apache/tajo/conf/TajoConf.java  |  4 ++--
 tajo-dist/src/main/bin/tajo                           |  4 ++--
 tajo-dist/src/main/conf/tajo-env.sh                   |  8 ++++----
 tajo-dist/src/main/conf/tajo-site.xml.template        | 10 +++++-----
 .../sphinx/configuration/worker_configuration.rst     | 14 +++++++-------
 6 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e06a176..247f9ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -111,6 +111,8 @@ Release 0.11.1 - unreleased
 
   TASKS
 
+    TAJO-2065: Increase default heap size. (jinho)
+
     TAJO-2041: Update the Team page. (jaehwa)
 
     TAJO-2018: Remove redundant 'String.toString()'. (Dongkyu Hwangbo via jinho)

http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/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 33f5799..e9e8e5b 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
@@ -161,7 +161,7 @@ public class TajoConf extends Configuration {
     QUERYMASTER_MINIMUM_MEMORY("tajo.qm.resource.min.memory-mb", 500, Validators.min("64")),
 
     // Worker task resource
-    TASK_RESOURCE_MINIMUM_MEMORY("tajo.task.resource.min.memory-mb", 500, Validators.min("64")),
+    TASK_RESOURCE_MINIMUM_MEMORY("tajo.task.resource.min.memory-mb", 1000, Validators.min("64")),
 
     // Tajo Worker Service Addresses
     WORKER_INFO_ADDRESS("tajo.worker.info-http.address", "0.0.0.0:28080", Validators.networkAddr()),
@@ -179,7 +179,7 @@ public class TajoConf extends Configuration {
         Runtime.getRuntime().availableProcessors(), Validators.min("2")), // 1qm + 1task
     WORKER_RESOURCE_AVAILABLE_MEMORY_MB("tajo.worker.resource.memory-mb", 1000, Validators.min("64")),
 
-    WORKER_RESOURCE_AVAILABLE_DISKS("tajo.worker.resource.disks", 1, Validators.min("1")),
+    WORKER_RESOURCE_AVAILABLE_DISKS("tajo.worker.resource.disks", 2, Validators.min("1")),
 
     WORKER_RESOURCE_AVAILABLE_DISK_PARALLEL_NUM("tajo.worker.resource.disk.parallel-execution.num",
2,
         Validators.min("1")),

http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index e6edf14..c08c538 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -35,7 +35,7 @@
 #                         Default is 1000.
 #
 #   TAJO_WORKER_HEAPSIZE  The maximum amount of heap to use, in MB. 
-#                         Default is 1000.
+#                         Default is 5000.
 #
 #   TAJO_OPTS      Extra Java runtime options.
 
@@ -118,7 +118,7 @@ fi
 
 JAVA=$JAVA_HOME/bin/java
 JAVA_TAJO_MASTER_HEAP_MAX=-Xmx1000m 
-JAVA_WORKER_HEAP_MAX=-Xmx1000m
+JAVA_WORKER_HEAP_MAX=-Xmx5000m
 JAVA_QUERYMASTER_HEAP_MAX=-Xmx1000m
 JAVA_PULLSERVER_HEAP_MAX=-Xmx1000m
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/tajo-dist/src/main/conf/tajo-env.sh
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/conf/tajo-env.sh b/tajo-dist/src/main/conf/tajo-env.sh
index ecbb8b8..faf2a6e 100755
--- a/tajo-dist/src/main/conf/tajo-env.sh
+++ b/tajo-dist/src/main/conf/tajo-env.sh
@@ -33,8 +33,8 @@
 # The maximum amount of heap to use, in MB. Default is 1000.
 # export TAJO_MASTER_HEAPSIZE=1000
 
-# The maximum amount of heap to use, in MB. Default is 1000.
-# export TAJO_WORKER_HEAPSIZE=1000
+# The maximum amount of heap to use, in MB. Default is 5000.
+# export TAJO_WORKER_HEAPSIZE=5000
 
 # The maximum amount of heap to use, in MB. Default is 1000.
 # export TAJO_PULLSERVER_HEAPSIZE=1000
@@ -48,8 +48,8 @@
 # Extra TajoMaster's java runtime options for TajoMaster. Empty by default
 # export TAJO_MASTER_OPTS=
 
-# Extra TajoWorker's java runtime options. Empty by default
-# export TAJO_WORKER_OPTS=
+# Extra TajoWorker's java runtime options.
+export TAJO_WORKER_OPTS='-XX:+UseParallelOldGC'
 
 # Extra TajoPullServer's java runtime options. Empty by default
 # export TAJO_PULLSERVER_OPTS=

http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/tajo-dist/src/main/conf/tajo-site.xml.template
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/conf/tajo-site.xml.template b/tajo-dist/src/main/conf/tajo-site.xml.template
index a6f5dd6..4982cb2 100644
--- a/tajo-dist/src/main/conf/tajo-site.xml.template
+++ b/tajo-dist/src/main/conf/tajo-site.xml.template
@@ -60,19 +60,19 @@
 <!--
 <property>
   <name>tajo.worker.resource.cpu-cores</name>
-  <value>1</value>
+  <value>4</value>
   <description>Number of CPU cores</description>
 </property>
 
 <property>
-  <name>tajo.worker.resource.memory-mb</name>
-  <value>1024</value>
-  <description>Available memory size (MB)</description>
+  <name>tajo.task.resource.min.memory-mb</name>
+  <value>2000</value>
+  <description>Minimum allocatable memory per task</description>
 </property>
 
 <property>
   <name>tajo.worker.resource.disks</name>
-  <value>1</value>
+  <value>2</value>
   <description>Available disk capacity (usually number of disks)</description>
 </property>
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/b198935c/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst b/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
index dfedcd2..7a49e9c 100644
--- a/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
+++ b/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
@@ -14,7 +14,7 @@ If you want to adjust heap memory size, set ``TAJO_WORKER_HEAPSIZE`` variable
in
 
   TAJO_WORKER_HEAPSIZE=8000
 
-The default size is 1000 (1GB).
+The default size is 5000 (5GB).
 
 ========================
 Temporary Data Directory
@@ -54,8 +54,8 @@ In order to specify the resource capacity of each worker, you should add
the fol
 ===================================  =============   ======================   =================================
   tajo.worker.resource.cpu-cores       Integer         available cpu-cores      the number
of cpu cores
   tajo.worker.resource.memory-mb       Integer         available jvm heap       memory size
(MB)
-  tajo.worker.resource.disks           Integer         1                        the number
of disks
-  tajo.task.resource.min.memory-mb     Integer         500                      minimum allocatable
memory per task
+  tajo.worker.resource.disks           Integer         2                        the number
of disks
+  tajo.task.resource.min.memory-mb     Integer         1000                     minimum allocatable
memory per task
   tajo.qm.resource.min.memory-mb       Integer         500                      minimum allocatable
memory per query
 ===================================  =============   ======================   =================================
 
@@ -73,7 +73,7 @@ In order to specify the resource capacity of each worker, you should add
the fol
  Example
 ------------
 
-Assume that you want to give 15GB Jvm heap, 1GB memory per task, 4 disks, and 12 cores on
each worker. The example configuration is as follows:
+Assume that you want to give 15GB Jvm heap, 2GB memory per task, 4 disks, and 12 cores on
each worker. The example configuration is as follows:
 
 ``tajo-env.sh``
 
@@ -93,7 +93,7 @@ Assume that you want to give 15GB Jvm heap, 1GB memory per task, 4 disks,
and 12
   
    <property>
     <name>tajo.task.resource.min.memory-mb</name>
-    <value>1000</value>
+    <value>2000</value>
   </property>
   
   <property>
@@ -117,7 +117,7 @@ Assume that you want to give 15GB Jvm heap, 1GB memory per task, 4 disks,
and 12
 
    <property>
     <name>tajo.task.resource.min.memory-mb</name>
-    <value>1000</value>
+    <value>2000</value>
   </property>
 
   <property>
@@ -141,7 +141,7 @@ Assume that you want to give 15GB Jvm heap, 1GB memory per task, 4 disks,
and 12
 
    <property>
     <name>tajo.task.resource.min.memory-mb</name>
-    <value>1000</value>
+    <value>2000</value>
   </property>
 
   <property>


Mime
View raw message