YARN-4785. inconsistent value type of the type field for LeafQueueInfo in response of RM REST API.
This commit is contained in:
parent
f84af8bd58
commit
ca8106d2dd
|
@ -28,6 +28,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue;
|
||||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
|
||||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@XmlRootElement(name = "capacityScheduler")
|
@XmlRootElement(name = "capacityScheduler")
|
||||||
@XmlType(name = "capacityScheduler")
|
@XmlType(name = "capacityScheduler")
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@ -86,14 +89,29 @@ public class CapacitySchedulerInfo extends SchedulerInfo {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected CapacitySchedulerQueueInfoList getQueues(CSQueue parent) {
|
protected CapacitySchedulerQueueInfoList getQueues(CSQueue parent) {
|
||||||
CSQueue parentQueue = parent;
|
|
||||||
CapacitySchedulerQueueInfoList queuesInfo =
|
CapacitySchedulerQueueInfoList queuesInfo =
|
||||||
new CapacitySchedulerQueueInfoList();
|
new CapacitySchedulerQueueInfoList();
|
||||||
for (CSQueue queue : parentQueue.getChildQueues()) {
|
// JAXB marashalling leads to situation where the "type" field injected
|
||||||
|
// for JSON changes from string to array depending on order of printing
|
||||||
|
// Issue gets fixed if all the leaf queues are marshalled before the
|
||||||
|
// non-leaf queues. See YARN-4785 for more details.
|
||||||
|
List<CSQueue> childQueues = new ArrayList<>();
|
||||||
|
List<CSQueue> childLeafQueues = new ArrayList<>();
|
||||||
|
List<CSQueue> childNonLeafQueues = new ArrayList<>();
|
||||||
|
for (CSQueue queue : parent.getChildQueues()) {
|
||||||
|
if (queue instanceof LeafQueue) {
|
||||||
|
childLeafQueues.add(queue);
|
||||||
|
} else {
|
||||||
|
childNonLeafQueues.add(queue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
childQueues.addAll(childLeafQueues);
|
||||||
|
childQueues.addAll(childNonLeafQueues);
|
||||||
|
|
||||||
|
for (CSQueue queue : childQueues) {
|
||||||
CapacitySchedulerQueueInfo info;
|
CapacitySchedulerQueueInfo info;
|
||||||
if (queue instanceof LeafQueue) {
|
if (queue instanceof LeafQueue) {
|
||||||
info =
|
info = new CapacitySchedulerLeafQueueInfo((LeafQueue) queue);
|
||||||
new CapacitySchedulerLeafQueueInfo((LeafQueue) queue);
|
|
||||||
} else {
|
} else {
|
||||||
info = new CapacitySchedulerQueueInfo(queue);
|
info = new CapacitySchedulerQueueInfo(queue);
|
||||||
info.queues = getQueues(queue);
|
info.queues = getQueues(queue);
|
||||||
|
|
|
@ -43,6 +43,7 @@ import org.apache.hadoop.yarn.webapp.WebServicesTestUtils;
|
||||||
import org.codehaus.jettison.json.JSONArray;
|
import org.codehaus.jettison.json.JSONArray;
|
||||||
import org.codehaus.jettison.json.JSONException;
|
import org.codehaus.jettison.json.JSONException;
|
||||||
import org.codehaus.jettison.json.JSONObject;
|
import org.codehaus.jettison.json.JSONObject;
|
||||||
|
import org.junit.Assert;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
|
@ -379,6 +380,8 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase {
|
||||||
verifySubQueue(obj, q2, qi.absoluteCapacity, qi.absoluteMaxCapacity);
|
verifySubQueue(obj, q2, qi.absoluteCapacity, qi.absoluteMaxCapacity);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Assert.assertEquals("\"type\" field is incorrect",
|
||||||
|
"capacitySchedulerLeafQueueInfo", info.getString("type"));
|
||||||
LeafQueueInfo lqi = (LeafQueueInfo) qi;
|
LeafQueueInfo lqi = (LeafQueueInfo) qi;
|
||||||
lqi.numActiveApplications = info.getInt("numActiveApplications");
|
lqi.numActiveApplications = info.getInt("numActiveApplications");
|
||||||
lqi.numPendingApplications = info.getInt("numPendingApplications");
|
lqi.numPendingApplications = info.getInt("numPendingApplications");
|
||||||
|
|
Loading…
Reference in New Issue