Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -c 1437156 from trunk to branch-2 to fix YARN-277. Use AMRMClient in DistributedShell to exemplify the approach. Contriubed by Bikas Saha 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437159 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hitesh Shah 2013-01-22 20:53:47 +00:00
parent ebf72a71ba
commit 60230692dc
4 changed files with 389 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -84,6 +84,9 @@ Release 2.0.3-alpha - Unreleased
YARN-331. Fill in missing fair scheduler documentation. (sandyr via tucu) YARN-331. Fill in missing fair scheduler documentation. (sandyr via tucu)
YARN-277. Use AMRMClient in DistributedShell to exemplify the approach.
(Bikas Saha via hitesh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

773
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
View File

File diff suppressed because it is too large Load Diff

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
View File

@ -18,10 +18,7 @@
package org.apache.hadoop.yarn.applications.distributedshell; package org.apache.hadoop.yarn.applications.distributedshell;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -212,7 +209,7 @@ public class Client extends YarnClientImpl {
/** /**
*/ */
public Client() throws Exception { public Client() throws Exception {
this(new Configuration()); this(new YarnConfiguration());
} }
/** /**

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
View File

@ -120,6 +120,7 @@ public class TestDistributedShell {
boolean exceptionThrown = false; boolean exceptionThrown = false;
try { try {
boolean initSuccess = client.init(args); boolean initSuccess = client.init(args);
Assert.assertTrue(initSuccess);
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
exceptionThrown = true; exceptionThrown = true;