svn commit: r1332665 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.j

2012-05-01 Thread tgraves 
Author: tgraves
Date: Tue May  1 14:10:45 2012
New Revision: 1332665

URL: http://svn.apache.org/viewvc?rev=1332665view=rev
Log:
MAPREDUCE-4212. TestJobClientGetJob sometimes fails (Daryn Sharp via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1332665r1=1332664r2=1332665view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue May  1 
14:10:45 2012
@@ -430,6 +430,9 @@ Release 0.23.3 - UNRELEASED
 MAPREDUCE-4206. Sorting by Last Health-Update on the RM nodes page sorts
 does not work correctly (Jonathon Eagles via tgraves)
 
+MAPREDUCE-4212. TestJobClientGetJob sometimes fails 
+(Daryn Sharp via tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java?rev=1332665r1=1332664r2=1332665view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java
 Tue May  1 14:10:45 2012
@@ -49,8 +49,9 @@ public class TestJobClientGetJob {
 JobConf conf = new JobConf();
 conf.set(mapreduce.framework.name, local);
 FileInputFormat.addInputPath(conf, createTempFile(in, hello));
-FileOutputFormat.setOutputPath(conf,
-new Path(TEST_ROOT_DIR, getClass().getSimpleName()));
+Path outputDir = new Path(TEST_ROOT_DIR, getClass().getSimpleName());
+outputDir.getFileSystem(conf).delete(outputDir, true);
+FileOutputFormat.setOutputPath(conf, outputDir);
 JobClient jc = new JobClient(conf);
 RunningJob runningJob = jc.submitJob(conf);
 assertNotNull(Running job, runningJob);

svn commit: r1332716 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-client/hadoo

2012-05-01 Thread bobby 
Author: bobby
Date: Tue May  1 15:59:36 2012
New Revision: 1332716

URL: http://svn.apache.org/viewvc?rev=1332716view=rev
Log:
MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1332716r1=1332715r2=1332716view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue May  1 
15:59:36 2012
@@ -436,6 +436,9 @@ Release 0.23.3 - UNRELEASED
 MAPREDUCE-4211. Error conditions (missing appid, appid not found) are 
 masked in the RM app page (Jonathan Eagles via bobby)
 
+MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via
+bobby)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java?rev=1332716r1=1332715r2=1332716view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
 Tue May  1 15:59:36 2012
@@ -33,8 +33,9 @@ public class LocalClientProtocolProvider
 
   @Override
   public ClientProtocol create(Configuration conf) throws IOException {
-String framework = conf.get(MRConfig.FRAMEWORK_NAME);
-if (framework != null  !framework.equals(MRConfig.LOCAL_FRAMEWORK_NAME)) 
{
+String framework =
+conf.get(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME);
+if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) {
   return null;
 }
 String tracker = conf.get(JTConfig.JT_IPC_ADDRESS, local);

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java?rev=1332716r1=1332715r2=1332716view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java
 Tue May  1 15:59:36 2012
@@ -28,6 +28,7 @@ import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.LocalJobRunner;
 import org.apache.hadoop.mapred.ResourceMgrDelegate;
 import org.apache.hadoop.mapred.YARNRunner;
 import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
@@ -54,17 +55,26 @@ public class TestYarnClientProtocolProvi
 
 try {
   cluster = new Cluster(conf);
-  fail(Cluster should not be initialized with out any framework name);
-} catch (IOException e) {
-
+} catch (Exception e) {
+  throw new Exception(
+  Failed to initialize a local runner w/o a cluster framework key, 
e);
 }
-
+
+try {
+  assertTrue(client is not a LocalJobRunner,
+  cluster.getClient() instanceof LocalJobRunner);
+} finally {
+  if (cluster != null) {
+cluster.close();
+  }
+}
+
 try {
   conf = new Configuration();
   conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.YARN_FRAMEWORK_NAME);
   cluster = new Cluster(conf);
   ClientProtocol client = cluster.getClient();
-  assertTrue(client instanceof YARNRunner);
+

svn commit: r1332853 - /hadoop/common/trunk/hadoop-mapreduce-project/dev-support/test-patch.properties

2012-05-01 Thread tgraves 
Author: tgraves
Date: Tue May  1 21:46:58 2012
New Revision: 1332853

URL: http://svn.apache.org/viewvc?rev=1332853view=rev
Log:
HADOOP-8339. jenkins complaining about 16 javadoc warnings (Tom White and 
Robert Evans via tgraves)

Removed:

hadoop/common/trunk/hadoop-mapreduce-project/dev-support/test-patch.properties