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

Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2013-02-21 11:36:26 +00:00
parent 937ef703eb
commit af07edf1ab
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,9 @@ Release 2.0.4-beta - UNRELEASED
MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected
in MR2. (Sandy Ryza via tomwhite)
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES

24
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueInfo.java
View File

@ -67,7 +67,8 @@ public class JobQueueInfo extends QueueInfo {
*
* @param queueName Name of the job queue.
*/
protected void setQueueName(String queueName) {
@InterfaceAudience.Private
public void setQueueName(String queueName) {
super.setQueueName(queueName);
}
@ -76,7 +77,8 @@ public class JobQueueInfo extends QueueInfo {
*
* @param schedulingInfo
*/
protected void setSchedulingInfo(String schedulingInfo) {
@InterfaceAudience.Private
public void setSchedulingInfo(String schedulingInfo) {
super.setSchedulingInfo(schedulingInfo);
}
@ -84,15 +86,21 @@ public class JobQueueInfo extends QueueInfo {
* Set the state of the queue
* @param state state of the queue.
*/
protected void setQueueState(String state) {
@InterfaceAudience.Private
public void setQueueState(String state) {
super.setState(QueueState.getState(state));
}
String getQueueState() {
/**
* Use getState() instead
*/
@Deprecated
public String getQueueState() {
return super.getState().toString();
}
protected void setChildren(List<JobQueueInfo> children) {
@InterfaceAudience.Private
public void setChildren(List<JobQueueInfo> children) {
List<QueueInfo> list = new ArrayList<QueueInfo>();
for (JobQueueInfo q : children) {
list.add(q);
@ -108,7 +116,8 @@ public class JobQueueInfo extends QueueInfo {
return list;
}
protected void setProperties(Properties props) {
@InterfaceAudience.Private
public void setProperties(Properties props) {
super.setProperties(props);
}
@ -141,7 +150,8 @@ public class JobQueueInfo extends QueueInfo {
setChildren(children);
}
protected void setJobStatuses(org.apache.hadoop.mapreduce.JobStatus[] stats) {
@InterfaceAudience.Private
public void setJobStatuses(org.apache.hadoop.mapreduce.JobStatus[] stats) {
super.setJobStatuses(stats);
}

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/QueueConfigurationParser.java
View File

@ -449,7 +449,7 @@ class QueueConfigurationParser {
q.appendChild(propsElement);
// Queue-state
String queueState = jqi.getQueueState();
String queueState = jqi.getState().getStateName();
if (queueState != null
&& !queueState.equals(QueueState.UNDEFINED.getStateName())) {
Element qStateElement = document.createElement(STATE_TAG);