From 90c6dd846864dee42ab13366d804f534a0a6fdf7 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Wed, 29 Feb 2012 15:51:55 +0000 Subject: [PATCH] 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 --- hadoop-mapreduce-project/CHANGES.txt | 3 ++ .../v2/app/local/LocalContainerAllocator.java | 2 +- .../apache/hadoop/mapreduce/v2/app/MRApp.java | 2 +- .../mapreduce/v2/app/MRAppBenchmark.java | 2 +- .../hadoop/mapreduce/v2/app/MockJobs.java | 4 +-- .../org/apache/hadoop/mapred/TestMaster.java | 2 +- .../TestYarnClientProtocolProvider.java | 2 +- .../hadoop/yarn/conf/YarnConfiguration.java | 10 +++---- .../src/main/resources/yarn-default.xml | 10 +++---- .../apache/hadoop/yarn/api/TestNodeId.java | 10 +++---- .../TestDefaultContainerExecutor.java | 2 +- .../impl/pb/TestPBLocalizerRPC.java | 2 +- .../localizer/TestContainerLocalizer.java | 2 +- .../nodemanager/webapp/TestNMWebServices.java | 4 +-- .../webapp/TestNMWebServicesContainers.java | 2 +- .../applicationsmanager/TestAMRestart.java | 2 +- .../attempt/TestRMAppAttemptTransitions.java | 4 +-- .../src/site/apt/HistoryServerRest.apt.vm | 20 ++++++------- .../src/site/apt/MapredAppMasterRest.apt.vm | 20 ++++++------- .../src/site/apt/NodeManagerRest.apt.vm | 28 +++++++++---------- .../src/site/apt/ResourceManagerRest.apt.vm | 24 ++++++++-------- .../src/site/apt/WebServicesIntro.apt.vm | 12 ++++---- 22 files changed, 86 insertions(+), 83 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 436bccb9009..8356c9fb6a8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java index 6bb51321430..646320ba62d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java @@ -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) { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java index 325adacb300..505f4453093 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java @@ -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); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java index ebb20b06565..9ed27a9f1f2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java @@ -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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockJobs.java index cfecb3268e9..0ffe9acdb91 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockJobs.java @@ -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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMaster.java index 4a824058b37..58bbb3ee4e8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMaster.java @@ -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"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java index 1aa448b52e1..3a88e71cddc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java @@ -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( diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 22b87821f95..a831836f4b7 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -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; diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 217d6e1c775..0a419a4488b 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -61,7 +61,7 @@ The address of the applications manager interface in the RM. yarn.resourcemanager.address - 0.0.0.0:8040 + 0.0.0.0:8032 @@ -101,7 +101,7 @@ yarn.resourcemanager.resource-tracker.address - 0.0.0.0:8025 + 0.0.0.0:8031 @@ -119,7 +119,7 @@ The address of the RM admin interface. yarn.resourcemanager.admin.address - 0.0.0.0:8141 + 0.0.0.0:8033 @@ -274,7 +274,7 @@ Address where the localizer IPC is. yarn.nodemanager.localizer.address - 0.0.0.0:4344 + 0.0.0.0:8040 @@ -355,7 +355,7 @@ NM Webapp address. yarn.nodemanager.webapp.address - 0.0.0.0:9999 + 0.0.0.0:8042 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestNodeId.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestNodeId.java index 641d6250b94..45358cb2167 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestNodeId.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestNodeId.java @@ -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) { diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java index 555f7accdab..5af7b43077c 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java @@ -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(); // diff --git a/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 b/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 index 39eecff3df9..56fbeeab18e 100644 --- a/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 +++ b/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 @@ -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(); diff --git a/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 b/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 index 32a3367e9aa..76a48688907 100644 --- a/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 +++ b/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 @@ -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 localDirs = new ArrayList(); for (int i = 0; i < 4; ++i) { localDirs.add(lfs.makeQualified(new Path(basedir, i + ""))); diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index 3b1d2cf81c7..a12fb84bef9 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -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, diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java index a466fa97941..ef2e8132623 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java @@ -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() { diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java index e9062bc3dd8..08a9198e5be 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java @@ -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); diff --git a/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 b/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 index 1059e58ab96..d962df841e8 100644 --- a/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 +++ b/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 @@ -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; diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm index a7dda193dfa..f913bfc7943 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm @@ -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. - host.domain.com:9999 - host.domain.com:45454 + host.domain.com:8042 + host.domain.com:8041 1 1326381444693 container_1326381300833_0002_01_000001 - http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1 + http://host.domain.com:19888/jobhistory/logs/host.domain.com:8041/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1 +---+ @@ -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. attempt_1326381300833_2_2_m_0_0 /98.139.92.0 SUCCEEDED - host.domain.com:9999 + host.domain.com:8042 MAP container_1326381300833_0002_01_000002 @@ -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. attempt_1326381300833_2_2_m_0_0 /98.139.92.0 SUCCEEDED - host.domain.com:9999 + host.domain.com:8042 MAP container_1326381300833_0002_01_000002 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm index 186f044c226..ffd25c4763f 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm @@ -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. - host.domain.com:9999 - host.domain.com:45454 + host.domain.com:8042 + host.domain.com:8041 1 1326238773493 container_1326232085508_0004_01_000001 - http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001 + http://host.domain.com:8042/node/containerlogs/container_1326232085508_0004_01_000001 +---+ @@ -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. attempt_1326232085508_4_4_r_0_0 /98.139.92.0 RUNNING - host.domain.com:9999 + host.domain.com:8042 REDUCE container_1326232085508_0004_01_000003 1326238780052 @@ -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. attempt_1326232085508_4_4_r_0_0 /98.139.92.0 RUNNING - host.domain.com:9999 + host.domain.com:8042 REDUCE container_1326232085508_0004_01_000003 1326238780052 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm index a733d71378d..c848cb4b0ac 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm @@ -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. 0.23.1-SNAPSHOT 0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00 Mon Jan 9 14:58:42 UTC 2012 - host.domain.com:45454 + host.domain.com:8041 host.domain.com +---+ @@ -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. user1 2048 - http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1 - host.domain.com:45454 + http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000001/user1 + host.domain.com:8041 container_1326121700862_0006_01_000003 @@ -510,8 +510,8 @@ NodeManager REST API's. Container killed by the ApplicationMaster. user1 2048 - http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1 - host.domain.com:45454 + http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000003/user1 + host.domain.com:8041 +---+ @@ -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. user1 2048 - http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1 - host.domain.com:45454 + http://host.domain.com:8042/node/containerlogs/container_1326121700862_0007_01_000001/user1 + host.domain.com:8041 +---+ diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm index 4b26d2e469f..ce489692fe0 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm @@ -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. 1326815573334 1326815598530 25196 - http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001 + http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001 _01_000001 - host.domain.com:9999 + host.domain.com:8042 application_1326815542473_0002 @@ -1036,8 +1036,8 @@ _01_000001 1326815641380 1326815789546 148166 - http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001 - host.domain.com:9999 + http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001 + host.domain.com:8042 @@ -1132,14 +1132,14 @@ _01_000001 { "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 1326824544552 1326824991300 446748 - http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001 - host.domain.com:9999 + http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001 + host.domain.com:8042 +---+ diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm index 2cdbfbe472c..68d531e85c5 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm @@ -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,