hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1353628 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
Date Mon, 25 Jun 2012 16:03:27 GMT
Author: tucu
Date: Mon Jun 25 16:03:25 2012
New Revision: 1353628

URL: http://svn.apache.org/viewvc?rev=1353628&view=rev
Log:
Merge -r 1353624:1353625 from trunk to branch. FIXES: MAPREDUCE-4336

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.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=1353628&r1=1353627&r2=1353628&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Jun 25 16:03:25
2012
@@ -60,6 +60,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-4031. Prevent a Node Manager hang during shutdown. 
     (Devaraj K via sseth)
 
+    MAPREDUCE-4336. Distributed Shell fails when used with the CapacityScheduler
+    (ahmed via tucu)
+
 Release 2.0.0-alpha - 05-23-2012
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java?rev=1353628&r1=1353627&r2=1353628&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
Mon Jun 25 16:03:25 2012
@@ -260,7 +260,7 @@ public class Client {
 
     appName = cliParser.getOptionValue("appname", "DistributedShell");
     amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
-    amQueue = cliParser.getOptionValue("queue", "");
+    amQueue = cliParser.getOptionValue("queue", "default");
     amMemory = Integer.parseInt(cliParser.getOptionValue("master_memory", "10"));		
 
     if (amMemory < 0) {
@@ -353,6 +353,7 @@ public class Client {
     }
 
     GetQueueInfoRequest queueInfoReq = Records.newRecord(GetQueueInfoRequest.class);
+    queueInfoReq.setQueueName(this.amQueue);
     GetQueueInfoResponse queueInfoResp = applicationsManager.getQueueInfo(queueInfoReq);
	
     QueueInfo queueInfo = queueInfoResp.getQueueInfo();
     LOG.info("Queue info"



Mime
View raw message