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

merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-02-29 15:51:55 +00:00
parent cb6f468ddf
commit 90c6dd8468
22 changed files with 86 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3687. If AM dies before it returns new tracking URL, proxy
redirects to http://N/A/ and doesn't return error code (Ravi Prakash via
bobby)
MAPREDUCE-3920. Revise yarn default port number selection
(Dave Thompson via tgraves)
Release 0.23.1 - 2012-02-17

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java
View File

@ -141,7 +141,7 @@ public class LocalContainerAllocator extends RMCommunicator
nodeId.setPort(1234);
container.setNodeId(nodeId);
container.setContainerToken(null);
container.setNodeHttpAddress("localhost:9999");
container.setNodeHttpAddress("localhost:8042");
// send the container-assigned event to task attempt
if (event.getAttemptID().getTaskId().getTaskType() == TaskType.MAP) {

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
View File

@ -104,7 +104,7 @@ public class MRApp extends MRAppMaster {
public static String NM_HOST = "localhost";
public static int NM_PORT = 1234;
public static int NM_HTTP_PORT = 9999;
public static int NM_HTTP_PORT = 8042;
private static final RecordFactory recordFactory =
RecordFactoryProvider.getRecordFactory(null);

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java
View File

@ -155,7 +155,7 @@ public class MRAppBenchmark {
nodeId.setPort(1234);
container.setNodeId(nodeId);
container.setContainerToken(null);
container.setNodeHttpAddress("localhost:9999");
container.setNodeHttpAddress("localhost:8042");
getContext().getEventHandler()
.handle(
new TaskAttemptContainerAssignedEvent(event

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockJobs.java
View File

@ -98,7 +98,7 @@ public class MockJobs extends MockApps {
public static final String NM_HOST = "localhost";
public static final int NM_PORT = 1234;
public static final int NM_HTTP_PORT = 9999;
public static final int NM_HTTP_PORT = 8042;
static final int DT = 1000000; // ms
@ -284,7 +284,7 @@ public class MockJobs extends MockApps {
@Override
public String getNodeHttpAddress() {
return "localhost:9999";
return "localhost:8042";
}
@Override

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

@ -54,7 +54,7 @@ public class TestMaster {
}
// Change master address to a valid value
conf.set(MRConfig.MASTER_ADDRESS, "bar.com:9999");
conf.set(MRConfig.MASTER_ADDRESS, "bar.com:8042");
masterHostname = Master.getMasterAddress(conf).getHostName();
assertEquals(masterHostname, "bar.com");

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java
View File

@ -92,7 +92,7 @@ public class TestYarnClientProtocolProvider extends TestCase {
rmDTToken.setIdentifier(ByteBuffer.wrap(new byte[2]));
rmDTToken.setKind("Testclusterkind");
rmDTToken.setPassword(ByteBuffer.wrap("testcluster".getBytes()));
rmDTToken.setService("0.0.0.0:8040");
rmDTToken.setService("0.0.0.0:8032");
getDTResponse.setRMDelegationToken(rmDTToken);
ClientRMProtocol cRMProtocol = mock(ClientRMProtocol.class);
when(cRMProtocol.getDelegationToken(any(

10
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -88,7 +88,7 @@ public class YarnConfiguration extends Configuration {
/** The address of the applications manager interface in the RM.*/
public static final String RM_ADDRESS =
RM_PREFIX + "address";
public static final int DEFAULT_RM_PORT = 8040;
public static final int DEFAULT_RM_PORT = 8032;
public static final String DEFAULT_RM_ADDRESS =
"0.0.0.0:" + DEFAULT_RM_PORT;
@ -123,7 +123,7 @@ public class YarnConfiguration extends Configuration {
public static final String RM_RESOURCE_TRACKER_ADDRESS =
RM_PREFIX + "resource-tracker.address";
public static final int DEFAULT_RM_RESOURCE_TRACKER_PORT = 8025;
public static final int DEFAULT_RM_RESOURCE_TRACKER_PORT = 8031;
public static final String DEFAULT_RM_RESOURCE_TRACKER_ADDRESS =
"0.0.0.0:" + DEFAULT_RM_RESOURCE_TRACKER_PORT;
@ -153,7 +153,7 @@ public class YarnConfiguration extends Configuration {
/** The address of the RM admin interface.*/
public static final String RM_ADMIN_ADDRESS =
RM_PREFIX + "admin.address";
public static final int DEFAULT_RM_ADMIN_PORT = 8141;
public static final int DEFAULT_RM_ADMIN_PORT = 8033;
public static final String DEFAULT_RM_ADMIN_ADDRESS = "0.0.0.0:" +
DEFAULT_RM_ADMIN_PORT;
@ -285,7 +285,7 @@ public class YarnConfiguration extends Configuration {
/** Address where the localizer IPC is.*/
public static final String NM_LOCALIZER_ADDRESS =
NM_PREFIX + "localizer.address";
public static final int DEFAULT_NM_LOCALIZER_PORT = 4344;
public static final int DEFAULT_NM_LOCALIZER_PORT = 8040;
public static final String DEFAULT_NM_LOCALIZER_ADDRESS = "0.0.0.0:" +
DEFAULT_NM_LOCALIZER_PORT;
@ -366,7 +366,7 @@ public class YarnConfiguration extends Configuration {
/** NM Webapp address.**/
public static final String NM_WEBAPP_ADDRESS = NM_PREFIX + "webapp.address";
public static final int DEFAULT_NM_WEBAPP_PORT = 9999;
public static final int DEFAULT_NM_WEBAPP_PORT = 8042;
public static final String DEFAULT_NM_WEBAPP_ADDRESS = "0.0.0.0:" +
DEFAULT_NM_WEBAPP_PORT;

10
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
View File

@ -61,7 +61,7 @@
<property>
<description>The address of the applications manager interface in the RM.</description>
<name>yarn.resourcemanager.address</name>
<value>0.0.0.0:8040</value>
<value>0.0.0.0:8032</value>
</property>
<property>
@ -101,7 +101,7 @@
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>0.0.0.0:8025</value>
<value>0.0.0.0:8031</value>
</property>
<property>
@ -119,7 +119,7 @@
<property>
<description>The address of the RM admin interface.</description>
<name>yarn.resourcemanager.admin.address</name>
<value>0.0.0.0:8141</value>
<value>0.0.0.0:8033</value>
</property>
<property>
@ -274,7 +274,7 @@
<property>
<description>Address where the localizer IPC is.</description>
<name>yarn.nodemanager.localizer.address</name>
<value>0.0.0.0:4344</value>
<value>0.0.0.0:8040</value>
</property>
<property>
@ -355,7 +355,7 @@
<property>
<description>NM Webapp address.</description>
<name>yarn.nodemanager.webapp.address</name>
<value>0.0.0.0:9999</value>
<value>0.0.0.0:8042</value>
</property>
<property>

10
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestNodeId.java
View File

@ -27,10 +27,10 @@ import org.junit.Test;
public class TestNodeId {
@Test
public void testNodeId() {
NodeId nodeId1 = createNodeId("10.18.52.124", 45454);
NodeId nodeId2 = createNodeId("10.18.52.125", 45452);
NodeId nodeId3 = createNodeId("10.18.52.124", 45454);
NodeId nodeId4 = createNodeId("10.18.52.124", 45453);
NodeId nodeId1 = createNodeId("10.18.52.124", 8041);
NodeId nodeId2 = createNodeId("10.18.52.125", 8038);
NodeId nodeId3 = createNodeId("10.18.52.124", 8041);
NodeId nodeId4 = createNodeId("10.18.52.124", 8039);
Assert.assertTrue(nodeId1.equals(nodeId3));
Assert.assertFalse(nodeId1.equals(nodeId2));
@ -44,7 +44,7 @@ public class TestNodeId {
Assert.assertFalse(nodeId1.hashCode() == nodeId2.hashCode());
Assert.assertFalse(nodeId3.hashCode() == nodeId4.hashCode());
Assert.assertEquals("10.18.52.124:45454", nodeId1.toString());
Assert.assertEquals("10.18.52.124:8041", nodeId1.toString());
}
private NodeId createNodeId(String host, int port) {

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java
View File

@ -140,7 +140,7 @@ public class TestDefaultContainerExecutor {
// final String appId = "app_RM_0";
// final Path logDir = new Path(basedir, "logs");
// final Path nmLocal = new Path(basedir, "nmPrivate/" + user + "/" + appId);
// final InetSocketAddress nmAddr = new InetSocketAddress("foobar", 4344);
// final InetSocketAddress nmAddr = new InetSocketAddress("foobar", 8040);
// System.out.println("NMLOCAL: " + nmLocal);
// Random r = new Random();
//

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java
View File

@ -80,7 +80,7 @@ public class TestPBLocalizerRPC {
@Test
public void testLocalizerRPC() throws Exception {
InetSocketAddress locAddr = new InetSocketAddress("0.0.0.0", 4344);
InetSocketAddress locAddr = new InetSocketAddress("0.0.0.0", 8040);
LocalizerService server = new LocalizerService(locAddr);
try {
server.start();

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java
View File

@ -89,7 +89,7 @@ public class TestContainerLocalizer {
final String user = "yak";
final String appId = "app_RM_0";
final String cId = "container_0";
final InetSocketAddress nmAddr = new InetSocketAddress("foobar", 4344);
final InetSocketAddress nmAddr = new InetSocketAddress("foobar", 8040);
final List<Path> localDirs = new ArrayList<Path>();
for (int i = 0; i < 4; ++i) {
localDirs.add(lfs.makeQualified(new Path(basedir, i + "")));

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java
View File

@ -87,7 +87,7 @@ public class TestNMWebServices extends JerseyTest {
protected void configureServlets() {
nmContext = new NodeManager.NMContext();
nmContext.getNodeId().setHost("testhost.foo.com");
nmContext.getNodeId().setPort(9999);
nmContext.getNodeId().setPort(8042);
resourceView = new ResourceView() {
@Override
public long getVmemAllocatedForContainers() {
@ -330,7 +330,7 @@ public class TestNMWebServices extends JerseyTest {
String hadoopVersion, String resourceManagerVersionBuiltOn,
String resourceManagerBuildVersion, String resourceManagerVersion) {
WebServicesTestUtils.checkStringMatch("id", "testhost.foo.com:9999", id);
WebServicesTestUtils.checkStringMatch("id", "testhost.foo.com:8042", id);
WebServicesTestUtils.checkStringMatch("healthReport", "Healthy",
healthReport);
assertEquals("totalVmemAllocatedContainersMB incorrect", 15872,

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java
View File

@ -93,7 +93,7 @@ public class TestNMWebServicesContainers extends JerseyTest {
protected void configureServlets() {
nmContext = new NodeManager.NMContext();
nmContext.getNodeId().setHost("testhost.foo.com");
nmContext.getNodeId().setPort(9999);
nmContext.getNodeId().setPort(8042);
resourceView = new ResourceView() {
@Override
public long getVmemAllocatedForContainers() {

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java
View File

@ -163,7 +163,7 @@ public class TestAMRestart {
// container.setContainerToken(recordFactory.newRecordInstance(ContainerToken.class));
// container.setNodeId(recordFactory.newRecordInstance(NodeId.class));
// container.setContainerManagerAddress("localhost");
// container.setNodeHttpAddress("localhost:9999");
// container.setNodeHttpAddress("localhost:8042");
// container.setId(recordFactory.newRecordInstance(ContainerId.class));
// container.getId().setAppId(appID);
// container.getId().setId(count);

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
View File

@ -481,7 +481,7 @@ public class TestRMAppAttemptTransitions {
public void testUnregisterToKilledFinish() {
Container amContainer = allocateApplicationAttempt();
launchApplicationAttempt(amContainer);
runApplicationAttempt(amContainer, "host", 9999, "oldtrackingurl");
runApplicationAttempt(amContainer, "host", 8042, "oldtrackingurl");
String trackingUrl = "newtrackingurl";
String diagnostics = "Killed by user";
FinalApplicationStatus finalStatus = FinalApplicationStatus.KILLED;
@ -498,7 +498,7 @@ public class TestRMAppAttemptTransitions {
public void testUnregisterToSuccessfulFinish() {
Container amContainer = allocateApplicationAttempt();
launchApplicationAttempt(amContainer);
runApplicationAttempt(amContainer, "host", 9999, "oldtrackingurl");
runApplicationAttempt(amContainer, "host", 8042, "oldtrackingurl");
String trackingUrl = "mytrackingurl";
String diagnostics = "Successful";
FinalApplicationStatus finalStatus = FinalApplicationStatus.SUCCEEDED;

20
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm
View File

@ -642,11 +642,11 @@ History Server REST API's.
"jobAttempts" : {
"jobAttempt" : [
{
"nodeId" : "host.domain.com:45454",
"nodeHttpAddress" : "host.domain.com:9999",
"nodeId" : "host.domain.com:8041",
"nodeHttpAddress" : "host.domain.com:8042",
"startTime" : 1326381444693,
"id" : 1,
"logsLink" : "http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1",
"logsLink" : "http://host.domain.com:19888/jobhistory/logs/host.domain.com:8041/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1",
"containerId" : "container_1326381300833_0002_01_000001"
}
]
@ -678,12 +678,12 @@ History Server REST API's.
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<jobAttempts>
<jobAttempt>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeId>host.domain.com:45454</nodeId>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<nodeId>host.domain.com:8041</nodeId>
<id>1</id>
<startTime>1326381444693</startTime>
<containerId>container_1326381300833_0002_01_000001</containerId>
<logsLink>http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1</logsLink>
<logsLink>http://host.domain.com:19888/jobhistory/logs/host.domain.com:8041/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1</logsLink>
</jobAttempt>
</jobAttempts>
+---+
@ -2138,7 +2138,7 @@ History Server REST API's.
"state" : "SUCCEEDED",
"diagnostics" : "",
"rack" : "/98.139.92.0",
"nodeHttpAddress" : "host.domain.com:9999",
"nodeHttpAddress" : "host.domain.com:8042",
"startTime" : 1326381450680,
"id" : "attempt_1326381300833_2_2_m_0_0",
"type" : "MAP",
@ -2180,7 +2180,7 @@ History Server REST API's.
<id>attempt_1326381300833_2_2_m_0_0</id>
<rack>/98.139.92.0</rack>
<state>SUCCEEDED</state>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<diagnostics/>
<type>MAP</type>
<assignedContainerId>container_1326381300833_0002_01_000002</assignedContainerId>
@ -2287,7 +2287,7 @@ History Server REST API's.
"state" : "SUCCEEDED",
"diagnostics" : "",
"rack" : "/98.139.92.0",
"nodeHttpAddress" : "host.domain.com:9999",
"nodeHttpAddress" : "host.domain.com:8042",
"startTime" : 1326381450680,
"id" : "attempt_1326381300833_2_2_m_0_0",
"type" : "MAP",
@ -2326,7 +2326,7 @@ History Server REST API's.
<id>attempt_1326381300833_2_2_m_0_0</id>
<rack>/98.139.92.0</rack>
<state>SUCCEEDED</state>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<diagnostics/>
<type>MAP</type>
<assignedContainerId>container_1326381300833_0002_01_000002</assignedContainerId>

20
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm
View File

@ -602,11 +602,11 @@ MapReduce Application Master REST API's.
"jobAttempts" : {
"jobAttempt" : [
{
"nodeId" : "host.domain.com:45454",
"nodeHttpAddress" : "host.domain.com:9999",
"nodeId" : "host.domain.com:8041",
"nodeHttpAddress" : "host.domain.com:8042",
"startTime" : 1326238773493,
"id" : 1,
"logsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001",
"logsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326232085508_0004_01_000001",
"containerId" : "container_1326232085508_0004_01_000001"
}
]
@ -638,12 +638,12 @@ MapReduce Application Master REST API's.
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<jobAttempts>
<jobAttempt>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeId>host.domain.com:45454</nodeId>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<nodeId>host.domain.com:8041</nodeId>
<id>1</id>
<startTime>1326238773493</startTime>
<containerId>container_1326232085508_0004_01_000001</containerId>
<logsLink>http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001</logsLink>
<logsLink>http://host.domain.com:8042/node/containerlogs/container_1326232085508_0004_01_000001</logsLink>
</jobAttempt>
</jobAttempts>
+---+
@ -2095,7 +2095,7 @@ MapReduce Application Master REST API's.
"mergeFinishTime" : 1326238780099,
"rack" : "/98.139.92.0",
"elapsedReduceTime" : 0,
"nodeHttpAddress" : "host.domain.com:9999",
"nodeHttpAddress" : "host.domain.com:8042",
"type" : "REDUCE",
"startTime" : 1326238777460,
"id" : "attempt_1326232085508_4_4_r_0_0",
@ -2137,7 +2137,7 @@ MapReduce Application Master REST API's.
<id>attempt_1326232085508_4_4_r_0_0</id>
<rack>/98.139.92.0</rack>
<state>RUNNING</state>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<type>REDUCE</type>
<assignedContainerId>container_1326232085508_0004_01_000003</assignedContainerId>
<shuffleFinishTime>1326238780052</shuffleFinishTime>
@ -2251,7 +2251,7 @@ MapReduce Application Master REST API's.
"mergeFinishTime" : 1326238780099,
"rack" : "/98.139.92.0",
"elapsedReduceTime" : 0,
"nodeHttpAddress" : "host.domain.com:9999",
"nodeHttpAddress" : "host.domain.com:8042",
"startTime" : 1326238777460,
"id" : "attempt_1326232085508_4_4_r_0_0",
"type" : "REDUCE",
@ -2290,7 +2290,7 @@ MapReduce Application Master REST API's.
<id>attempt_1326232085508_4_4_r_0_0</id>
<rack>/98.139.92.0</rack>
<state>RUNNING</state>
<nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
<nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
<type>REDUCE</type>
<assignedContainerId>container_1326232085508_0004_01_000003</assignedContainerId>
<shuffleFinishTime>1326238780052</shuffleFinishTime>

28
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
View File

@ -116,7 +116,7 @@ NodeManager REST API's.
"totalPmemAllocatedContainersMB" : 8192,
"nodeManagerVersionBuiltOn" : "Mon Jan 9 15:01:59 UTC 2012",
"nodeManagerVersion" : "0.23.1-SNAPSHOT",
"id" : "host.domain.com:45454",
"id" : "host.domain.com:8041",
"hadoopBuildVersion" : "0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00",
"nodeHostName" : "host.domain.com",
"hadoopVersion" : "0.23.1-SNAPSHOT"
@ -158,7 +158,7 @@ NodeManager REST API's.
<hadoopVersion>0.23.1-SNAPSHOT</hadoopVersion>
<hadoopBuildVersion>0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00</hadoopBuildVersion>
<hadoopVersionBuiltOn>Mon Jan 9 14:58:42 UTC 2012</hadoopVersionBuiltOn>
<id>host.domain.com:45454</id>
<id>host.domain.com:8041</id>
<nodeHostName>host.domain.com</nodeHostName>
</nodeInfo>
+---+
@ -446,21 +446,21 @@ NodeManager REST API's.
"containers" : {
"container" : [
{
"nodeId" : "host.domain.com:45454",
"nodeId" : "host.domain.com:8041",
"totalMemoryNeededMB" : 2048,
"state" : "RUNNING",
"diagnostics" : "",
"containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1",
"containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000001/user1",
"user" : "user1",
"id" : "container_1326121700862_0006_01_000001",
"exitCode" : -1000
},
{
"nodeId" : "host.domain.com:45454",
"nodeId" : "host.domain.com:8041",
"totalMemoryNeededMB" : 2048,
"state" : "RUNNING",
"diagnostics" : "",
"containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1",
"containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000003/user1",
"user" : "user1",
"id" : "container_1326121700862_0006_01_000003",
"exitCode" : -1000
@ -500,8 +500,8 @@ NodeManager REST API's.
<diagnostics/>
<user>user1</user>
<totalMemoryNeededMB>2048</totalMemoryNeededMB>
<containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1</containerLogsLink>
<nodeId>host.domain.com:45454</nodeId>
<containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000001/user1</containerLogsLink>
<nodeId>host.domain.com:8041</nodeId>
</container>
<container>
<id>container_1326121700862_0006_01_000003</id>
@ -510,8 +510,8 @@ NodeManager REST API's.
<diagnostics>Container killed by the ApplicationMaster.</diagnostics>
<user>user1</user>
<totalMemoryNeededMB>2048</totalMemoryNeededMB>
<containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1</containerLogsLink>
<nodeId>host.domain.com:45454</nodeId>
<containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000003/user1</containerLogsLink>
<nodeId>host.domain.com:8041</nodeId>
</container>
</containers>
+---+
@ -587,11 +587,11 @@ NodeManager REST API's.
+---+
{
"container" : {
"nodeId" : "host.domain.com:45454",
"nodeId" : "host.domain.com:8041",
"totalMemoryNeededMB" : 2048,
"state" : "RUNNING",
"diagnostics" : "",
"containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1",
"containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0007_01_000001/user1",
"user" : "user1",
"id" : "container_1326121700862_0007_01_000001",
"exitCode" : -1000
@ -628,8 +628,8 @@ NodeManager REST API's.
<diagnostics/>
<user>user1</user>
<totalMemoryNeededMB>2048</totalMemoryNeededMB>
<containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1</containerLogsLink>
<nodeId>host.domain.com:45454</nodeId>
<containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0007_01_000001/user1</containerLogsLink>
<nodeId>host.domain.com:8041</nodeId>
</container>
+---+

24
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
View File

@ -939,14 +939,14 @@ ResourceManager REST API's.
[
{
"finishedTime" : 1326815598530,
"amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001_01_000001",
"amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001",
"trackingUI" : "History",
"state" : "FINISHED",
"user" : "user1",
"id" : "application_1326815542473_0001",
"clusterId" : 1326815542473,
"finalStatus" : "SUCCEEDED",
"amHostHttpAddress" : "host.domain.com:9999",
"amHostHttpAddress" : "host.domain.com:8042",
"progress" : 100,
"name" : "word count",
"startedTime" : 1326815573334,
@ -957,14 +957,14 @@ ResourceManager REST API's.
},
{
"finishedTime" : 1326815789546,
"amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001",
"amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001",
"trackingUI" : "History",
"state" : "FINISHED",
"user" : "user1",
"id" : "application_1326815542473_0002",
"clusterId" : 1326815542473,
"finalStatus" : "SUCCEEDED",
"amHostHttpAddress" : "host.domain.com:9999",
"amHostHttpAddress" : "host.domain.com:8042",
"progress" : 100,
"name" : "Sleep job",
"startedTime" : 1326815641380,
@ -1017,9 +1017,9 @@ ResourceManager REST API's.
<startedTime>1326815573334</startedTime>
<finishedTime>1326815598530</finishedTime>
<elapsedTime>25196</elapsedTime>
<amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001
<amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001
_01_000001</amContainerLogs>
<amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
<amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
</app>
<app>
<id>application_1326815542473_0002</id>
@ -1036,8 +1036,8 @@ _01_000001</amContainerLogs>
<startedTime>1326815641380</startedTime>
<finishedTime>1326815789546</finishedTime>
<elapsedTime>148166</elapsedTime>
<amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001</amContainerLogs>
<amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
<amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001</amContainerLogs>
<amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
</app>
</apps>
@ -1132,14 +1132,14 @@ _01_000001</amContainerLogs>
{
"app" : {
"finishedTime" : 1326824991300,
"amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001",
"amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001",
"trackingUI" : "History",
"state" : "FINISHED",
"user" : "user1",
"id" : "application_1326821518301_0005",
"clusterId" : 1326821518301,
"finalStatus" : "SUCCEEDED",
"amHostHttpAddress" : "host.domain.com:9999",
"amHostHttpAddress" : "host.domain.com:8042",
"progress" : 100,
"name" : "Sleep job",
"startedTime" : 1326824544552,
@ -1188,8 +1188,8 @@ _01_000001</amContainerLogs>
<startedTime>1326824544552</startedTime>
<finishedTime>1326824991300</finishedTime>
<elapsedTime>446748</elapsedTime>
<amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001</amContainerLogs>
<amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
<amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001</amContainerLogs>
<amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
</app>
+---+

12
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
View File

@ -182,7 +182,7 @@ Note that the order of the fields within response body is not specified and migh
The client prints information about the job submitted along with the application id, similar to:
+---+
12/01/18 04:25:15 INFO mapred.ResourceMgrDelegate: Submitted application application_1326821518301_0010 to ResourceManager at host.domain.com/10.10.10.10:8040
12/01/18 04:25:15 INFO mapred.ResourceMgrDelegate: Submitted application application_1326821518301_0010 to ResourceManager at host.domain.com/10.10.10.10:8032
12/01/18 04:25:15 INFO mapreduce.Job: Running job: job_1326821518301_0010
12/01/18 04:25:21 INFO mapred.ClientServiceDelegate: The url to track the job: host.domain.com:8088/proxy/application_1326821518301_0010/
12/01/18 04:25:22 INFO mapreduce.Job: Job job_1326821518301_0010 running in uber mode : false
@ -201,14 +201,14 @@ curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8
{
"app" : {
"finishedTime" : 0,
"amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001",
"amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0010_01_000001",
"trackingUI" : "ApplicationMaster",
"state" : "RUNNING",
"user" : "user1",
"id" : "application_1326821518301_0010",
"clusterId" : 1326821518301,
"finalStatus" : "UNDEFINED",
"amHostHttpAddress" : "host.domain.com:9999",
"amHostHttpAddress" : "host.domain.com:8042",
"progress" : 82.44703,
"name" : "Sleep job",
"startedTime" : 1326860715335,
@ -338,7 +338,7 @@ curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8
"mergeFinishTime" : 1326860735536,
"rack" : "/10.10.10.0",
"elapsedReduceTime" : 0,
"nodeHttpAddress" : "host.domain.com:9999",
"nodeHttpAddress" : "host.domain.com:8042",
"type" : "REDUCE",
"startTime" : 1326860732984,
"id" : "attempt_1326821518301_10_10_r_0_0",
@ -575,14 +575,14 @@ curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8
{
"app" : {
"finishedTime" : 1326861991282,
"amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001",
"amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0010_01_000001",
"trackingUI" : "History",
"state" : "FINISHED",
"user" : "user1",
"id" : "application_1326821518301_0010",
"clusterId" : 1326821518301,
"finalStatus" : "SUCCEEDED",
"amHostHttpAddress" : "host.domain.com:9999",
"amHostHttpAddress" : "host.domain.com:8042",
"progress" : 100,
"name" : "Sleep job",
"startedTime" : 1326860715335,