You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/03/30 08:55:09 UTC

git commit: TAJO-17: Improve the examples for jvm version and auxiliary service in getting_started.apt (hyunsik)

Updated Branches:
  refs/heads/master 8a6f88a9c -> 9b85c813d


TAJO-17: Improve the examples for jvm version and auxiliary service in getting_started.apt (hyunsik)


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

Branch: refs/heads/master
Commit: 9b85c813d01a565cd1455429cebee42e27969a07
Parents: 8a6f88a
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sat Mar 30 16:53:48 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sat Mar 30 16:53:48 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                   |    3 ++
 tajo-project/src/site/apt/getting_started.apt |   33 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/9b85c813/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 823190b..a0fbd1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ Release 0.2.0 - unreleased
 
   IMPROVEMENTS
     
+    TAJO-17: Improve the examples for jvm version and auxiliary service in 
+    getting_started.apt. (hyunsik)
+
     TAJO-10: Modify git ignore to include Apache derby log file  
 
     TAJO-12: Add information in README on how to subscribe to mailing 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/9b85c813/tajo-project/src/site/apt/getting_started.apt
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/apt/getting_started.apt b/tajo-project/src/site/apt/getting_started.apt
index 9295501..3ad8e53 100644
--- a/tajo-project/src/site/apt/getting_started.apt
+++ b/tajo-project/src/site/apt/getting_started.apt
@@ -28,16 +28,15 @@ Build Tajo from Source Code
   Download the source code and build Tajo as follows:
 
 ---------------------------------------------
-$ git clone http://git-wip-us.apache.org/repos/asf/incubator-tajo.git
+$ git clone http://git-wip-us.apache.org/repos/asf/incubator-tajo.git tajo
 $ cd tajo
-$ mvn package -DskipTests -Ddisk -Ptar
+$ mvn package -DskipTests -Pdist -Dtar
 $ ls tajo-dist/target/tajo-x.y.z.tar.gz
 ---------------------------------------------
 
-  If you want to know the build instruction in more detail, please refer to
+  If you meet some errors or you want to know the build instruction in more detail, please read
   {{{./build.html}Build Instruction}}.
 
-
 Unpack tarball
 
   You should unpack the tarball (refer to build instruction).
@@ -55,19 +54,25 @@ Configuration
   First of all, you need to set the environment variables for your Hadoop cluster and Tajo.
 
 --------------------------------------------
-export JAVA_HOME=/usr/lib/jvm/openjdk-1.7.x
+export JAVA_HOME=/usr/lib/jvm/openjdk-1.6.x
 export HADOOP_HOME=/usr/local/hadoop-2.0.x
 export YARN_HOME=/usr/local/hadoop-2.0.x
 export TAJO_HOME=<tajo-install-dir>
 --------------------------------------------
 
   Tajo requires an auxiliary service called PullServer for data repartitioning.
-  So, we must configure for PullServer in ${HADOOP_HOME}/etc/hadoop/yarn-site.xml.
+  For this, you must add or modify the following configuration parameters in
+  ${HADOOP_HOME}/etc/hadoop/yarn-site.xml.
 
 -------------------------------------------------------------------
 <property>
   <name>yarn.nodemanager.aux-services</name>
-  <value>tajo.pullserver</value>
+  <value>mapreduce.shuffle,tajo.pullserver</value>
+</property>
+
+<property>
+  <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name>
+  <value>org.apache.hadoop.mapred.ShuffleHandler</value>
 </property>
 
 <property>
@@ -81,7 +86,7 @@ export TAJO_HOME=<tajo-install-dir>
 </property>
 -------------------------------------------------------------------
 
-  Likewise, you should copy some jar files to the hadoop library dir.
+  For the auxiliary, you should copy some jar files to the Hadoop Yarn library dir.
 
 ------------------------------------------------------------------------
 $ cp $TAJO_HOME/tajo-common-x.y.z.jar $HADOOP_HOME/share/yarn/lib
@@ -90,9 +95,9 @@ $ cp $TAJO_HOME/tajo-core-pullserver-x.y.z.jar $HADOOP_HOME/share/yarn/lib
 $ cp $TAJO_HOME/tajo-core-storage-x.y.z.jar $HADOOP_HOME/share/yarn/lib
 ------------------------------------------------------------------------
 
-  Copy ${TAJO_HOME}/conf/tajo-site.xml.templete to tajo-site.xml.
-  Then, add the following configs to your tajo-site.xml.
-  Change <hostname> and <port> to your namenode address.
+  Please copy ${TAJO_HOME}/conf/tajo-site.xml.template to tajo-site.xml.
+  You must add the following configs to your tajo-site.xml and then change <hostname> and <port> to
+  your namenode address.
 
 ---------------------------------------------------------------------
   <property>
@@ -106,7 +111,7 @@ $ cp $TAJO_HOME/tajo-core-storage-x.y.z.jar $HADOOP_HOME/share/yarn/lib
   </property>
 ---------------------------------------------------------------------
 
-  If you want know configuration in more detail, refer to
+  If you want know configuration in more detail, read
   {{{./configuration.html}Configuration Guide}}.
 
 Running Tajo
@@ -137,13 +142,13 @@ Query Execution
 -----------------------------
 $ mkdir /home/x/table1
 $ cd /home/x/table1
-$ cat >> table1
+$ cat > table1
 1|abc|1.1|a
 2|def|2.3|b
 3|ghi|3.4|c
 4|jkl|4.5|d
 5|mno|5.6|e
-<EOF>
+<CTRL + D>
 -----------------------------
 
   This schema of this table is (int, string, float, string).