svn commit: r1529328 - in /hive/trunk/hcatalog/src/test/e2e/templeton: README.txt tests/jobsubmission2.conf

[th...@apache.org]

Author: thejas
Date: Fri Oct  4 22:09:41 2013
New Revision: 1529328

URL: http://svn.apache.org/r1529328
Log:
HIVE-5115 : Webhcat e2e tests TestMapReduce_1 and TestHeartbeat_2 require changes for Hadoop 2 (Deepesh Khandelwal via Thejas Nair)

Modified:
    hive/trunk/hcatalog/src/test/e2e/templeton/README.txt
    hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf

Modified: hive/trunk/hcatalog/src/test/e2e/templeton/README.txt
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/README.txt?rev=1529328&r1=1529327&r2=1529328&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/README.txt (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/README.txt Fri Oct  4 22:09:41 2013
@@ -87,15 +87,15 @@ Tips:
 3. Copy contents of src/test/e2e/templeton/inpdir to hdfs
 (e.g. ./bin/hadoop fs -put ~/dev/hive/hcatalog/src/test/e2e/templeton/inpdir/ webhcate2e)
 
-4. You will need to two jars in the same HDFS directory as the contents of inpdir.  piggybank.jar, which can
-be obtained from Pig.  The second is the hadoop-examples.jar, which can be obtained from your Hadoop distribution.
-This should be called hexamples.jar when it is uploaded to HDFS.
+4. You will need to copy three jars in the same HDFS directory as the contents of inpdir.  piggybank.jar, which can
+be obtained from Pig and the other two are obtained from your Hadoop distribution.
+For Hadoop 1.x you would need to upload hadoop-examples.jar twice to HDFS one as hclient.jar and other as hexamples.jar.
+For Hadoop 2.x you would need to upload hadoop-mapreduce-client-jobclient.jar to HDFS as hclient.jar and hadoop-mapreduce-examples.jar to HDFS as hexamples.jar. 
 Also see http://hive.apache.org/docs/hcat_r0.5.0/rest_server_install.html#Hadoop+Distributed+Cache for notes on
 additional JAR files to copy to HDFS.
 
 5. Make sure TEMPLETON_HOME evnironment variable is set
 
-
 6. hadoop/conf/core-site.xml should have items described in
 http://hive.apache.org/docs/hcat_r0.5.0/rest_server_install.html#Permissions
 

Modified: hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf?rev=1529328&r1=1529327&r2=1529328&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf Fri Oct  4 22:09:41 2013
@@ -46,7 +46,7 @@ $cfg = 
      'method' => 'POST',
      'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
      'post_options' => ['user.name=:UNAME:','arg=-mt', 'arg=642000',
-                             'jar=:INPDIR_HDFS:/hexamples.jar', 'class=sleep', 'statusdir=/tmp' ],
+                             'jar=:INPDIR_HDFS:/hclient.jar', 'class=sleep', 'statusdir=/tmp' ],
      'json_field_substr_match' => { 'id' => '\d+'},
      'status_code' => 200,
      'check_job_created' => 1,