date:20130919

svn commit: r1524868 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ had

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 23:59:51 2013
New Revision: 1524868

URL: http://svn.apache.org/r1524868
Log:
YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM 
registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config 
mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by 
Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524867 ../branch-2

Added:

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/WebAppUtil.java
  - copied unchanged from r1524867, 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/WebAppUtil.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRConfig.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1524868&r1=1524867&r2=1524868&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Thu Sep 19 23:59:51 2013
@@ -17,6 +17,11 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5488. Changed MR client to keep trying to reach the application
 when it sees that on attempt's AM is down. (Jian He via vinodkv)
 
+MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config
+mapreduce.ssl.enabled to enable https and disabling it by default as MR AM
+needs to set up its own certificates etc and not depend on clusters'.
+(Omkar Vinit Joshi via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1524868&r1=1524867&r2=15

svn commit: r1524867 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-map

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 23:51:14 2013
New Revision: 1524867

URL: http://svn.apache.org/r1524867
Log:
YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM 
registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config 
mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by 
Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/

Added:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/WebAppUtil.java
  - copied unchanged from r1524864, 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/WebAppUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRConfig.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1524867&r1=1524866&r2=1524867&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 23:51:14 2013
@@ -59,6 +59,11 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5488. Changed MR client to keep trying to reach the application
 when it sees that on attempt's AM is down. (Jian He via vinodkv)
 
+MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config
+mapreduce.ssl.enabled to enable https and disabling it by default as MR AM
+needs to set up its own certificates etc and not depend on clusters'.
+(Omkar Vinit Joshi via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1524867&r1=1524866&r2=1524867&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/ha

svn commit: r1524865 [2/2] - in /hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ ha

2013-09-19 Thread wang

Modified: 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java?rev=1524865&r1=1524864&r2=1524865&view=diff
==
--- 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
 (original)
+++ 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
 Thu Sep 19 23:42:10 2013
@@ -343,7 +343,7 @@ public class TestTaskAttempt{
 TaskAttemptImpl taImpl =
   new MapTaskAttemptImpl(taskId, 1, eventHandler, jobFile, 1,
   splits, jobConf, taListener,
-  mock(Token.class), new Credentials(),
+  new Token(), new Credentials(),
   new SystemClock(), null);
 
 NodeId nid = NodeId.newInstance("127.0.0.1", 0);
@@ -399,7 +399,7 @@ public class TestTaskAttempt{
 TaskAttemptImpl taImpl =
   new MapTaskAttemptImpl(taskId, 1, eventHandler, jobFile, 1,
   splits, jobConf, taListener,
-  mock(Token.class), new Credentials(),
+  new Token(), new Credentials(),
   new SystemClock(), appCtx);
 
 NodeId nid = NodeId.newInstance("127.0.0.2", 0);
@@ -456,7 +456,7 @@ public class TestTaskAttempt{
 TaskAttemptImpl taImpl =
   new MapTaskAttemptImpl(taskId, 1, eventHandler, jobFile, 1,
   splits, jobConf, taListener,
-  mock(Token.class), new Credentials(),
+  new Token(), new Credentials(),
   new SystemClock(), appCtx);
 
 NodeId nid = NodeId.newInstance("127.0.0.1", 0);
@@ -516,7 +516,7 @@ public class TestTaskAttempt{
 TaskAttemptImpl taImpl =
   new MapTaskAttemptImpl(taskId, 1, eventHandler, jobFile, 1,
   splits, jobConf, taListener,
-  mock(Token.class), new Credentials(),
+  new Token(), new Credentials(),
   new SystemClock(), appCtx);
 
 NodeId nid = NodeId.newInstance("127.0.0.1", 0);
@@ -582,7 +582,7 @@ public class TestTaskAttempt{
 
 TaskAttemptImpl taImpl = new MapTaskAttemptImpl(taskId, 1, eventHandler,
 jobFile, 1, splits, jobConf, taListener,
-mock(Token.class), new Credentials(), new SystemClock(), appCtx);
+new Token(), new Credentials(), new SystemClock(), appCtx);
 
 NodeId nid = NodeId.newInstance("127.0.0.1", 0);
 ContainerId contId = ContainerId.newInstance(appAttemptId, 3);
@@ -631,7 +631,7 @@ public class TestTaskAttempt{
 
 TaskAttemptImpl taImpl = new MapTaskAttemptImpl(taskId, 1, eventHandler,
 jobFile, 1, splits, jobConf, taListener,
-mock(Token.class), new Credentials(), new SystemClock(), appCtx);
+new Token(), new Credentials(), new SystemClock(), appCtx);
 
 NodeId nid = NodeId.newInstance("127.0.0.1", 0);
 ContainerId contId = ContainerId.newInstance(appAttemptId, 3);

Modified: 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=1524865&r1=1524864&r2=1524865&view=diff
==
--- 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
 (original)
+++ 
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
 Thu Sep 19 23:42:10 2013
@@ -227,7 +227,7 @@ public class LocalJobRunner implements C
 info.getSplitIndex(), 1);
   map.setUser(UserGroupInformation.getCurrentUser().
   getShortUserName());
-  setupChildMapredLocalDirs(localJobDir, map, localConf);
+  setupChildMapredLocalDirs(map, localConf);
 
   MapOutputFile mapOutput = new MROutputFiles();
   mapOutput.setConf(localConf);
@@ -305,7 +305,7 @@ public class LocalJobRunner implements C
   reduceId, taskId, mapIds.size(), 1);
   reduce.setUser(UserGroupInformation.getCurrentUser().
   getShortUserName());
-  setupChildMapredLocalDirs(localJobDir, reduce, localConf);
+  setupChildMapre

svn commit: r1524864 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-mapreduce-clien

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 23:35:58 2013
New Revision: 1524864

URL: http://svn.apache.org/r1524864
Log:
YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM 
registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config 
mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by 
Omkar Vinit Joshi.

Added:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/WebAppUtil.java
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRConfig.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.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=1524864&r1=1524863&r2=1524864&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 19 
23:35:58 2013
@@ -196,6 +196,11 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5488. Changed MR client to keep trying to reach the application
 when it sees that on attempt's AM is down. (Jian He via vinodkv)
 
+MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config
+mapreduce.ssl.enabled to enable https and disabling it by default as MR AM
+needs to set up its own certificates etc and not depend on clusters'.
+(Omkar Vinit Joshi via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1524864&r1=1524863&r2=1524864&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 Thu Sep 19 23:35:58 2013
@@ -36,14 +36,17 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.

svn commit: r1524841 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

2013-09-19 Thread tgraves

Author: tgraves
Date: Thu Sep 19 20:58:18 2013
New Revision: 1524841

URL: http://svn.apache.org/r1524841
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta 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/main/java/org/apache/hadoop/mapreduce/TypeConverter.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=1524841&r1=1524840&r2=1524841&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 19 
20:58:18 2013
@@ -190,6 +190,9 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
@@ -1365,6 +1368,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.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/mapreduce/TypeConverter.java?rev=1524841&r1=1524840&r2=1524841&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 20:58:18 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();

svn commit: r1524842 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce

2013-09-19 Thread tgraves

Author: tgraves
Date: Thu Sep 19 20:59:47 2013
New Revision: 1524842

URL: http://svn.apache.org/r1524842
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1524842&r1=1524841&r2=1524842&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Thu Sep 19 20:59:47 2013
@@ -11,6 +11,8 @@ Release 2.2.0 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
 
 Release 2.1.1-beta - 2013-09-23
 

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524842&r1=1524841&r2=1524842&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 20:59:47 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();

svn commit: r1524858 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapredu

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 22:38:55 2013
New Revision: 1524858

URL: http://svn.apache.org/r1524858
Log:
MAPREDUCE-5488. Changed MR client to keep trying to reach the application when 
it sees that on attempt's AM is down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1524856 ../../trunk/

Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1524858&r1=1524857&r2=1524858&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Thu Sep 19 22:38:55 2013
@@ -14,6 +14,9 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
 via tgraves)
 
+MAPREDUCE-5488. Changed MR client to keep trying to reach the application
+when it sees that on attempt's AM is down. (Jian He via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml?rev=1524858&r1=1524857&r2=1524858&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 Thu Sep 19 22:38:55 2013
@@ -493,6 +493,12 @@
   
  
 
+
+   
+ 
+  
+ 
+   

   
 

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1524858&r1=1524857&r2=1524858&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 Thu Sep 19 22:38:55 2013
@@ -352,7 +352,7 @@ public interface MRJobConfig {
   public static final int DEFAULT_MR_CLIENT_TO_AM_IPC_MAX_RETRIES = 3;
   
   /**
-   * The number of client retries to the RM/HS/AM before throwing exception.
+   * The number of client retries to the RM/HS before throwing exception.
*/
   public static final String MR_CLIENT_MAX_RETRIES = 
 MR_PREFIX + "client.max-retries";

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1524858&r1=1524857&r2=1524858&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 Thu Sep 19 22:38:55 2013
@@ -1416,7 +1416,7 @@
 
 
   yarn.app.mapreduce.cl

svn commit: r1524857 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ had

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 22:36:58 2013
New Revision: 1524857

URL: http://svn.apache.org/r1524857
Log:
MAPREDUCE-5488. Changed MR client to keep trying to reach the application when 
it sees that on attempt's AM is down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1524856 ../../trunk/

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1524857&r1=1524856&r2=1524857&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 22:36:58 2013
@@ -56,6 +56,9 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
 via tgraves)
 
+MAPREDUCE-5488. Changed MR client to keep trying to reach the application
+when it sees that on attempt's AM is down. (Jian He via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml?rev=1524857&r1=1524856&r2=1524857&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 Thu Sep 19 22:36:58 2013
@@ -496,6 +496,12 @@
   
  
 
+
+   
+ 
+  
+ 
+   

   
 

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1524857&r1=1524856&r2=1524857&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 Thu Sep 19 22:36:58 2013
@@ -352,7 +352,7 @@ public interface MRJobConfig {
   public static final int DEFAULT_MR_CLIENT_TO_AM_IPC_MAX_RETRIES = 3;
   
   /**
-   * The number of client retries to the RM/HS/AM before throwing exception.
+   * The number of client retries to the RM/HS before throwing exception.
*/
   public static final String MR_CLIENT_MAX_RETRIES = 
 MR_PREFIX + "client.max-retries";

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1524857&r1=1524856&r2=1524857&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 Thu Sep 19 22:36:58 2013
@@ -1416,7 +1416,7 @@
 
 
   yarn.app.mapreduce.client-am.ipc.max-retries
-  1
+  3
   The number of client retries to the AM - before reconnecting
 to the RM to fetch Application Status.
 
@@ -1424,7

svn commit: r1524856 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ hadoop-mapreduc

2013-09-19 Thread vinodkv

Author: vinodkv
Date: Thu Sep 19 22:35:12 2013
New Revision: 1524856

URL: http://svn.apache.org/r1524856
Log:
MAPREDUCE-5488. Changed MR client to keep trying to reach the application when 
it sees that on attempt's AM is down. Contributed by Jian He.

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

hadoop/common/trunk/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

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

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.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=1524856&r1=1524855&r2=1524856&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 19 
22:35:12 2013
@@ -193,6 +193,9 @@ Release 2.2.0 - UNRELEASED
 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
 via tgraves)
 
+MAPREDUCE-5488. Changed MR client to keep trying to reach the application
+when it sees that on attempt's AM is down. (Jian He via vinodkv)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml?rev=1524856&r1=1524855&r2=1524856&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml 
(original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml 
Thu Sep 19 22:35:12 2013
@@ -496,6 +496,12 @@
   
  
 
+
+   
+ 
+  
+ 
+   

   
 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1524856&r1=1524855&r2=1524856&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 Thu Sep 19 22:35:12 2013
@@ -357,7 +357,7 @@ public interface MRJobConfig {
   public static final int DEFAULT_MR_CLIENT_TO_AM_IPC_MAX_RETRIES = 3;
   
   /**
-   * The number of client retries to the RM/HS/AM before throwing exception.
+   * The number of client retries to the RM/HS before throwing exception.
*/
   public static final String MR_CLIENT_MAX_RETRIES = 
 MR_PREFIX + "client.max-retries";

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1524856&r1=1524855&r2=1524856&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 Thu Sep 19 22:35:12 2013
@@ -982,7 +982,7 @@
 
 
   yarn.app.mapreduce.client-am.ipc.max-retries
-  1
+  3
   The number of client retries to the AM - before reconnecting
 to the RM to fetch Application Status.
 
@@ -990,7 +990,7 @@
 
   yarn.app.mapreduce.client.max-retries
   3
-  The number of client retries to the RM/HS/AM before
+  The number of client retries to the RM/HS before
 throwing exception. This is a layer above the ipc.
 
 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapre

svn commit: r1524844 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/Typ

2013-09-19 Thread tgraves

Author: tgraves
Date: Thu Sep 19 21:00:52 2013
New Revision: 1524844

URL: http://svn.apache.org/r1524844
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1524844&r1=1524843&r2=1524844&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 21:00:52 2013
@@ -40,6 +40,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524844&r1=1524843&r2=1524844&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 21:00:52 2013
@@ -468,7 +468,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();

svn commit: r1524843 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeCo

2013-09-19 Thread tgraves

Author: tgraves
Date: Thu Sep 19 21:00:40 2013
New Revision: 1524843

URL: http://svn.apache.org/r1524843
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1524843&r1=1524842&r2=1524843&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 21:00:40 2013
@@ -53,6 +53,9 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
@@ -1240,6 +1243,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524843&r1=1524842&r2=1524843&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 21:00:40 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();

svn commit: r1524868 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ had

svn commit: r1524867 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-map

svn commit: r1524865 [2/2] - in /hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ ha

svn commit: r1524864 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ hadoop-mapreduce-clien

svn commit: r1524841 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

svn commit: r1524842 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce

svn commit: r1524858 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapredu

svn commit: r1524857 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ had

svn commit: r1524856 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ hadoop-mapreduc

svn commit: r1524844 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/Typ

svn commit: r1524843 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeCo

11 matches

Site Navigation

Mail list logo

Footer information