You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2013/05/17 08:38:04 UTC
svn commit: r1483668 [2/2] - in
/hadoop/common/branches/branch-2/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-s...
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNodes.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNodes.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNodes.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNodes.java Fri May 17 06:38:03 2013
@@ -202,15 +202,18 @@ public class MockNodes {
};
private static RMNode buildRMNode(int rack, final Resource perNode, NodeState state, String httpAddr) {
- return buildRMNode(rack, perNode, state, httpAddr, NODE_ID++);
+ return buildRMNode(rack, perNode, state, httpAddr, NODE_ID++, null);
}
- private static RMNode buildRMNode(int rack, final Resource perNode, NodeState state, String httpAddr, int hostnum) {
+ private static RMNode buildRMNode(int rack, final Resource perNode,
+ NodeState state, String httpAddr, int hostnum, String hostName) {
final String rackName = "rack"+ rack;
final int nid = hostnum;
- final String hostName = "host"+ nid;
final String nodeAddr = hostName + ":" + nid;
final int port = 123;
+ if (hostName == null) {
+ hostName = "host"+ nid;
+ }
final NodeId nodeID = newNodeID(hostName, port);
final String httpAddress = httpAddr;
final NodeHealthStatus nodeHealthStatus =
@@ -233,6 +236,12 @@ public class MockNodes {
}
public static RMNode newNodeInfo(int rack, final Resource perNode, int hostnum) {
- return buildRMNode(rack, perNode, null, "localhost:0", hostnum);
+ return buildRMNode(rack, perNode, null, "localhost:0", hostnum, null);
+ }
+
+ public static RMNode newNodeInfo(int rack, final Resource perNode,
+ int hostnum, String hostName) {
+ return buildRMNode(rack, perNode, null, "localhost:0", hostnum, hostName);
}
+
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java Fri May 17 06:38:03 2013
@@ -59,6 +59,7 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEventType;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeImpl;
+import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager;
import org.apache.hadoop.yarn.util.Records;
import org.apache.log4j.Level;
@@ -298,8 +299,12 @@ public class MockRM extends ResourceMana
@Override
protected ResourceTrackerService createResourceTrackerService() {
+ RMContainerTokenSecretManager containerTokenSecretManager =
+ new RMContainerTokenSecretManager(new Configuration());
+ containerTokenSecretManager.rollMasterKey();
return new ResourceTrackerService(getRMContext(), nodesListManager,
- this.nmLivelinessMonitor, this.containerTokenSecretManager) {
+ this.nmLivelinessMonitor, containerTokenSecretManager) {
+
@Override
public void start() {
// override to not start rpc handler
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java Fri May 17 06:38:03 2013
@@ -59,7 +59,7 @@ public class TestApplicationCleanup {
MockRM rm = new MockRM();
rm.start();
- MockNM nm1 = rm.registerNode("h1:1234", 5000);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 5000);
RMApp app = rm.submitApp(2000);
@@ -72,7 +72,7 @@ public class TestApplicationCleanup {
//request for containers
int request = 2;
- am.allocate("h1" , 1000, request,
+ am.allocate("127.0.0.1" , 1000, request,
new ArrayList<ContainerId>());
//kick the scheduler
@@ -147,7 +147,7 @@ public class TestApplicationCleanup {
};
rm.start();
- MockNM nm1 = rm.registerNode("h1:1234", 5000);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 5000);
RMApp app = rm.submitApp(2000);
@@ -160,7 +160,7 @@ public class TestApplicationCleanup {
//request for containers
int request = 2;
- am.allocate("h1" , 1000, request,
+ am.allocate("127.0.0.1" , 1000, request,
new ArrayList<ContainerId>());
dispatcher.await();
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java Fri May 17 06:38:03 2013
@@ -112,7 +112,7 @@ public class TestApplicationMasterLaunch
MockRMWithCustomAMLauncher rm = new MockRMWithCustomAMLauncher(
containerManager);
rm.start();
- MockNM nm1 = rm.registerNode("h1:1234", 5120);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 5120);
RMApp app = rm.submitApp(2000);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java Fri May 17 06:38:03 2013
@@ -74,8 +74,8 @@ public class TestFifoScheduler {
rootLogger.setLevel(Level.DEBUG);
MockRM rm = new MockRM(conf);
rm.start();
- MockNM nm1 = rm.registerNode("h1:1234", 6 * GB);
- MockNM nm2 = rm.registerNode("h2:5678", 4 * GB);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB);
+ MockNM nm2 = rm.registerNode("127.0.0.2:5678", 4 * GB);
RMApp app1 = rm.submitApp(2048);
// kick the scheduling, 2 GB given to AM1, remaining 4GB on nm1
@@ -98,10 +98,10 @@ public class TestFifoScheduler {
Assert.assertEquals(2 * GB, report_nm2.getUsedResource().getMemory());
// add request for containers
- am1.addRequests(new String[] { "h1", "h2" }, GB, 1, 1);
+ am1.addRequests(new String[] { "127.0.0.1", "127.0.0.2" }, GB, 1, 1);
AllocateResponse alloc1Response = am1.schedule(); // send the request
// add request for containers
- am2.addRequests(new String[] { "h1", "h2" }, 3 * GB, 0, 1);
+ am2.addRequests(new String[] { "127.0.0.1", "127.0.0.2" }, 3 * GB, 0, 1);
AllocateResponse alloc2Response = am2.schedule(); // send the request
// kick the scheduler, 1 GB and 3 GB given to AM1 and AM2, remaining 0
@@ -163,7 +163,7 @@ public class TestFifoScheduler {
rm.start();
// Register node1
- MockNM nm1 = rm.registerNode("h1:1234", 6 * GB);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB);
// Submit an application
RMApp app1 = rm.submitApp(testAlloc);
@@ -212,8 +212,10 @@ public class TestFifoScheduler {
FifoScheduler fs = new FifoScheduler();
fs.reinitialize(conf, null);
- RMNode n1 = MockNodes.newNodeInfo(0, MockNodes.newResource(4 * GB), 1);
- RMNode n2 = MockNodes.newNodeInfo(0, MockNodes.newResource(2 * GB), 2);
+ RMNode n1 =
+ MockNodes.newNodeInfo(0, MockNodes.newResource(4 * GB), 1, "127.0.0.2");
+ RMNode n2 =
+ MockNodes.newNodeInfo(0, MockNodes.newResource(2 * GB), 2, "127.0.0.3");
fs.handle(new NodeAddedSchedulerEvent(n1));
fs.handle(new NodeAddedSchedulerEvent(n2));
@@ -222,7 +224,8 @@ public class TestFifoScheduler {
Assert.assertEquals(6 * GB, fs.getRootQueueMetrics().getAvailableMB());
// reconnect n1 with downgraded memory
- n1 = MockNodes.newNodeInfo(0, MockNodes.newResource(2 * GB), 1);
+ n1 =
+ MockNodes.newNodeInfo(0, MockNodes.newResource(2 * GB), 1, "127.0.0.2");
fs.handle(new NodeRemovedSchedulerEvent(n1));
fs.handle(new NodeAddedSchedulerEvent(n1));
fs.handle(new NodeUpdateSchedulerEvent(n1));
@@ -241,7 +244,8 @@ public class TestFifoScheduler {
FifoScheduler fs = (FifoScheduler) rm.getResourceScheduler();
// Add a node
- RMNode n1 = MockNodes.newNodeInfo(0, MockNodes.newResource(4 * GB), 1);
+ RMNode n1 =
+ MockNodes.newNodeInfo(0, MockNodes.newResource(4 * GB), 1, "127.0.0.2");
fs.handle(new NodeAddedSchedulerEvent(n1));
// Add two applications
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java Fri May 17 06:38:03 2013
@@ -95,8 +95,10 @@ public class TestRMRestart {
// start like normal because state is empty
rm1.start();
- MockNM nm1 = new MockNM("h1:1234", 15120, rm1.getResourceTrackerService());
- MockNM nm2 = new MockNM("h2:5678", 15120, rm1.getResourceTrackerService());
+ MockNM nm1 =
+ new MockNM("127.0.0.1:1234", 15120, rm1.getResourceTrackerService());
+ MockNM nm2 =
+ new MockNM("127.0.0.2:5678", 15120, rm1.getResourceTrackerService());
nm1.registerNode();
nm2.registerNode(); // nm2 will not heartbeat with RM1
@@ -145,7 +147,7 @@ public class TestRMRestart {
am1.registerAppAttempt();
// AM request for containers
- am1.allocate("h1" , 1000, 1, new ArrayList<ContainerId>());
+ am1.allocate("127.0.0.1" , 1000, 1, new ArrayList<ContainerId>());
// kick the scheduler
nm1.nodeHeartbeat(true);
List<Container> conts = am1.allocate(new ArrayList<ResourceRequest>(),
@@ -244,8 +246,8 @@ public class TestRMRestart {
Assert.assertEquals(NodeAction.RESYNC, hbResponse.getNodeAction());
// new NM to represent NM re-register
- nm1 = rm2.registerNode("h1:1234", 15120);
- nm2 = rm2.registerNode("h2:5678", 15120);
+ nm1 = rm2.registerNode("127.0.0.1:1234", 15120);
+ nm2 = rm2.registerNode("127.0.0.2:5678", 15120);
// verify no more reboot response sent
hbResponse = nm1.nodeHeartbeat(true);
@@ -265,7 +267,8 @@ public class TestRMRestart {
// Nodes on which the AM's run
MockNM am1Node = nm1;
- if(attemptState.getMasterContainer().getNodeId().toString().contains("h2")){
+ if (attemptState.getMasterContainer().getNodeId().toString()
+ .contains("127.0.0.2")) {
am1Node = nm2;
}
@@ -280,7 +283,8 @@ public class TestRMRestart {
attemptState.getMasterContainer().getId());
MockNM am2Node = nm1;
- if(attemptState.getMasterContainer().getNodeId().toString().contains("h2")){
+ if (attemptState.getMasterContainer().getNodeId().toString()
+ .contains("127.0.0.2")) {
am2Node = nm2;
}
@@ -292,8 +296,8 @@ public class TestRMRestart {
am2.registerAppAttempt();
//request for containers
- am1.allocate("h1" , 1000, 3, new ArrayList<ContainerId>());
- am2.allocate("h2" , 1000, 1, new ArrayList<ContainerId>());
+ am1.allocate("127.0.0.1" , 1000, 3, new ArrayList<ContainerId>());
+ am2.allocate("127.0.0.2" , 1000, 1, new ArrayList<ContainerId>());
// verify container allocate continues to work
nm1.nodeHeartbeat(true);
@@ -346,7 +350,8 @@ public class TestRMRestart {
rmState.getApplicationState();
MockRM rm1 = new MockRM(conf, memStore);
rm1.start();
- MockNM nm1 = new MockNM("h1:1234", 15120, rm1.getResourceTrackerService());
+ MockNM nm1 =
+ new MockNM("127.0.0.1:1234", 15120, rm1.getResourceTrackerService());
nm1.registerNode();
// submit an app with maxAppAttempts equals to 1
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java Fri May 17 06:38:03 2013
@@ -52,6 +52,7 @@ public class TestResourceManager {
Configuration conf = new YarnConfiguration();
resourceManager = new ResourceManager();
resourceManager.init(conf);
+ resourceManager.getRMContainerTokenSecretManager().rollMasterKey();
}
@After
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationmasterservice/TestApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationmasterservice/TestApplicationMasterService.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationmasterservice/TestApplicationMasterService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationmasterservice/TestApplicationMasterService.java Fri May 17 06:38:03 2013
@@ -48,13 +48,13 @@ public class TestApplicationMasterServic
ResourceScheduler.class);
}
- @Test(timeout = 30000)
+ @Test(timeout = 3000000)
public void testRMIdentifierOnContainerAllocation() throws Exception {
MockRM rm = new MockRM(conf);
rm.start();
// Register node1
- MockNM nm1 = rm.registerNode("h1:1234", 6 * GB);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB);
// Submit an application
RMApp app1 = rm.submitApp(2048);
@@ -65,7 +65,7 @@ public class TestApplicationMasterServic
MockAM am1 = rm.sendAMLaunched(attempt1.getAppAttemptId());
am1.registerAppAttempt();
- am1.addRequests(new String[] { "h1" }, GB, 1, 1);
+ am1.addRequests(new String[] { "127.0.0.1" }, GB, 1, 1);
AllocateResponse alloc1Response = am1.schedule(); // send the request
// kick the scheduler
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCNodeUpdates.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCNodeUpdates.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCNodeUpdates.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCNodeUpdates.java Fri May 17 06:38:03 2013
@@ -90,10 +90,10 @@ public class TestAMRMRPCNodeUpdates {
@Test
public void testAMRMUnusableNodes() throws Exception {
- MockNM nm1 = rm.registerNode("h1:1234", 10000);
- MockNM nm2 = rm.registerNode("h2:1234", 10000);
- MockNM nm3 = rm.registerNode("h3:1234", 10000);
- MockNM nm4 = rm.registerNode("h4:1234", 10000);
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 10000);
+ MockNM nm2 = rm.registerNode("127.0.0.2:1234", 10000);
+ MockNM nm3 = rm.registerNode("127.0.0.3:1234", 10000);
+ MockNM nm4 = rm.registerNode("127.0.0.4:1234", 10000);
RMApp app1 = rm.submitApp(2000);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java Fri May 17 06:38:03 2013
@@ -59,6 +59,7 @@ public class TestRMNMRPCResponseId {
@Before
public void setUp() {
+ Configuration conf = new Configuration();
// Dispatcher that processes events inline
Dispatcher dispatcher = new InlineDispatcher();
dispatcher.register(SchedulerEventType.class, new EventHandler<Event>() {
@@ -69,17 +70,16 @@ public class TestRMNMRPCResponseId {
});
RMContext context =
new RMContextImpl(dispatcher, null, null, null, null,
- null, null, null);
+ null, new RMContainerTokenSecretManager(conf), null);
dispatcher.register(RMNodeEventType.class,
new ResourceManager.NodeEventDispatcher(context));
NodesListManager nodesListManager = new NodesListManager(context);
- Configuration conf = new Configuration();
nodesListManager.init(conf);
- RMContainerTokenSecretManager containerTokenSecretManager =
- new RMContainerTokenSecretManager(conf);
+
+ context.getContainerTokenSecretManager().rollMasterKey();
resourceTrackerService = new ResourceTrackerService(context,
nodesListManager, new NMLivelinessMonitor(dispatcher),
- containerTokenSecretManager);
+ context.getContainerTokenSecretManager());
resourceTrackerService.init(conf);
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java Fri May 17 06:38:03 2013
@@ -52,6 +52,7 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.resource.Resources;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerNode;
+import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -88,6 +89,11 @@ public class TestApplicationLimits {
thenReturn(CapacityScheduler.queueComparator);
when(csContext.getResourceCalculator()).
thenReturn(resourceCalculator);
+ RMContainerTokenSecretManager containerTokenSecretManager =
+ new RMContainerTokenSecretManager(conf);
+ containerTokenSecretManager.rollMasterKey();
+ when(csContext.getContainerTokenSecretManager()).thenReturn(
+ containerTokenSecretManager);
Map<String, CSQueue> queues = new HashMap<String, CSQueue>();
CSQueue root =
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java Fri May 17 06:38:03 2013
@@ -67,6 +67,7 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerNode;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppRemovedSchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -122,6 +123,11 @@ public class TestLeafQueue {
thenReturn(CapacityScheduler.queueComparator);
when(csContext.getResourceCalculator()).
thenReturn(resourceCalculator);
+ RMContainerTokenSecretManager containerTokenSecretManager =
+ new RMContainerTokenSecretManager(conf);
+ containerTokenSecretManager.rollMasterKey();
+ when(csContext.getContainerTokenSecretManager()).thenReturn(
+ containerTokenSecretManager);
root =
CapacityScheduler.parseQueue(csContext, csConf, null,
@@ -275,7 +281,7 @@ public class TestLeafQueue {
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 8*GB);
final int numNodes = 1;
@@ -397,7 +403,7 @@ public class TestLeafQueue {
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 8*GB);
final int numNodes = 1;
@@ -528,9 +534,9 @@ public class TestLeafQueue {
a.submitApplication(app_2, user_1, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 8*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, DEFAULT_RACK, 0, 8*GB);
final int numNodes = 2;
@@ -622,9 +628,9 @@ public class TestLeafQueue {
a.submitApplication(app_2, user_1, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 8*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, DEFAULT_RACK, 0, 8*GB);
final int numNodes = 2;
@@ -740,7 +746,7 @@ public class TestLeafQueue {
a.submitApplication(app_3, user_2, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 8*GB);
final int numNodes = 1;
@@ -902,7 +908,7 @@ public class TestLeafQueue {
a.submitApplication(app_1, user_1, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 4*GB);
final int numNodes = 2;
@@ -1002,9 +1008,9 @@ public class TestLeafQueue {
a.submitApplication(app_1, user_1, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 4*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, DEFAULT_RACK, 0, 4*GB);
final int numNodes = 3;
@@ -1102,10 +1108,10 @@ public class TestLeafQueue {
a.submitApplication(app_1, user_1, A);
// Setup some nodes
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, DEFAULT_RACK, 0, 4*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, DEFAULT_RACK, 0, 4*GB);
final int numNodes = 3;
@@ -1214,15 +1220,15 @@ public class TestLeafQueue {
a.submitApplication(app_0, user_0, A);
// Setup some nodes and racks
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
String rack_0 = "rack_0";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, rack_0, 0, 8*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
String rack_1 = "rack_1";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, rack_1, 0, 8*GB);
- String host_2 = "host_2";
+ String host_2 = "127.0.0.3";
String rack_2 = "rack_2";
FiCaSchedulerNode node_2 = TestUtils.getMockNode(host_2, rack_2, 0, 8*GB);
@@ -1317,7 +1323,7 @@ public class TestLeafQueue {
app_0.updateResourceRequests(app_0_requests_0);
assertEquals(2, app_0.getTotalRequiredResources(priority));
- String host_3 = "host_3"; // on rack_1
+ String host_3 = "127.0.0.4"; // on rack_1
FiCaSchedulerNode node_3 = TestUtils.getMockNode(host_3, rack_1, 0, 8*GB);
// Rack-delay
@@ -1355,15 +1361,15 @@ public class TestLeafQueue {
a.submitApplication(app_0, user_0, A);
// Setup some nodes and racks
- String host_0 = "host_0";
+ String host_0 = "127.0.0.1";
String rack_0 = "rack_0";
FiCaSchedulerNode node_0 = TestUtils.getMockNode(host_0, rack_0, 0, 8*GB);
- String host_1 = "host_1";
+ String host_1 = "127.0.0.2";
String rack_1 = "rack_1";
FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, rack_1, 0, 8*GB);
- String host_2 = "host_2";
+ String host_2 = "127.0.0.3";
String rack_2 = "rack_2";
FiCaSchedulerNode node_2 = TestUtils.getMockNode(host_2, rack_2, 0, 8*GB);
@@ -1486,14 +1492,14 @@ public class TestLeafQueue {
a.submitApplication(app_0, user_0, A);
// Setup some nodes and racks
- String host_0_0 = "host_0_0";
+ String host_0_0 = "127.0.0.1";
String rack_0 = "rack_0";
FiCaSchedulerNode node_0_0 = TestUtils.getMockNode(host_0_0, rack_0, 0, 8*GB);
- String host_0_1 = "host_0_1";
+ String host_0_1 = "127.0.0.2";
FiCaSchedulerNode node_0_1 = TestUtils.getMockNode(host_0_1, rack_0, 0, 8*GB);
- String host_1_0 = "host_1_0";
+ String host_1_0 = "127.0.0.3";
String rack_1 = "rack_1";
FiCaSchedulerNode node_1_0 = TestUtils.getMockNode(host_1_0, rack_1, 0, 8*GB);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java Fri May 17 06:38:03 2013
@@ -123,6 +123,8 @@ public class TestFairScheduler {
resourceManager.init(conf);
((AsyncDispatcher)resourceManager.getRMContext().getDispatcher()).start();
scheduler.reinitialize(conf, resourceManager.getRMContext());
+ // to initialize the master key
+ resourceManager.getRMContainerTokenSecretManager().rollMasterKey();
}
@After
@@ -221,13 +223,16 @@ public class TestFairScheduler {
@Test
public void testAggregateCapacityTracking() throws Exception {
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
assertEquals(1024, scheduler.getClusterCapacity().getMemory());
// Add another node
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(512));
+ RMNode node2 =
+ MockNodes.newNodeInfo(1, Resources.createResource(512), 2, "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
scheduler.handle(nodeEvent2);
assertEquals(1536, scheduler.getClusterCapacity().getMemory());
@@ -241,7 +246,9 @@ public class TestFairScheduler {
@Test
public void testSimpleFairShareCalculation() {
// Add one big node (only care about aggregate capacity)
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(10 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(10 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -265,7 +272,9 @@ public class TestFairScheduler {
public void testSimpleHierarchicalFairShareCalculation() {
// Add one big node (only care about aggregate capacity)
int capacity = 10 * 24;
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(capacity));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(capacity), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -313,12 +322,15 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testSimpleContainerAllocation() {
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
// Add another node
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(512));
+ RMNode node2 =
+ MockNodes.newNodeInfo(1, Resources.createResource(512), 2, "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
scheduler.handle(nodeEvent2);
@@ -351,7 +363,9 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testSimpleContainerReservation() throws InterruptedException {
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -359,6 +373,7 @@ public class TestFairScheduler {
createSchedulingRequest(1024, "queue1", "user1", 1);
scheduler.update();
NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node1);
+
scheduler.handle(updateEvent);
// Make sure queue 1 is allocated app capacity
@@ -376,7 +391,9 @@ public class TestFairScheduler {
assertEquals(1024, scheduler.applications.get(attId).getCurrentReservation().getMemory());
// Now another node checks in with capacity
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node2 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 2, "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
NodeUpdateSchedulerEvent updateEvent2 = new NodeUpdateSchedulerEvent(node2);
scheduler.handle(nodeEvent2);
@@ -442,7 +459,9 @@ public class TestFairScheduler {
queueManager.initialize();
// Add one big node (only care about aggregate capacity)
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(3 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(3 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -799,7 +818,9 @@ public class TestFairScheduler {
queueManager.initialize();
// Add one big node (only care about aggregate capacity)
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(4 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(4 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -857,7 +878,9 @@ public class TestFairScheduler {
queueManager.initialize();
// Add one big node (only care about aggregate capacity)
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(4 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(4 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -933,15 +956,21 @@ public class TestFairScheduler {
queueManager.initialize();
// Create four nodes
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node2 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 2,
+ "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
scheduler.handle(nodeEvent2);
- RMNode node3 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node3 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 3,
+ "127.0.0.3");
NodeAddedSchedulerEvent nodeEvent3 = new NodeAddedSchedulerEvent(node3);
scheduler.handle(nodeEvent3);
@@ -1094,15 +1123,21 @@ public class TestFairScheduler {
queueManager.initialize();
// Create four nodes
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node1 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 1,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node2 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 2,
+ "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
scheduler.handle(nodeEvent2);
- RMNode node3 = MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024));
+ RMNode node3 =
+ MockNodes.newNodeInfo(1, Resources.createResource(2 * 1024), 3,
+ "127.0.0.3");
NodeAddedSchedulerEvent nodeEvent3 = new NodeAddedSchedulerEvent(node3);
scheduler.handle(nodeEvent3);
@@ -1183,7 +1218,9 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testMultipleContainersWaitingForReservation() {
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -1226,7 +1263,9 @@ public class TestFairScheduler {
queueManager.initialize();
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(8192));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(8192), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -1263,7 +1302,9 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testReservationWhileMultiplePriorities() {
// Add a node
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -1348,9 +1389,15 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testMultipleNodesSingleRackRequest() throws Exception {
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
- RMNode node3 = MockNodes.newNodeInfo(2, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
+ RMNode node2 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 2, "127.0.0.2");
+ RMNode node3 =
+ MockNodes
+ .newNodeInfo(2, Resources.createResource(1024), 3, "127.0.0.3");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
@@ -1388,7 +1435,9 @@ public class TestFairScheduler {
@Test (timeout = 5000)
public void testFifoWithinQueue() throws Exception {
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(3072));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(3072), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
@@ -1432,7 +1481,9 @@ public class TestFairScheduler {
scheduler.getQueueManager().getLeafQueue("root.default")
.setPolicy(SchedulingPolicy.getDefault());
- RMNode node = MockNodes.newNodeInfo(1, Resources.createResource(16384));
+ RMNode node =
+ MockNodes.newNodeInfo(1, Resources.createResource(16384), 0,
+ "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent = new NodeAddedSchedulerEvent(node);
NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node);
scheduler.handle(nodeEvent);
@@ -1477,8 +1528,12 @@ public class TestFairScheduler {
final String fairChild1 = fairParent + ".fairChild1";
final String fairChild2 = fairParent + ".fairChild2";
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(8192));
- RMNode node2 = MockNodes.newNodeInfo(1, Resources.createResource(8192));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(8192), 1, "127.0.0.1");
+ RMNode node2 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(8192), 2, "127.0.0.2");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
NodeAddedSchedulerEvent nodeEvent2 = new NodeAddedSchedulerEvent(node2);
@@ -1597,7 +1652,9 @@ public class TestFairScheduler {
@Test
public void testReservationThatDoesntFit() {
- RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ RMNode node1 =
+ MockNodes
+ .newNodeInfo(1, Resources.createResource(1024), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
scheduler.handle(nodeEvent1);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java Fri May 17 06:38:03 2013
@@ -56,6 +56,7 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import org.apache.hadoop.yarn.util.BuilderUtils;
import org.junit.After;
import org.junit.Before;
@@ -153,14 +154,17 @@ public class TestFifoScheduler {
@Test(timeout=2000)
public void testNodeLocalAssignment() throws Exception {
AsyncDispatcher dispatcher = new InlineDispatcher();
+ RMContainerTokenSecretManager containerTokenSecretManager =
+ new RMContainerTokenSecretManager(new Configuration());
+ containerTokenSecretManager.rollMasterKey();
RMContext rmContext = new RMContextImpl(dispatcher, null, null, null, null,
- null, null, null);
+ null, containerTokenSecretManager, null);
FifoScheduler scheduler = new FifoScheduler();
scheduler.reinitialize(new Configuration(), rmContext);
RMNode node0 = MockNodes.newNodeInfo(1,
- Resources.createResource(1024 * 64), 1234);
+ Resources.createResource(1024 * 64), 1, "127.0.0.1");
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node0);
scheduler.handle(nodeEvent1);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java Fri May 17 06:38:03 2013
@@ -121,7 +121,7 @@ public class TestRMWebServicesApps exten
@Test
public void testApps() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testAppsHelper("apps", app1, MediaType.APPLICATION_JSON);
@@ -131,7 +131,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsSlash() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testAppsHelper("apps/", app1, MediaType.APPLICATION_JSON);
@@ -141,7 +141,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsDefault() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testAppsHelper("apps/", app1, "");
@@ -151,7 +151,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsXML() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -176,7 +176,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsXMLMulti() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024, "testwordcount", "user1");
rm.submitApp(2048, "testwordcount2", "user1");
@@ -220,7 +220,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryState() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -242,7 +242,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryStateNone() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -260,7 +260,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryStateInvalid() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -298,7 +298,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinalStatus() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -321,7 +321,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinalStatusNone() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -339,7 +339,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinalStatusInvalid() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -377,7 +377,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryUser() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
rm.submitApp(1024);
@@ -405,7 +405,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryQueue() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
rm.submitApp(1024);
@@ -428,7 +428,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryLimit() throws JSONException, Exception {
rm.start();
- rm.registerNode("amNM:1234", 2048);
+ rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
rm.submitApp(1024);
rm.submitApp(1024);
@@ -451,7 +451,7 @@ public class TestRMWebServicesApps exten
rm.start();
long start = System.currentTimeMillis();
Thread.sleep(1);
- rm.registerNode("amNM:1234", 2048);
+ rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
rm.submitApp(1024);
rm.submitApp(1024);
@@ -472,7 +472,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryStartBeginSome() throws JSONException, Exception {
rm.start();
- rm.registerNode("amNM:1234", 2048);
+ rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
rm.submitApp(1024);
long start = System.currentTimeMillis();
@@ -495,7 +495,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryStartEnd() throws JSONException, Exception {
rm.start();
- rm.registerNode("amNM:1234", 2048);
+ rm.registerNode("127.0.0.1:1234", 2048);
long end = System.currentTimeMillis();
Thread.sleep(1);
rm.submitApp(1024);
@@ -515,7 +515,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryStartBeginEnd() throws JSONException, Exception {
rm.start();
- rm.registerNode("amNM:1234", 2048);
+ rm.registerNode("127.0.0.1:1234", 2048);
long start = System.currentTimeMillis();
Thread.sleep(1);
rm.submitApp(1024);
@@ -541,7 +541,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinishBegin() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
long start = System.currentTimeMillis();
Thread.sleep(1);
RMApp app1 = rm.submitApp(1024);
@@ -573,7 +573,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinishEnd() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
// finish App
@@ -605,7 +605,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppsQueryFinishBeginEnd() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
long start = System.currentTimeMillis();
Thread.sleep(1);
RMApp app1 = rm.submitApp(1024);
@@ -640,7 +640,7 @@ public class TestRMWebServicesApps exten
@Test
public void testSingleApp() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
testSingleAppsHelper(app1.getApplicationId().toString(), app1,
@@ -651,7 +651,7 @@ public class TestRMWebServicesApps exten
@Test
public void testSingleAppsSlash() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testSingleAppsHelper(app1.getApplicationId().toString() + "/", app1,
@@ -662,7 +662,7 @@ public class TestRMWebServicesApps exten
@Test
public void testSingleAppsDefault() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testSingleAppsHelper(app1.getApplicationId().toString() + "/", app1, "");
@@ -672,7 +672,7 @@ public class TestRMWebServicesApps exten
@Test
public void testInvalidApp() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -708,7 +708,7 @@ public class TestRMWebServicesApps exten
@Test
public void testNonexistApp() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -757,7 +757,7 @@ public class TestRMWebServicesApps exten
@Test
public void testSingleAppsXML() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -858,7 +858,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppAttempts() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
testAppAttemptsHelper(app1.getApplicationId().toString(), app1,
@@ -869,7 +869,7 @@ public class TestRMWebServicesApps exten
@Test
public void testMultipleAppAttempts() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
int maxAppAttempts = rm.getConfig().getInt(
@@ -895,7 +895,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppAttemptsSlash() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testAppAttemptsHelper(app1.getApplicationId().toString() + "/", app1,
@@ -906,7 +906,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppAttemtpsDefault() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
testAppAttemptsHelper(app1.getApplicationId().toString() + "/", app1, "");
@@ -916,7 +916,7 @@ public class TestRMWebServicesApps exten
@Test
public void testInvalidAppAttempts() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024);
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -952,7 +952,7 @@ public class TestRMWebServicesApps exten
@Test
public void testNonexistAppAttempts() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
@@ -1014,7 +1014,7 @@ public class TestRMWebServicesApps exten
@Test
public void testAppAttemptsXML() throws JSONException, Exception {
rm.start();
- MockNM amNodeManager = rm.registerNode("amNM:1234", 2048);
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
RMApp app1 = rm.submitApp(1024, "testwordcount", "user1");
amNodeManager.nodeHeartbeat(true);
WebResource r = resource();
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java Fri May 17 06:38:03 2013
@@ -20,8 +20,6 @@ package org.apache.hadoop.yarn.server;
import static org.junit.Assert.fail;
-import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
@@ -39,14 +37,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
-import org.apache.hadoop.fs.FileContext;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
@@ -85,8 +80,6 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import org.apache.hadoop.yarn.util.BuilderUtils;
import org.apache.hadoop.yarn.util.Records;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class TestContainerManagerSecurity {
@@ -94,39 +87,51 @@ public class TestContainerManagerSecurit
static Log LOG = LogFactory.getLog(TestContainerManagerSecurity.class);
static final RecordFactory recordFactory = RecordFactoryProvider
.getRecordFactory(null);
- private static FileContext localFS = null;
- private static final File localDir = new File("target",
- TestContainerManagerSecurity.class.getName() + "-localDir")
- .getAbsoluteFile();
private static MiniYARNCluster yarnCluster;
static final Configuration conf = new Configuration();
- @BeforeClass
- public static void setup() throws AccessControlException,
- FileNotFoundException, UnsupportedFileSystemException, IOException {
- localFS = FileContext.getLocalFSFileContext();
- localFS.delete(new Path(localDir.getAbsolutePath()), true);
- localDir.mkdir();
-
+ @Test (timeout = 1000000)
+ public void testContainerManagerWithSecurityEnabled() throws Exception {
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
"kerberos");
- // Set AM expiry interval to be very long.
- conf.setLong(YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS, 100000L);
- UserGroupInformation.setConfiguration(conf);
- yarnCluster = new MiniYARNCluster(TestContainerManagerSecurity.class
- .getName(), 1, 1, 1);
- yarnCluster.init(conf);
- yarnCluster.start();
- }
-
- @AfterClass
- public static void teardown() {
- yarnCluster.stop();
+ testContainerManager();
}
-
- @Test
- public void testAuthenticatedUser() throws IOException,
+
+ @Test (timeout=1000000)
+ public void testContainerManagerWithSecurityDisabled() throws Exception {
+ conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+ "simple");
+ testContainerManager();
+ }
+
+ private void testContainerManager() throws Exception {
+ try {
+ yarnCluster = new MiniYARNCluster(TestContainerManagerSecurity.class
+ .getName(), 1, 1, 1);
+ conf.setLong(YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS, 100000L);
+ UserGroupInformation.setConfiguration(conf);
+ yarnCluster.init(conf);
+ yarnCluster.start();
+
+ // Testing for authenticated user
+ testAuthenticatedUser();
+
+ // Testing for malicious user
+ testMaliceUser();
+
+ // Testing for unauthorized user
+ testUnauthorizedUser();
+
+ } finally {
+ if (yarnCluster != null) {
+ yarnCluster.stop();
+ yarnCluster = null;
+ }
+ }
+ }
+
+ private void testAuthenticatedUser() throws IOException,
InterruptedException, YarnRemoteException {
LOG.info("Running test for authenticated user");
@@ -178,8 +183,7 @@ public class TestContainerManagerSecurit
resourceManager.getClientRMService().forceKillApplication(request);
}
- @Test
- public void testMaliceUser() throws IOException, InterruptedException,
+ private void testMaliceUser() throws IOException, InterruptedException,
YarnRemoteException {
LOG.info("Running test for malice user");
@@ -264,8 +268,7 @@ public class TestContainerManagerSecurit
resourceManager.getClientRMService().forceKillApplication(request);
}
- @Test
- public void testUnauthorizedUser() throws IOException, InterruptedException,
+ private void testUnauthorizedUser() throws IOException, InterruptedException,
YarnRemoteException {
LOG.info("\n\nRunning test for malice user");
@@ -315,9 +318,9 @@ public class TestContainerManagerSecurit
LOG.info("Going to contact NM: unauthorized request");
- callWithIllegalContainerID(client, tokenId);
- callWithIllegalResource(client, tokenId);
- callWithIllegalUserName(client, tokenId);
+ callWithIllegalContainerID(client, tokenId, allocatedContainer);
+ callWithIllegalResource(client, tokenId, allocatedContainer);
+ callWithIllegalUserName(client, tokenId, allocatedContainer);
return client;
}
@@ -335,10 +338,11 @@ public class TestContainerManagerSecurit
resourceManager.getRMContainerTokenSecretManager();
final ContainerTokenIdentifier newTokenId =
new ContainerTokenIdentifier(tokenId.getContainerID(),
- tokenId.getNmHostAddress(), "testUser", tokenId.getResource(),
- System.currentTimeMillis() - 1,
- containerTokenSecreteManager.getCurrentKey().getKeyId());
- byte[] passowrd =
+ tokenId.getNmHostAddress(), tokenId.getApplicationSubmitter(),
+ tokenId.getResource(),
+ System.currentTimeMillis() - 1,
+ containerTokenSecreteManager.getCurrentKey().getKeyId());
+ final byte[] passowrd =
containerTokenSecreteManager.createPassword(
newTokenId);
// Create a valid token by using the key from the RM.
@@ -357,13 +361,12 @@ public class TestContainerManagerSecurit
LOG.info("Going to contact NM with expired token");
ContainerLaunchContext context = createContainerLaunchContextForTest(newTokenId);
- Container container =
- BuilderUtils.newContainer(newTokenId.getContainerID(), null, null,
- BuilderUtils.newResource(newTokenId.getResource().getMemory(),
- newTokenId.getResource().getVirtualCores()), null, null, 0);
- StartContainerRequest request = Records.newRecord(StartContainerRequest.class);
+ StartContainerRequest request =
+ Records.newRecord(StartContainerRequest.class);
request.setContainerLaunchContext(context);
- request.setContainer(container);
+ allocatedContainer.setContainerToken(BuilderUtils.newContainerToken(
+ allocatedContainer.getNodeId(), passowrd, newTokenId));
+ request.setContainer(allocatedContainer);
//Calling startContainer with an expired token.
try {
@@ -447,17 +450,19 @@ public class TestContainerManagerSecurit
// Ask for a container from the RM
final InetSocketAddress schedulerAddr =
resourceManager.getApplicationMasterService().getBindAddress();
- ApplicationTokenIdentifier appTokenIdentifier = new ApplicationTokenIdentifier(
- appAttempt.getAppAttemptId());
- ApplicationTokenSecretManager appTokenSecretManager =
- new ApplicationTokenSecretManager(conf);
- appTokenSecretManager.setMasterKey(resourceManager
- .getApplicationTokenSecretManager().getMasterKey());
- Token<ApplicationTokenIdentifier> appToken =
- new Token<ApplicationTokenIdentifier>(appTokenIdentifier,
- appTokenSecretManager);
- SecurityUtil.setTokenService(appToken, schedulerAddr);
- currentUser.addToken(appToken);
+ if (UserGroupInformation.isSecurityEnabled()) {
+ ApplicationTokenIdentifier appTokenIdentifier = new ApplicationTokenIdentifier(
+ appAttempt.getAppAttemptId());
+ ApplicationTokenSecretManager appTokenSecretManager =
+ new ApplicationTokenSecretManager(conf);
+ appTokenSecretManager.setMasterKey(resourceManager
+ .getApplicationTokenSecretManager().getMasterKey());
+ Token<ApplicationTokenIdentifier> appToken =
+ new Token<ApplicationTokenIdentifier>(appTokenIdentifier,
+ appTokenSecretManager);
+ SecurityUtil.setTokenService(appToken, schedulerAddr);
+ currentUser.addToken(appToken);
+ }
AMRMProtocol scheduler = currentUser
.doAs(new PrivilegedAction<AMRMProtocol>() {
@@ -513,16 +518,20 @@ public class TestContainerManagerSecurit
}
void callWithIllegalContainerID(ContainerManager client,
- ContainerTokenIdentifier tokenId) {
- GetContainerStatusRequest request = recordFactory
- .newRecordInstance(GetContainerStatusRequest.class);
+ ContainerTokenIdentifier tokenId, Container container) {
+ StartContainerRequest request = recordFactory
+ .newRecordInstance(StartContainerRequest.class);
+ ContainerLaunchContext context =
+ createContainerLaunchContextForTest(tokenId);
ContainerId newContainerId = BuilderUtils.newContainerId(BuilderUtils
.newApplicationAttemptId(tokenId.getContainerID()
.getApplicationAttemptId().getApplicationId(), 1), 42);
- request.setContainerId(newContainerId); // Authenticated but
- // unauthorized.
+ ContainerId oldContainerId = container.getId();
try {
- client.getContainerStatus(request);
+ container.setId(newContainerId);
+ request.setContainer(container);
+ request.setContainerLaunchContext(context);
+ client.startContainer(request);
fail("Connection initiation with unauthorized "
+ "access is expected to fail.");
} catch (YarnRemoteException e) {
@@ -534,19 +543,20 @@ public class TestContainerManagerSecurit
} catch (IOException e) {
LOG.info("Got IOException: ",e);
fail("IOException is not expected.");
+ } finally {
+ container.setId(oldContainerId);
}
}
void callWithIllegalResource(ContainerManager client,
- ContainerTokenIdentifier tokenId) {
+ ContainerTokenIdentifier tokenId, Container container) {
StartContainerRequest request = recordFactory
.newRecordInstance(StartContainerRequest.class);
// Authenticated but unauthorized, due to wrong resource
ContainerLaunchContext context =
createContainerLaunchContextForTest(tokenId);
- Container container =
- BuilderUtils.newContainer(tokenId.getContainerID(), null, null,
- BuilderUtils.newResource(2048, 1), null, null, 0);
+ Resource rsrc = container.getResource();
+ container.setResource(BuilderUtils.newResource(2048, 1));
request.setContainerLaunchContext(context);
request.setContainer(container);
try {
@@ -564,20 +574,17 @@ public class TestContainerManagerSecurit
LOG.info("Got IOException: ",e);
fail("IOException is not expected.");
}
+ container.setResource(rsrc);
}
void callWithIllegalUserName(ContainerManager client,
- ContainerTokenIdentifier tokenId) {
+ ContainerTokenIdentifier tokenId, Container container) {
StartContainerRequest request = recordFactory
.newRecordInstance(StartContainerRequest.class);
// Authenticated but unauthorized, due to wrong resource
ContainerLaunchContext context =
createContainerLaunchContextForTest(tokenId);
context.setUser("Saruman"); // Set a different user-name.
- Container container =
- BuilderUtils.newContainer(tokenId.getContainerID(), null, null,
- BuilderUtils.newResource(tokenId.getResource().getMemory(), tokenId
- .getResource().getVirtualCores()), null, null, 0);
request.setContainerLaunchContext(context);
request.setContainer(container);
try {
@@ -601,7 +608,8 @@ public class TestContainerManagerSecurit
ContainerTokenIdentifier tokenId) {
ContainerLaunchContext context =
BuilderUtils.newContainerLaunchContext(
- "testUser", new HashMap<String, LocalResource>(),
+ tokenId.getApplicationSubmitter(),
+ new HashMap<String, LocalResource>(),
new HashMap<String, String>(), new ArrayList<String>(),
new HashMap<String, ByteBuffer>(), null,
new HashMap<ApplicationAccessType, String>());
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java?rev=1483668&r1=1483667&r2=1483668&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java Fri May 17 06:38:03 2013
@@ -37,17 +37,25 @@ import org.junit.Test;
public class TestRMNMSecretKeys {
- @Test
+ @Test(timeout = 1000000)
public void testNMUpdation() throws Exception {
YarnConfiguration conf = new YarnConfiguration();
+ // validating RM NM keys for Unsecured environment
+ validateRMNMKeyExchange(conf);
+
+ // validating RM NM keys for secured environment
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
- "kerberos");
+ "kerberos");
UserGroupInformation.setConfiguration(conf);
+ validateRMNMKeyExchange(conf);
+ }
+
+ private void validateRMNMKeyExchange(YarnConfiguration conf) throws Exception {
// Default rolling and activation intervals are large enough, no need to
// intervene
-
final DrainDispatcher dispatcher = new DrainDispatcher();
ResourceManager rm = new ResourceManager() {
+
@Override
protected void doSecureLogin() throws IOException {
// Do nothing.
@@ -69,15 +77,15 @@ public class TestRMNMSecretKeys {
NodeHeartbeatResponse response = nm.nodeHeartbeat(true);
Assert.assertNull(
- "First heartbeat after registration shouldn't get any key updates!",
- response.getMasterKey());
+ "First heartbeat after registration shouldn't get any key updates!",
+ response.getMasterKey());
dispatcher.await();
response = nm.nodeHeartbeat(true);
Assert
- .assertNull(
- "Even second heartbeat after registration shouldn't get any key updates!",
- response.getMasterKey());
+ .assertNull(
+ "Even second heartbeat after registration shouldn't get any key updates!",
+ response.getMasterKey());
dispatcher.await();
// Let's force a roll-over
@@ -88,17 +96,17 @@ public class TestRMNMSecretKeys {
// Heartbeats after roll-over and before activation should be fine.
response = nm.nodeHeartbeat(true);
Assert.assertNotNull(
- "Heartbeats after roll-over and before activation should not err out.",
- response.getMasterKey());
+ "Heartbeats after roll-over and before activation should not err out.",
+ response.getMasterKey());
Assert.assertEquals(
- "Roll-over should have incremented the key-id only by one!",
- masterKey.getKeyId() + 1, response.getMasterKey().getKeyId());
+ "Roll-over should have incremented the key-id only by one!",
+ masterKey.getKeyId() + 1, response.getMasterKey().getKeyId());
dispatcher.await();
response = nm.nodeHeartbeat(true);
Assert.assertNull(
- "Second heartbeat after roll-over shouldn't get any key updates!",
- response.getMasterKey());
+ "Second heartbeat after roll-over shouldn't get any key updates!",
+ response.getMasterKey());
dispatcher.await();
// Let's force activation
@@ -106,13 +114,14 @@ public class TestRMNMSecretKeys {
response = nm.nodeHeartbeat(true);
Assert.assertNull("Activation shouldn't cause any key updates!",
- response.getMasterKey());
+ response.getMasterKey());
dispatcher.await();
response = nm.nodeHeartbeat(true);
- Assert.assertNull(
- "Even second heartbeat after activation shouldn't get any key updates!",
- response.getMasterKey());
+ Assert
+ .assertNull(
+ "Even second heartbeat after activation shouldn't get any key updates!",
+ response.getMasterKey());
dispatcher.await();
rm.stop();