MAPREDUCE-7133. History Server task attempts REST API returns invalid data. Contributed by Oleksandr Shevchenko
This commit is contained in:
parent
250b50018e
commit
2886024ac3
@ -19,12 +19,10 @@
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = "taskAttempts")
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
public class TaskAttemptsInfo {
|
||||
|
||||
protected ArrayList<TaskAttemptInfo> taskAttempt = new ArrayList<TaskAttemptInfo>();
|
||||
@ -36,6 +34,10 @@ public void add(TaskAttemptInfo taskattemptInfo) {
|
||||
taskAttempt.add(taskattemptInfo);
|
||||
}
|
||||
|
||||
// XmlElementRef annotation should be used to identify the exact type of a list element
|
||||
// otherwise metadata will be added to XML attributes,
|
||||
// it can lead to incorrect JSON marshaling
|
||||
@XmlElementRef
|
||||
public ArrayList<TaskAttemptInfo> getTaskAttempts() {
|
||||
return taskAttempt;
|
||||
}
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
@ -483,6 +484,8 @@ public void verifyAMTaskAttemptsXML(NodeList nodes, Task task) {
|
||||
Boolean found = false;
|
||||
for (int i = 0; i < nodes.getLength(); i++) {
|
||||
Element element = (Element) nodes.item(i);
|
||||
assertFalse("task attempt should not contain any attributes, it can lead to incorrect JSON marshaling",
|
||||
element.hasAttributes());
|
||||
|
||||
if (attid.matches(WebServicesTestUtils.getXmlString(element, "id"))) {
|
||||
found = true;
|
||||
|
@ -1875,7 +1875,7 @@ Response Body:
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<taskAttempts>
|
||||
<taskAttempt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="reduceTaskAttemptInfo">
|
||||
<taskAttempt>
|
||||
<startTime>1326238777460</startTime>
|
||||
<finishTime>0</finishTime>
|
||||
<elapsedTime>0</elapsedTime>
|
||||
|
Loading…
Reference in New Issue
Block a user