Author: tucu
Date: Fri Mar 1 01:28:18 2013
New Revision: 1451452
URL: http://svn.apache.org/r1451452
Log:
MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue does not
exist. (sandyr via tucu)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.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=1451452&r1=1451451&r2=1451452&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Mar 1
01:28:18 2013
@@ -198,6 +198,9 @@ Release 2.0.4-beta - UNRELEASED
MAPREDUCE-4693. History server should include counters for failed tasks.
(Xuan Gong via sseth)
+ MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue
does
+ not exist. (sandyr via tucu)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java?rev=1451452&r1=1451451&r2=1451452&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
Fri Mar 1 01:28:18 2013
@@ -106,8 +106,9 @@ public class ResourceMgrDelegate extends
public QueueInfo getQueue(String queueName) throws IOException,
InterruptedException {
- return TypeConverter.fromYarn(
- super.getQueueInfo(queueName), this.conf);
+ org.apache.hadoop.yarn.api.records.QueueInfo queueInfo =
+ super.getQueueInfo(queueName);
+ return (queueInfo == null) ? null : TypeConverter.fromYarn(queueInfo,
conf);
}
public QueueAclsInfo[] getQueueAclsForCurrentUser() throws IOException,
