Author: gates
Date: Thu Jan 17 00:20:55 2013
New Revision: 1434515
URL: http://svn.apache.org/viewvc?rev=1434515&view=rev
Log:
HCATALOG-594 updated documentation, default.xml, job submission fix
Modified:
incubator/hcatalog/branches/branch-0.5/CHANGES.txt
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/configuration.xml
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/rest_server_install.xml
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/config/webhcat-default.xml
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1434515&r1=1434514&r2=1434515&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Thu Jan 17 00:20:55 2013
@@ -160,6 +160,8 @@ Release 0.5.0 - Unreleased
OPTIMIZATIONS
BUG FIXES
+ HCAT-594 updated documentation, default.xml, job submission fix (thejas via
gates)
+
HCAT-588 Webhcat server wouldn't start as it is unable to write
templeton.log (thejas via traviscrawford)
HCAT-573 Remove version number from WEBHCAT_JAR in webhcat_config.sh (thejas
via traviscrawford)
Modified:
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/configuration.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/configuration.xml?rev=1434515&r1=1434514&r2=1434515&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/configuration.xml
(original)
+++
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/configuration.xml
Thu Jan 17 00:20:55 2013
@@ -30,14 +30,14 @@
<p>The Templeton specific configuration is split into two layers:</p>
<ol>
- <li><strong>templeton-default.xml</strong> - All the configuration variables
+ <li><strong>webhcat-default.xml</strong> - All the configuration variables
that Templeton needs. This file sets the defaults that ship with Templeton
and
should only be changed by Templeton developers. Do not copy this file
and/or
- change it to maintain local installation settings. Because
templeton-default.xml
+ change it to maintain local installation settings. Because
webhcat-default.xml
is present in the Templeton war file, editing a local copy of it will not
change the
configuration.</li>
- <li><strong>templeton-site.xml</strong> - The (possibly empty) configuration
+ <li><strong>webhcat-site.xml</strong> - The (possibly empty) configuration
file in which the system administrator can set variables for their Hadoop
cluster.
Create this file and maintain entries in it for configuration variables
that require you to override default values based on your local
installation.</li>
@@ -66,7 +66,7 @@ ${env.PIG_HOME}/bin/pig
uncertainty.</p>
<p><strong>Note:</strong> The location of the log files created by Templeton
and some other properties
- of the logging system are set in the templeton-log4j.properties file.</p>
+ of the logging system are set in the webhcat-log4j.properties file.</p>
<section>
<title>Variables</title>
@@ -87,13 +87,13 @@ ${env.PIG_HOME}/bin/pig
<tr>
<td><strong>templeton.jar</strong></td>
-
<td><code>${env.TEMPLETON_HOME}/templeton/templeton-0.1.0-dev.jar</code></td>
+
<td><code>${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.5.0-SNAPSHOT.jar</code></td>
<td>The path to the Templeton jar file.</td>
</tr>
<tr>
<td><strong>templeton.libjars</strong></td>
- <td><code>${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar</code></td>
+
<td><code>${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar</code></td>
<td>Jars to add to the classpath.</td>
</tr>
@@ -106,7 +106,7 @@ ${env.PIG_HOME}/bin/pig
<tr>
<td><strong>templeton.override.enabled</strong></td>
- <td><code>true</code></td>
+ <td><code>false</code></td>
<td>Enable the override path in templeton.override.jars</td>
</tr>
@@ -124,13 +124,13 @@ ${env.PIG_HOME}/bin/pig
<tr>
<td><strong>templeton.pig.archive</strong></td>
- <td><code>hdfs:///user/templeton/pig-0.9.2.tar.gz</code></td>
+ <td><code>hdfs:///user/templeton/pig-0.10.1.tar.gz</code></td>
<td>The path to the Pig archive.</td>
</tr>
<tr>
<td><strong>templeton.pig.path</strong></td>
- <td><code>pig-0.9.2.tar.gz/pig-0.9.2/bin/pig</code></td>
+ <td><code>pig-0.10.1.tar.gz/pig-0.10.1/bin/pig</code></td>
<td>The path to the Pig executable.</td>
</tr>
@@ -142,13 +142,13 @@ ${env.PIG_HOME}/bin/pig
<tr>
<td><strong>templeton.hive.archive</strong></td>
- <td><code>hdfs:///user/templeton/hcatalog-0.5.0.tar.gz</code></td>
+ <td><code>hdfs:///user/templeton/hive-0.10.0.tar.gz</code></td>
<td>The path to the Hive archive.</td>
</tr>
<tr>
<td><strong>templeton.hive.path</strong></td>
- <td><code>hcatalog-0.5.0.tar.gz/hcatalog-0.5.0/bin/hive</code></td>
+ <td><code>hive-0.10.0.tar.gz/hive-0.10.0/bin/hive</code></td>
<td>The path to the Hive executable.</td>
</tr>
@@ -189,7 +189,7 @@ hive.metastore.sasl.enabled=false</code>
<tr>
<td><strong>templeton.exec.envs</strong></td>
- <td><code>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME</code></td>
+ <td><code>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME,HIVE_HOME</code></td>
<td>The environment variables passed through to exec.</td>
</tr>
Modified:
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/rest_server_install.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/rest_server_install.xml?rev=1434515&r1=1434514&r2=1434515&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/rest_server_install.xml
(original)
+++
incubator/hcatalog/branches/branch-0.5/src/docs/src/documentation/content/xdocs/rest_server_install.xml
Thu Jan 17 00:20:55 2013
@@ -32,11 +32,13 @@
<a href="rest_server_install.html#Hadoop+Distributed+Cache">Hadoop
distributed cache.</a></li>
<li>Download and unpack the HCatalog distribution.</li>
<li>Set the <code>TEMPLETON_HOME</code> environment variable to the base of
the
- HCatalog REST server installation. This will usually be
<code>HCATALOG_HOME/webhcat</code>.
+ HCatalog REST server installation. This will usually be same as
+ <code>HCATALOG_HOME</code>.
This is used to find the Templeton
configuration.</li>
+ <li>Set JAVA_HOME,HADOOP_PREFIX, and HIVE_HOME environment variables</li>
<li>Review the <a href="configuration.html">configuration</a>
- and update or create <code>templeton-site.xml</code> as required. Ensure
that
+ and update or create <code>webhcat-site.xml</code> as required. Ensure
that
site specific component installation locations are accurate, especially
the Hadoop configuration path. Configuration variables that use a
filesystem
path try to have reasonable defaults, but it's always safe to specify a
full
@@ -46,9 +48,9 @@
<li>Build HCatalog using the command <code>ant jar</code> from the
top level HCatalog directory.</li>
<li>Start the REST server with the command
- <code>bin/templeton_server.sh start</code>.</li>
+ <code>bin/webhcat_server.sh start</code>.</li>
<li>Check that your local install works. Assuming that the server is running
- on port 8080, the following command would give output similar to that
shown.
+ on port 50111, the following command would give output similar to that
shown.
<source>
% curl -i http://localhost:50111/templeton/v1/status
HTTP/1.1 200 OK
@@ -65,8 +67,8 @@ Server: Jetty(7.6.0.v20120127)
<section>
<title>Server Commands</title>
<ul>
- <li><strong>Start the server:</strong> <code>bin/templeton_server.sh
start</code></li>
- <li><strong>Stop the server:</strong> <code>bin/templeton_server.sh
stop</code></li>
+ <li><strong>Start the server:</strong> <code>sbin/webhcat_server.sh
start</code></li>
+ <li><strong>Stop the server:</strong> <code>sbin/webhcat_server.sh
stop</code></li>
<li><strong>End-to-end build, run, test:</strong> <code>ant e2e</code></li>
</ul>
</section>
@@ -75,14 +77,14 @@ Server: Jetty(7.6.0.v20120127)
<title>Requirements</title>
<ul>
<li><a href="http://ant.apache.org/";>Ant</a>, version 1.8 or higher</li>
- <li><a href="http://hadoop.apache.org/";>Hadoop</a>, version 0.20.205.0</li>
+ <li><a href="http://hadoop.apache.org/";>Hadoop</a>, version 1.0.3 or
higher</li>
<li><a href="http://zookeeper.apache.org/";>ZooKeeper</a> is required if you
are using
the ZooKeeper storage class. (Be sure to review
and update the ZooKeeper related <a href="configuration.html">Templeton
configuration</a>.)</li>
<li>
<a href="http://incubator.apache.org/hcatalog/";>HCatalog</a>.
- Version 0.4.0 or higher. The hcat executable must be both in the
+ Version 0.5.0 or higher. The hcat executable must be both in the
PATH and properly configured in the <a
href="configuration.html">Templeton configuration</a>.
</li>
@@ -116,12 +118,10 @@ Server: Jetty(7.6.0.v20120127)
<ul>
<li><strong>Hive</strong>:
- <a
href="http://www.apache.org/dyn/closer.cgi/incubator/hcatalog/";>Download</a>
- the HCatalog tar.gz file and place it in HDFS. (If you need a version
- that is not yet released, you may need to build it yourself following the
HCatalog
- instructions.)
+ <a href="http://www.apache.org/dyn/closer.cgi/hive/";>Download</a>
+ the hive tar.gz file and place it in HDFS.
<source>
-hadoop fs -put /tmp/hcatalog-0.5.0.tar.gz /user/templeton/hcatalog-0.5.0.tar.gz
+hadoop fs -put /tmp/hive-0.10.0.tar.gz /apps/templeton/hive-0.10.0.tar.gz
</source>
</li>
@@ -129,7 +129,7 @@ hadoop fs -put /tmp/hcatalog-0.5.0.tar.g
<a href="http://www.apache.org/dyn/closer.cgi/pig";>Download</a>
the Pig tar.gz file and place it into HDFS. For example:
<source>
-hadoop fs -put /tmp/pig-0.9.2.tar.gz /user/templeton/pig-0.9.2.tar.gz
+hadoop fs -put /tmp/pig-0.10.1.tar.gz /apps/templeton/pig-0.10.1.tar.gz
</source>
</li>
@@ -138,18 +138,18 @@ hadoop fs -put /tmp/pig-0.9.2.tar.gz /us
following command, substituting your path to the jar for the one below.
<source>
hadoop fs -put
$HADOOP_PREFIX/hadoop-0.20.205.0/contrib/streaming/hadoop-streaming-0.20.205.0.jar
\
- /user/templeton/hadoop-streaming.jar
+ /apps/templeton/hadoop-streaming.jar
</source>
</li>
<li><strong>Override Jars</strong>:
- Place override jars required (if any) into HDFS. <em>Note</em>: As of this
writing, all
- released versions of Hadoop require a patch to properly run Templeton.
This patch is
+ Place override jars required (if any) into HDFS. <em>Note</em>: Hadoop
versions
+ prior to 1.0.3 require a patch (HADOOP-7987) to properly run Templeton.
This patch is
distributed with Templeton (located at
<code>templeton/src/hadoop_temp_fix/ugi.jar</code>)
and should be placed into HDFS, as reflected in the current default
configuration.
<source>
-hadoop fs -put ugi.jar /user/templeton/ugi.jar
+hadoop fs -put ugi.jar /apps/templeton/ugi.jar
</source>
</li>
</ul>
@@ -165,37 +165,37 @@ hadoop fs -put ugi.jar /user/templeton/u
<tr>
<td><strong>templeton.pig.archive</strong></td>
- <td><code>hdfs:///user/templeton/pig-0.9.2.tar.gz</code></td>
+ <td><code>hdfs:///apps/templeton/pig-0.10.1.tar.gz</code></td>
<td>The path to the Pig archive.</td>
</tr>
<tr>
<td><strong>templeton.pig.path</strong></td>
- <td><code>pig-0.9.2.tar.gz/pig-0.9.2/bin/pig</code></td>
+ <td><code>pig-0.10.1.tar.gz/pig-0.10.1/bin/pig</code></td>
<td>The path to the Pig executable.</td>
</tr>
<tr>
<td><strong>templeton.hive.archive</strong></td>
- <td><code>hdfs:///user/templeton/hcatalog-0.5.0.tar.gz</code></td>
+ <td><code>hdfs:///apps/templeton/hive-0.10.0.tar.gz</code></td>
<td>The path to the Hive archive.</td>
</tr>
<tr>
<td><strong>templeton.hive.path</strong></td>
- <td><code>hcatalog-0.5.0.tar.gz/hcatalog-0.5.0/bin/hive</code></td>
+ <td><code>hive-0.10.0.tar.gz/hive-0.10.0/bin/hive</code></td>
<td>The path to the Hive executable.</td>
</tr>
<tr>
<td><strong>templeton.streaming.jar</strong></td>
- <td><code>hdfs:///user/templeton/hadoop-streaming.jar</code></td>
+ <td><code>hdfs:///apps/templeton/hadoop-streaming.jar</code></td>
<td>The path to the Hadoop streaming jar file.</td>
</tr>
<tr>
<td><strong>templeton.override.jars</strong></td>
- <td><code>hdfs:///user/templeton/ugi.jar</code></td>
+ <td><code>hdfs:///apps/templeton/ugi.jar</code></td>
<td>Jars to add to the HADOOP_CLASSPATH for all Map Reduce jobs.
These jars must exist on HDFS.</td>
</tr>
Modified:
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/config/webhcat-default.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/config/webhcat-default.xml?rev=1434515&r1=1434514&r2=1434515&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/config/webhcat-default.xml
(original)
+++
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/config/webhcat-default.xml
Thu Jan 17 00:20:55 2013
@@ -39,13 +39,13 @@
<property>
<name>templeton.jar</name>
- <value>${env.TEMPLETON_HOME}/templeton-0.1.0-dev.jar</value>
+
<value>${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.5.0-SNAPSHOT.jar</value>
<description>The path to the Templeton jar file.</description>
</property>
<property>
<name>templeton.libjars</name>
- <value>${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar</value>
+
<value>${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar</value>
<description>Jars to add to the classpath.</description>
</property>
@@ -61,7 +61,7 @@
<property>
<name>templeton.override.enabled</name>
- <value>true</value>
+ <value>false</value>
<description>
Enable the override path in templeton.override.jars
</description>
@@ -81,13 +81,13 @@
<property>
<name>templeton.pig.archive</name>
- <value>hdfs:///user/templeton/pig-0.10.0.tar.gz</value>
+ <value>hdfs:///apps/templeton/pig-0.10.1.tar.gz</value>
<description>The path to the Pig archive.</description>
</property>
<property>
<name>templeton.pig.path</name>
- <value>pig-0.10.0.tar.gz/pig-0.10.0/bin/pig</value>
+ <value>pig-0.10.1.tar.gz/pig-0.10.1/bin/pig</value>
<description>The path to the Pig executable.</description>
</property>
@@ -99,7 +99,7 @@
<property>
<name>templeton.hive.archive</name>
- <value>hdfs:///user/templeton/hive-0.10.0.tar.gz</value>
+ <value>hdfs:///apps/templeton/hive-0.10.0.tar.gz</value>
<description>The path to the Hive archive.</description>
</property>
@@ -146,7 +146,7 @@
<property>
<name>templeton.exec.envs</name>
- <value>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME</value>
+ <value>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME,HIVE_HOME</value>
<description>The environment variables passed through to
exec.</description>
</property>
Modified:
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java?rev=1434515&r1=1434514&r2=1434515&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
(original)
+++
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
Thu Jan 17 00:20:55 2013
@@ -103,10 +103,7 @@ public class TempletonControllerJob exte
Map<String, String> env = TempletonUtils.hadoopUserEnv(user,
overrideClasspath);
List<String> jarArgsList = new
LinkedList<String>(Arrays.asList(jarArgs));
- String tokenFile = System.getenv("HADOOP_TOKEN_FILE_LOCATION");
- if (tokenFile != null) {
- jarArgsList.add(1, "-Dmapreduce.job.credentials.binary=" +
tokenFile);
- }
+
return execService.run(jarArgsList, removeEnv, env);
}
