MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain associated with it (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1336399 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e3fbc52686
commit
0308423b9c
|
@ -475,6 +475,9 @@ Release 0.23.3 - UNRELEASED
|
||||||
MAPREDUCE-4215. RM app page shows 500 error on appid parse error
|
MAPREDUCE-4215. RM app page shows 500 error on appid parse error
|
||||||
(Jonathon Eagles via tgraves)
|
(Jonathon Eagles via tgraves)
|
||||||
|
|
||||||
|
MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain
|
||||||
|
associated with it (bobby)
|
||||||
|
|
||||||
Release 0.23.2 - UNRELEASED
|
Release 0.23.2 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.server.nodemanager;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -35,6 +36,7 @@ import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.fs.FileContext;
|
import org.apache.hadoop.fs.FileContext;
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
||||||
|
import org.apache.hadoop.net.NetUtils;
|
||||||
import org.apache.hadoop.yarn.YarnException;
|
import org.apache.hadoop.yarn.YarnException;
|
||||||
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
||||||
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
||||||
|
@ -88,7 +90,7 @@ public class TestNodeStatusUpdater {
|
||||||
int heartBeatID = 0;
|
int heartBeatID = 0;
|
||||||
volatile Throwable nmStartError = null;
|
volatile Throwable nmStartError = null;
|
||||||
private final List<NodeId> registeredNodes = new ArrayList<NodeId>();
|
private final List<NodeId> registeredNodes = new ArrayList<NodeId>();
|
||||||
private final Configuration conf = new YarnConfiguration();
|
private final Configuration conf = createNMConfig();
|
||||||
private NodeManager nm;
|
private NodeManager nm;
|
||||||
protected NodeManager rebootedNodeManager;
|
protected NodeManager rebootedNodeManager;
|
||||||
|
|
||||||
|
@ -117,7 +119,9 @@ public class TestNodeStatusUpdater {
|
||||||
Resource resource = request.getResource();
|
Resource resource = request.getResource();
|
||||||
LOG.info("Registering " + nodeId.toString());
|
LOG.info("Registering " + nodeId.toString());
|
||||||
// NOTE: this really should be checking against the config value
|
// NOTE: this really should be checking against the config value
|
||||||
Assert.assertEquals("localhost:12345", nodeId.toString());
|
InetSocketAddress expected = NetUtils.getConnectAddress(
|
||||||
|
conf.getSocketAddr(YarnConfiguration.NM_ADDRESS, null, -1));
|
||||||
|
Assert.assertEquals(NetUtils.getHostPortString(expected), nodeId.toString());
|
||||||
Assert.assertEquals(5 * 1024, resource.getMemory());
|
Assert.assertEquals(5 * 1024, resource.getMemory());
|
||||||
registeredNodes.add(nodeId);
|
registeredNodes.add(nodeId);
|
||||||
RegistrationResponse regResponse = recordFactory
|
RegistrationResponse regResponse = recordFactory
|
||||||
|
@ -429,6 +433,7 @@ public class TestNodeStatusUpdater {
|
||||||
while (nm.getServiceState() == STATE.INITED && waitCount++ != 20) {
|
while (nm.getServiceState() == STATE.INITED && waitCount++ != 20) {
|
||||||
LOG.info("Waiting for NM to start..");
|
LOG.info("Waiting for NM to start..");
|
||||||
if (nmStartError != null) {
|
if (nmStartError != null) {
|
||||||
|
LOG.error("Error during startup. ", nmStartError);
|
||||||
Assert.fail(nmStartError.getCause().getMessage());
|
Assert.fail(nmStartError.getCause().getMessage());
|
||||||
}
|
}
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
|
|
Loading…
Reference in New Issue