diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index 2b806ddde89..17d9a854831 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -228,7 +228,8 @@ public static SummaryBuilder createAppSummary(RMApp app) { ? "" : app.getApplicationSubmissionContext() .getNodeLabelExpression()) - .add("diagnostics", app.getDiagnostics()); + .add("diagnostics", app.getDiagnostics()) + .add("numTotalContainers", metrics.getNumTotalContainers()); return summary; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java index e88d2b4dd50..052f6b0499e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java @@ -993,7 +993,8 @@ public void storeNewApplicationAttempt(RMAppAttempt appAttempt) { appAttempt.getMasterContainer(), credentials, appAttempt.getStartTime(), resUsage.getResourceUsageSecondsMap(), - attempMetrics.getPreemptedResourceSecondsMap()); + attempMetrics.getPreemptedResourceSecondsMap(), + attempMetrics.getTotalAllocatedContainers()); getRMStateStoreEventHandler().handle( new RMStateStoreAppAttemptEvent(attemptState)); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java index 2de071ad2ec..849c42e01af 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java @@ -46,7 +46,7 @@ public static ApplicationAttemptStateData newInstance( String finalTrackingUrl, String diagnostics, FinalApplicationStatus amUnregisteredFinalStatus, int exitStatus, long finishTime, Map resourceSecondsMap, - Map preemptedResourceSecondsMap) { + Map preemptedResourceSecondsMap, int numTotalContainers) { ApplicationAttemptStateData attemptStateData = Records.newRecord(ApplicationAttemptStateData.class); attemptStateData.setAttemptId(attemptId); @@ -74,6 +74,7 @@ public static ApplicationAttemptStateData newInstance( attemptStateData.setResourceSecondsMap(resourceSecondsMap); attemptStateData .setPreemptedResourceSecondsMap(preemptedResourceSecondsMap); + attemptStateData.setNumTotalContainers(numTotalContainers); return attemptStateData; } @@ -81,10 +82,10 @@ public static ApplicationAttemptStateData newInstance( ApplicationAttemptId attemptId, Container masterContainer, Credentials attemptTokens, long startTime, Map resourceSeondsMap, - Map preemptedResourceSecondsMap) { + Map preemptedResourceSecondsMap, int numTotalContainers) { return newInstance(attemptId, masterContainer, attemptTokens, startTime, null, "N/A", "", null, ContainerExitStatus.INVALID, 0, - resourceSeondsMap, preemptedResourceSecondsMap); + resourceSeondsMap, preemptedResourceSecondsMap, numTotalContainers); } @@ -276,4 +277,23 @@ public abstract void setResourceSecondsMap( @Unstable public abstract void setPreemptedResourceSecondsMap( Map preemptedResourceSecondsMap); + + /** + * Get total number of containers allocated for this attempt. + * + * @return total number of containers allocated for this attempt. + */ + @Public + @Unstable + public abstract int getNumTotalContainers(); + + /** + * Set total number of containers allocated for this attempt. + * + * @param numTotalContainers total number of containers + */ + @Public + @Unstable + public abstract void setNumTotalContainers(int numTotalContainers); + } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java index f72414f2965..1eab25fd822 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java @@ -454,4 +454,16 @@ public void setPreemptedResourceSecondsMap( .convertMapToStringLongMapProtoList(preemptedResourceSecondsMap)); } } + + @Override + public int getNumTotalContainers() { + ApplicationAttemptStateDataProtoOrBuilder p = viaProto ? proto : builder; + return p.getNumTotalContainers(); + } + + @Override + public void setNumTotalContainers(int numTotalContainers) { + maybeInitBuilder(); + builder.setNumTotalContainers(numTotalContainers); + } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index c21d8d4e0bd..4d48a4c54ea 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -1687,6 +1687,7 @@ public RMAppMetrics getRMAppMetrics() { int numNonAMContainerPreempted = 0; Map resourceSecondsMap = new HashMap<>(); Map preemptedSecondsMap = new HashMap<>(); + int numTotalContainers = 0; this.readLock.lock(); try { for (RMAppAttempt attempt : attempts.values()) { @@ -1716,6 +1717,7 @@ public RMAppMetrics getRMAppMetrics() { value += entry.getValue(); preemptedSecondsMap.put(entry.getKey(), value); } + numTotalContainers += attemptMetrics.getTotalAllocatedContainers(); } } } finally { @@ -1723,7 +1725,8 @@ public RMAppMetrics getRMAppMetrics() { } return new RMAppMetrics(resourcePreempted, numNonAMContainerPreempted, - numAMContainerPreempted, resourceSecondsMap, preemptedSecondsMap); + numAMContainerPreempted, resourceSecondsMap, preemptedSecondsMap, + numTotalContainers); } @Private diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppMetrics.java index 2bb7fd1ae10..5f864e0bbb3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppMetrics.java @@ -30,16 +30,19 @@ final int numAMContainersPreempted; private final Map resourceSecondsMap; private final Map preemptedResourceSecondsMap; + private int numTotalContainers; public RMAppMetrics(Resource resourcePreempted, int numNonAMContainersPreempted, int numAMContainersPreempted, Map resourceSecondsMap, - Map preemptedResourceSecondsMap) { + Map preemptedResourceSecondsMap, + int numTotalContainers) { this.resourcePreempted = resourcePreempted; this.numNonAMContainersPreempted = numNonAMContainersPreempted; this.numAMContainersPreempted = numAMContainersPreempted; this.resourceSecondsMap = resourceSecondsMap; this.preemptedResourceSecondsMap = preemptedResourceSecondsMap; + this.numTotalContainers = numTotalContainers; } public Resource getResourcePreempted() { @@ -83,4 +86,7 @@ public long getPreemptedVcoreSeconds() { return preemptedResourceSecondsMap; } + public int getNumTotalContainers() { + return numTotalContainers; + } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 801d690fa53..dc4a0578069 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -990,6 +990,8 @@ public void recover(RMState state) { .updateAggregateAppResourceUsage(attemptState.getResourceSecondsMap()); this.attemptMetrics.updateAggregatePreemptedAppResourceUsage( attemptState.getPreemptedResourceSecondsMap()); + this.attemptMetrics.setTotalAllocatedContainers( + attemptState.getNumTotalContainers()); } public void transferStateFromAttempt(RMAppAttempt attempt) { @@ -1418,7 +1420,8 @@ private void rememberTargetTransitionsAndStoreState(RMAppAttemptEvent event, rmStore.getCredentialsFromAppAttempt(this), startTime, stateToBeStored, finalTrackingUrl, diags.toString(), finalStatus, exitStatus, getFinishTime(), resUsage.getResourceUsageSecondsMap(), - this.attemptMetrics.getPreemptedResourceSecondsMap()); + this.attemptMetrics.getPreemptedResourceSecondsMap(), + this.attemptMetrics.getTotalAllocatedContainers()); LOG.info("Updating application attempt " + applicationAttemptId + " with final state: " + targetedFinalState + ", and exit status: " + exitStatus); @@ -1849,7 +1852,8 @@ public void transition(RMAppAttemptImpl appAttempt, ContainerExitStatus.INVALID, appAttempt.getFinishTime(), appAttempt.attemptMetrics.getAggregateAppResourceUsage() .getResourceUsageSecondsMap(), - appAttempt.attemptMetrics.getPreemptedResourceSecondsMap()); + appAttempt.attemptMetrics.getPreemptedResourceSecondsMap(), + appAttempt.attemptMetrics.getTotalAllocatedContainers()); appAttempt.rmContext.getStateStore() .updateApplicationAttemptState(attemptState); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index 77c2d64d54b..3f3d875c4b4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -231,6 +231,10 @@ public int getTotalAllocatedContainers() { return this.totalAllocatedContainers; } + public void setTotalAllocatedContainers(int totalAllocatedContainers) { + this.totalAllocatedContainers = totalAllocatedContainers; + } + public Resource getApplicationAttemptHeadroom() { return Resource.newInstance(applicationHeadroom); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/proto/yarn_server_resourcemanager_recovery.proto hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/proto/yarn_server_resourcemanager_recovery.proto index 8ac6615cd72..767df8081d3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/proto/yarn_server_resourcemanager_recovery.proto +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/proto/yarn_server_resourcemanager_recovery.proto @@ -91,6 +91,7 @@ message ApplicationAttemptStateDataProto { optional int64 preempted_vcore_seconds = 14; repeated StringLongMapProto application_resource_usage_map = 15; repeated StringLongMapProto preempted_resource_usage_map = 16; + optional int32 num_total_containers = 17; } message EpochProto { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index a0817642b4e..1c65e7217e8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -1086,7 +1086,7 @@ public void testEscapeApplicationSummary() { resourceSecondsMap.put(ResourceInformation.VCORES.getName(), 64L); RMAppMetrics metrics = new RMAppMetrics(Resource.newInstance(1234, 56), - 10, 1, resourceSecondsMap, new HashMap<>()); + 10, 1, resourceSecondsMap, new HashMap<>(), 1234); when(app.getRMAppMetrics()).thenReturn(metrics); when(app.getDiagnostics()).thenReturn(new StringBuilder( "Multiline\n\n\r\rDiagnostics=Diagn,ostic")); @@ -1114,6 +1114,7 @@ public void testEscapeApplicationSummary() { assertTrue(msg.contains("applicationNodeLabel=test")); assertTrue(msg.contains("diagnostics=Multiline" + escaped + "Diagnostics\\=Diagn\\,ostic")); + assertTrue(msg.contains("numTotalContainers=1234")); } @Test diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java index 0c7d233c20d..bf237c9175c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java @@ -227,6 +227,8 @@ public void testUsageWithMultipleContainersAndRMRestart() throws Exception { memorySeconds, metricsBefore.getMemorySeconds()); Assert.assertEquals("Unexpected VcoreSeconds value", vcoreSeconds, metricsBefore.getVcoreSeconds()); + Assert.assertEquals("Unexpected numTotalContainers value", + NUM_CONTAINERS + 1, metricsBefore.getNumTotalContainers()); // create new RM to represent RM restart. Load up the state store. MockRM rm1 = new MockRM(conf, memStore); @@ -240,6 +242,9 @@ public void testUsageWithMultipleContainersAndRMRestart() throws Exception { metricsBefore.getVcoreSeconds(), metricsAfter.getVcoreSeconds()); Assert.assertEquals("Memory seconds were not the same after RM Restart", metricsBefore.getMemorySeconds(), metricsAfter.getMemorySeconds()); + Assert.assertEquals("NumTotalContainers was not the same after RM Restart", + metricsBefore.getNumTotalContainers(), + metricsAfter.getNumTotalContainers()); rm0.stop(); rm0.close(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java index 5194674748d..a09aa006713 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java @@ -209,7 +209,7 @@ public YarnApplicationState createApplicationState() { @Override public RMAppMetrics getRMAppMetrics() { return new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, new HashMap<>(), - new HashMap<>()); + new HashMap<>(), 0); } @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java index 5b0c34f7b47..63f007b45b9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java @@ -479,7 +479,7 @@ private static RMApp createRMApp(ApplicationId appId) { preemptedMap.put(ResourceInformation.VCORES.getName(), Long.MAX_VALUE); when(rmApp.getRMAppMetrics()).thenReturn( new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, resourceMap, - preemptedMap)); + preemptedMap, 0)); when(rmApp.getApplicationTags()).thenReturn( Collections. emptySet()); ApplicationSubmissionContext appSubmissionContext = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java index 35f55c6d476..3c00bbcdc07 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java @@ -526,7 +526,8 @@ private static RMApp createRMApp(ApplicationId appId) { .put(ResourceInformation.MEMORY_MB.getName(), (long) Integer.MAX_VALUE); preemptedMap.put(ResourceInformation.VCORES.getName(), Long.MAX_VALUE); when(app.getRMAppMetrics()) - .thenReturn(new RMAppMetrics(null, 0, 0, resourceMap, preemptedMap)); + .thenReturn(new RMAppMetrics(null, 0, 0, resourceMap, preemptedMap, + 0)); Set appTags = new HashSet(); appTags.add("test"); appTags.add("tags"); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisherForV2.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisherForV2.java index 76e8f0ee8cf..a1989d5c0c2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisherForV2.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisherForV2.java @@ -422,7 +422,7 @@ private static RMApp createRMApp(ApplicationId appId) { .put(ResourceInformation.VCORES.getName(), Long.MAX_VALUE); when(app.getRMAppMetrics()).thenReturn( new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, resourceSecondsMap, - new HashMap<>())); + new HashMap<>(), 0)); when(app.getApplicationTags()).thenReturn(Collections.emptySet()); ApplicationSubmissionContext appSubmissionContext = mock(ApplicationSubmissionContext.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java index 9f8732acbde..55654fb7b5a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java @@ -379,7 +379,8 @@ void testRMAppStateStore(RMStateStoreHelper stateStoreHelper, oldAttemptState.getStartTime(), RMAppAttemptState.FINISHED, "myTrackingUrl", "attemptDiagnostics", FinalApplicationStatus.SUCCEEDED, 100, - oldAttemptState.getFinishTime(), new HashMap<>(), new HashMap<>()); + oldAttemptState.getFinishTime(), new HashMap<>(), new HashMap<>(), + 0); store.updateApplicationAttemptState(newAttemptState); // test updating the state of an app/attempt whose initial state was not @@ -404,7 +405,8 @@ void testRMAppStateStore(RMStateStoreHelper stateStoreHelper, oldAttemptState.getStartTime(), RMAppAttemptState.FINISHED, "myTrackingUrl", "attemptDiagnostics", FinalApplicationStatus.SUCCEEDED, 111, - oldAttemptState.getFinishTime(), new HashMap<>(), new HashMap<>()); + oldAttemptState.getFinishTime(), new HashMap<>(), new HashMap<>(), + 0); store.updateApplicationAttemptState(dummyAttempt); // let things settle down diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java index 6b6f0131cd6..767c4273c38 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java @@ -572,7 +572,7 @@ public void testFencedState() throws Exception { store.getCredentialsFromAppAttempt(mockAttempt), startTime, RMAppAttemptState.FINISHED, "testUrl", "test", FinalApplicationStatus.SUCCEEDED, 100, - finishTime, new HashMap<>(), new HashMap<>()); + finishTime, new HashMap<>(), new HashMap<>(), 0); store.updateApplicationAttemptState(newAttemptState); assertEquals("RMStateStore should have been in fenced state", true, store.isFencedState()); @@ -822,7 +822,7 @@ private static ApplicationAttemptStateData createFinishedAttempt( return ApplicationAttemptStateData.newInstance(attemptId, container, null, startTime, RMAppAttemptState.FINISHED, "myTrackingUrl", "attemptDiagnostics", FinalApplicationStatus.SUCCEEDED, - amExitStatus, 0, resourceSecondsMap, preemptedResoureSecondsMap); + amExitStatus, 0, resourceSecondsMap, preemptedResoureSecondsMap, 0); } private ApplicationAttemptId storeAttempt(RMStateStore store, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestAppPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestAppPage.java index f88ac8b4d20..b32a35ef3dd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestAppPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestAppPage.java @@ -66,7 +66,7 @@ public void testAppBlockRenderWithNullCurrentAppAttempt() throws Exception { RMAppMetrics appMetrics = new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, new HashMap<>(), - new HashMap<>()); + new HashMap<>(), 0); when(app.getRMAppMetrics()).thenReturn(appMetrics); // initialize RM Context, and create RMApp, without creating RMAppAttempt diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebAppFairScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebAppFairScheduler.java index cea0088d334..25d8530382e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebAppFairScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebAppFairScheduler.java @@ -138,7 +138,7 @@ private static RMContext mockRMContext(List states) { @Override public RMAppMetrics getRMAppMetrics() { return new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, - new HashMap<>(), new HashMap<>()); + new HashMap<>(), new HashMap<>(), 0); } @Override public YarnApplicationState createApplicationState() { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index 450d07a3a7e..afc37fa57a0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -928,7 +928,7 @@ public void testInvalidXMLChars() throws Exception { RMApp app = mock(RMApp.class); RMAppMetrics appMetrics = new RMAppMetrics(Resource.newInstance(0, 0), - 0, 0, new HashMap<>(), new HashMap<>()); + 0, 0, new HashMap<>(), new HashMap<>(), 0); when(app.getDiagnostics()).thenReturn( new StringBuilder("java.lang.Exception: \u0001")); when(app.getApplicationId()).thenReturn(applicationId);