Repository: hadoop Updated Branches: refs/heads/branch-2.8 7adbd569a -> 979b29a03
http://git-wip-us.apache.org/repos/asf/hadoop/blob/979b29a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java index 4900a1a..d0caee2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java @@ -30,10 +30,12 @@ import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.api.records.ContainerResourceChangeRequest; +import org.apache.hadoop.yarn.api.records.ContainerUpdateType; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.ResourceRequest; +import org.apache.hadoop.yarn.api.records.UpdateContainerRequest; +import org.apache.hadoop.yarn.api.records.UpdatedContainer; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.MockAM; import org.apache.hadoop.yarn.server.resourcemanager.MockNM; @@ -84,7 +86,7 @@ public class TestContainerResizing { @Override protected void decreaseContainers( - List<ContainerResourceChangeRequest> decreaseRequests, + List<UpdateContainerRequest> decreaseRequests, SchedulerApplicationAttempt attempt) { try { Thread.sleep(1000); @@ -138,9 +140,10 @@ public class TestContainerResizing { sentRMContainerLaunched(rm1, containerId1); // am1 asks to change its AM container from 1GB to 3GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(3 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(3 * GB)))); FiCaSchedulerApp app = TestUtils.getFiCaSchedulerApp( rm1, app1.getApplicationId()); @@ -195,9 +198,11 @@ public class TestContainerResizing { sentRMContainerLaunched(rm1, containerId1); // am1 asks to change its AM container from 1GB to 3GB - AllocateResponse response = am1.sendContainerResizingRequest(null, Arrays - .asList(ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(1 * GB)))); + AllocateResponse response = am1.sendContainerResizingRequest(Arrays + .asList(UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.DECREASE_RESOURCE, + Resources.createResource(1 * GB)))); verifyContainerDecreased(response, containerId1, 1 * GB); checkUsedResource(rm1, "default", 1 * GB, null); @@ -266,9 +271,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 1GB to 3GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(7 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(7 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -367,9 +373,10 @@ public class TestContainerResizing { // am1 asks to change container2 from 2GB to 8GB, which will exceed user // limit am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId2, Resources.createResource(8 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(8 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -447,9 +454,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 1GB to 3GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(7 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(7 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -487,9 +495,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 1G to 1G (cancel the increase // request actually) am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(1 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(1 * GB)))); // Trigger a node heartbeat.. cs.handle(new NodeUpdateSchedulerEvent(rmNode1)); @@ -559,9 +568,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 2GB to 8GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(8 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(8 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -597,9 +607,11 @@ public class TestContainerResizing { // request, make target_capacity=existing_capacity) am1.allocate(null, Arrays.asList(containerId2)); // am1 asks to change its AM container from 2G to 1G (decrease) - am1.sendContainerResizingRequest(null, Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(1 * GB)))); + am1.sendContainerResizingRequest(Arrays.asList( + UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(1 * GB)))); // Trigger a node heartbeat.. cs.handle(new NodeUpdateSchedulerEvent(rmNode1)); @@ -667,9 +679,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 2GB to 8GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId2, Resources.createResource(8 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(8 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -765,9 +778,10 @@ public class TestContainerResizing { // am1 asks to change its AM container from 2GB to 8GB am1.sendContainerResizingRequest(Arrays.asList( - ContainerResourceChangeRequest - .newInstance(containerId2, Resources.createResource(8 * GB))), - null); + UpdateContainerRequest + .newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(8 * GB)))); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -883,14 +897,16 @@ public class TestContainerResizing { allocateAndLaunchContainers(am1, nm1, rm1, 2, 1 * GB, 4, 6); // am1 asks to change its container[2-7] from 1G to 2G - List<ContainerResourceChangeRequest> increaseRequests = new ArrayList<>(); + List<UpdateContainerRequest> increaseRequests = new ArrayList<>(); for (int cId = 2; cId <= 7; cId++) { ContainerId containerId = ContainerId.newContainerId(am1.getApplicationAttemptId(), cId); - increaseRequests.add(ContainerResourceChangeRequest - .newInstance(containerId, Resources.createResource(2 * GB))); + increaseRequests.add(UpdateContainerRequest + .newInstance(0, containerId, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(2 * GB))); } - am1.sendContainerResizingRequest(increaseRequests, null); + am1.sendContainerResizingRequest(increaseRequests); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -904,7 +920,7 @@ public class TestContainerResizing { // earlier allocated) cs.handle(new NodeUpdateSchedulerEvent(rmNode1)); AllocateResponse allocateResponse = am1.allocate(null, null); - Assert.assertEquals(3, allocateResponse.getIncreasedContainers().size()); + Assert.assertEquals(3, allocateResponse.getUpdatedContainers().size()); verifyContainerIncreased(allocateResponse, ContainerId.newContainerId(attemptId, 4), 2 * GB); verifyContainerIncreased(allocateResponse, @@ -964,14 +980,16 @@ public class TestContainerResizing { allocateAndLaunchContainers(am1, nm1, rm1, 2, 1 * GB, 4, 6); // am1 asks to change its container[2-7] from 1G to 2G - List<ContainerResourceChangeRequest> increaseRequests = new ArrayList<>(); + List<UpdateContainerRequest> increaseRequests = new ArrayList<>(); for (int cId = 2; cId <= 7; cId++) { ContainerId containerId = ContainerId.newContainerId(am1.getApplicationAttemptId(), cId); - increaseRequests.add(ContainerResourceChangeRequest - .newInstance(containerId, Resources.createResource(2 * GB))); + increaseRequests.add(UpdateContainerRequest + .newInstance(0, containerId, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(2 * GB))); } - am1.sendContainerResizingRequest(increaseRequests, null); + am1.sendContainerResizingRequest(increaseRequests); checkPendingResource(rm1, "default", 6 * GB, null); Assert.assertEquals(6 * GB, @@ -985,7 +1003,7 @@ public class TestContainerResizing { // earlier allocated) cs.handle(new NodeUpdateSchedulerEvent(rmNode1)); AllocateResponse allocateResponse = am1.allocate(null, null); - Assert.assertEquals(3, allocateResponse.getIncreasedContainers().size()); + Assert.assertEquals(3, allocateResponse.getUpdatedContainers().size()); verifyContainerIncreased(allocateResponse, ContainerId.newContainerId(attemptId, 4), 2 * GB); verifyContainerIncreased(allocateResponse, @@ -1046,9 +1064,11 @@ public class TestContainerResizing { nm.nodeHeartbeat(true); // *In the mean time*, am1 asks to decrease its AM container resource from // 3GB to 1GB - AllocateResponse response = am1.sendContainerResizingRequest(null, - Collections.singletonList(ContainerResourceChangeRequest - .newInstance(containerId1, Resources.createResource(GB)))); + AllocateResponse response = am1.sendContainerResizingRequest( + Collections.singletonList(UpdateContainerRequest + .newInstance(0, containerId1, + ContainerUpdateType.DECREASE_RESOURCE, + Resources.createResource(GB)))); // verify that the containe resource is decreased verifyContainerDecreased(response, containerId1, GB); @@ -1077,12 +1097,16 @@ public class TestContainerResizing { private void verifyContainerIncreased(AllocateResponse response, ContainerId containerId, int mem) { - List<Container> increasedContainers = response.getIncreasedContainers(); + List<UpdatedContainer> increasedContainers = + response.getUpdatedContainers(); boolean found = false; - for (Container c : increasedContainers) { - if (c.getId().equals(containerId)) { + for (UpdatedContainer c : increasedContainers) { + if (c.getContainer().getId().equals(containerId)) { found = true; - Assert.assertEquals(mem, c.getResource().getMemorySize()); + Assert.assertEquals(ContainerUpdateType.INCREASE_RESOURCE, + c.getUpdateType()); + Assert.assertEquals(mem, + c.getContainer().getResource().getMemorySize()); } } if (!found) { @@ -1092,12 +1116,16 @@ public class TestContainerResizing { private void verifyContainerDecreased(AllocateResponse response, ContainerId containerId, int mem) { - List<Container> decreasedContainers = response.getDecreasedContainers(); + List<UpdatedContainer> decreasedContainers = + response.getUpdatedContainers(); boolean found = false; - for (Container c : decreasedContainers) { - if (c.getId().equals(containerId)) { + for (UpdatedContainer c : decreasedContainers) { + if (c.getContainer().getId().equals(containerId)) { found = true; - Assert.assertEquals(mem, c.getResource().getMemorySize()); + Assert.assertEquals(ContainerUpdateType.DECREASE_RESOURCE, + c.getUpdateType()); + Assert.assertEquals(mem, + c.getContainer().getResource().getMemorySize()); } } if (!found) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/979b29a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestIncreaseAllocationExpirer.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestIncreaseAllocationExpirer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestIncreaseAllocationExpirer.java index cb698ec..31e293e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestIncreaseAllocationExpirer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestIncreaseAllocationExpirer.java @@ -21,10 +21,12 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity; import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.api.records.ContainerResourceChangeRequest; import org.apache.hadoop.yarn.api.records.ContainerState; +import org.apache.hadoop.yarn.api.records.ContainerUpdateType; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.UpdateContainerError; +import org.apache.hadoop.yarn.api.records.UpdateContainerRequest; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.MockAM; import org.apache.hadoop.yarn.server.resourcemanager.MockNM; @@ -109,8 +111,9 @@ public class TestIncreaseAllocationExpirer { rm1.waitForState(nm1, containerId2, RMContainerState.RUNNING); // am1 asks to increase containerId2 from 1GB to 3GB am1.sendContainerResizingRequest(Collections.singletonList( - ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(3 * GB))), null); + UpdateContainerRequest.newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(3 * GB)))); // Kick off scheduling and sleep for 1 second; nm1.nodeHeartbeat(true); Thread.sleep(1000); @@ -180,8 +183,9 @@ public class TestIncreaseAllocationExpirer { rm1.waitForState(nm1, containerId2, RMContainerState.RUNNING); // am1 asks to increase containerId2 from 1GB to 3GB am1.sendContainerResizingRequest(Collections.singletonList( - ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(3 * GB))), null); + UpdateContainerRequest.newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(3 * GB)))); // Kick off scheduling and wait for 1 second; nm1.nodeHeartbeat(true); Thread.sleep(1000); @@ -249,8 +253,9 @@ public class TestIncreaseAllocationExpirer { rm1.waitForState(nm1, containerId2, RMContainerState.RUNNING); // am1 asks to change containerId2 from 1GB to 3GB am1.sendContainerResizingRequest(Collections.singletonList( - ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(3 * GB))), null); + UpdateContainerRequest.newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(3 * GB)))); // Kick off scheduling and sleep for 1 second to // make sure the allocation is done nm1.nodeHeartbeat(true); @@ -261,10 +266,23 @@ public class TestIncreaseAllocationExpirer { Resource resource1 = Resources.clone( rm1.getResourceScheduler().getRMContainer(containerId2) .getAllocatedResource()); + + // This should not work, since the container version is wrong + AllocateResponse response = am1.sendContainerResizingRequest(Collections + .singletonList( + UpdateContainerRequest.newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(5 * GB)))); + List<UpdateContainerError> updateErrors = response.getUpdateErrors(); + Assert.assertEquals(1, updateErrors.size()); + Assert.assertEquals("INCORRECT_CONTAINER_VERSION_ERROR|0|1", + updateErrors.get(0).getReason()); + // am1 asks to change containerId2 from 3GB to 5GB am1.sendContainerResizingRequest(Collections.singletonList( - ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(5 * GB))), null); + UpdateContainerRequest.newInstance(1, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(5 * GB)))); // Kick off scheduling and sleep for 1 second to // make sure the allocation is done nm1.nodeHeartbeat(true); @@ -362,30 +380,36 @@ public class TestIncreaseAllocationExpirer { rm1.waitForState(nm1, containerId3, RMContainerState.RUNNING); rm1.waitForState(nm1, containerId4, RMContainerState.RUNNING); // am1 asks to change containerId2 and containerId3 from 1GB to 3GB - List<ContainerResourceChangeRequest> increaseRequests = new ArrayList<>(); - increaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(6 * GB))); - increaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId3, Resources.createResource(6 * GB))); - increaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId4, Resources.createResource(6 * GB))); - am1.sendContainerResizingRequest(increaseRequests, null); + List<UpdateContainerRequest> increaseRequests = new ArrayList<>(); + increaseRequests.add(UpdateContainerRequest.newInstance(0, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(6 * GB))); + increaseRequests.add(UpdateContainerRequest.newInstance(0, containerId3, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(6 * GB))); + increaseRequests.add(UpdateContainerRequest.newInstance(0, containerId4, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(6 * GB))); + am1.sendContainerResizingRequest(increaseRequests); nm1.nodeHeartbeat(true); Thread.sleep(1000); // Start container increase allocation expirer am1.allocate(null, null); // Decrease containers - List<ContainerResourceChangeRequest> decreaseRequests = new ArrayList<>(); - decreaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId2, Resources.createResource(2 * GB))); - decreaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId3, Resources.createResource(4 * GB))); - decreaseRequests.add(ContainerResourceChangeRequest.newInstance( - containerId4, Resources.createResource(4 * GB))); + List<UpdateContainerRequest> decreaseRequests = new ArrayList<>(); + decreaseRequests.add(UpdateContainerRequest.newInstance(1, containerId2, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(2 * GB))); + decreaseRequests.add(UpdateContainerRequest.newInstance(1, containerId3, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(4 * GB))); + decreaseRequests.add(UpdateContainerRequest.newInstance(1, containerId4, + ContainerUpdateType.INCREASE_RESOURCE, + Resources.createResource(4 * GB))); AllocateResponse response = - am1.sendContainerResizingRequest(null, decreaseRequests); + am1.sendContainerResizingRequest(decreaseRequests); // Verify containers are decreased in scheduler - Assert.assertEquals(3, response.getDecreasedContainers().size()); + Assert.assertEquals(3, response.getUpdatedContainers().size()); // Use the token for containerId4 on NM (6G). This should set the last // confirmed resource to 4G, and cancel the allocation expirer nm1.containerIncreaseStatus(getContainer( http://git-wip-us.apache.org/repos/asf/hadoop/blob/979b29a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java index 59bb6aa..ee3396d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java @@ -220,7 +220,7 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { org.apache.hadoop.yarn.api.records.Token validContainerToken = containerTokenSecretManager.createContainerToken(validContainerId, - validNode, user, r, Priority.newInstance(10), 1234); + 0, validNode, user, r, Priority.newInstance(10), 1234); ContainerTokenIdentifier identifier = BuilderUtils.newContainerTokenIdentifier(validContainerToken); Assert.assertEquals(Priority.newInstance(10), identifier.getPriority()); @@ -277,7 +277,7 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { 4 * 60 * 1000); validContainerToken = containerTokenSecretManager.createContainerToken(validContainerId, - validNode, user, r, Priority.newInstance(0), 0); + 0, validNode, user, r, Priority.newInstance(0), 0); Assert.assertTrue(testStartContainer(rpc, validAppAttemptId, validNode, validContainerToken, validNMToken, false).isEmpty()); Assert.assertTrue(nmTokenSecretManagerNM @@ -293,7 +293,7 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { org.apache.hadoop.yarn.api.records.Token validContainerToken2 = containerTokenSecretManager.createContainerToken(validContainerId2, - validNode, user, r, Priority.newInstance(0), 0); + 0, validNode, user, r, Priority.newInstance(0), 0); org.apache.hadoop.yarn.api.records.Token validNMToken2 = nmTokenSecretManagerRM.createNMToken(validAppAttemptId2, validNode, user); @@ -379,7 +379,7 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { .createNMToken(validAppAttemptId, validNode, user); org.apache.hadoop.yarn.api.records.Token newContainerToken = containerTokenSecretManager.createContainerToken( - ContainerId.newContainerId(attempt2, 1), validNode, user, r, + ContainerId.newContainerId(attempt2, 1), 0, validNode, user, r, Priority.newInstance(0), 0); Assert.assertTrue(testStartContainer(rpc, attempt2, validNode, newContainerToken, attempt1NMToken, false).isEmpty()); @@ -639,7 +639,7 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { Token containerToken = containerTokenSecretManager.createContainerToken( - cId, nodeId, user, r, Priority.newInstance(0), 0); + cId, 0, nodeId, user, r, Priority.newInstance(0), 0); ContainerTokenIdentifier containerTokenIdentifier = getContainerTokenIdentifierFromToken(containerToken); @@ -672,8 +672,8 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { ContainerId cId2 = ContainerId.newContainerId(appAttemptId, 1); // Creating modified containerToken Token containerToken2 = - tamperedContainerTokenSecretManager.createContainerToken(cId2, nodeId, - user, r, Priority.newInstance(0), 0); + tamperedContainerTokenSecretManager.createContainerToken(cId2, 0, + nodeId, user, r, Priority.newInstance(0), 0); StringBuilder sb = new StringBuilder("Given Container "); sb.append(cId2); @@ -731,8 +731,8 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase { getContainerTokenSecretManager(); Resource r = Resource.newInstance(1230, 2); Token containerToken = - containerTokenSecretManager.createContainerToken(cId, nodeId, user, r, - Priority.newInstance(0), 0); + containerTokenSecretManager.createContainerToken(cId, 0, nodeId, user, + r, Priority.newInstance(0), 0); ContainerTokenIdentifier containerTokenIdentifier = new ContainerTokenIdentifier(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/979b29a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java index 49a82c8..a941302 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java @@ -198,8 +198,6 @@ public class TestMiniYarnClusterNodeUtilization { /** * Verify both the RMNode and SchedulerNode have been updated with the test * fixture utilization data. - * @param containersUtilization Utilization of the container. - * @param nodeUtilization Utilization of the node. */ private void verifySimulatedUtilization() throws InterruptedException { ResourceManager rm = cluster.getResourceManager(0); http://git-wip-us.apache.org/repos/asf/hadoop/blob/979b29a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/proto/test_token.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/proto/test_token.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/proto/test_token.proto index 853f477..c111462 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/proto/test_token.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/proto/test_token.proto @@ -44,5 +44,6 @@ message ContainerTokenIdentifierForTestProto { optional int64 creationTime = 9; optional LogAggregationContextProto logAggregationContext = 10; optional string message = 11; + optional int32 version = 14 [default = 0]; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
