big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-8378. ApplicationHistoryManagerImpl#getApplications doesn't honor filters. Contributed by Lantao Jin.

Browse Source
This commit is contained in:
Rohith Sharma K S 2019-02-27 10:32:58 +05:30
parent 8eae260af5
commit 6c96f5e4b6
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
View File

@ -104,10 +104,20 @@ public Map<ApplicationId, ApplicationReport> getApplications(long appsNum,
historyStore.getAllApplications(); historyStore.getAllApplications();
HashMap<ApplicationId, ApplicationReport> applicationsReport = HashMap<ApplicationId, ApplicationReport> applicationsReport =
new HashMap<ApplicationId, ApplicationReport>(); new HashMap<ApplicationId, ApplicationReport>();
int count = 0;
for (Entry<ApplicationId, ApplicationHistoryData> entry : histData for (Entry<ApplicationId, ApplicationHistoryData> entry : histData
.entrySet()) { .entrySet()) {
if (count == appsNum) {
break;
}
long appStartTime = entry.getValue().getStartTime();
if (appStartTime < appStartedTimeBegin
|| appStartTime > appStartedTimeEnd) {
continue;
}
applicationsReport.put(entry.getKey(), applicationsReport.put(entry.getKey(),
convertToApplicationReport(entry.getValue())); convertToApplicationReport(entry.getValue()));
count++;
} }
return applicationsReport; return applicationsReport;
} }

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java
View File

@ -47,6 +47,12 @@ protected void writeApplicationStartData(ApplicationId appId)
appId.toString(), "test type", "test queue", "test user", 0, 0)); appId.toString(), "test type", "test queue", "test user", 0, 0));
} }
protected void writeApplicationStartData(ApplicationId appId, long startTime)
throws IOException {
store.applicationStarted(ApplicationStartData.newInstance(appId,
appId.toString(), "test type", "test queue", "test user", 0, startTime));
}
protected void writeApplicationFinishData(ApplicationId appId) protected void writeApplicationFinishData(ApplicationId appId)
throws IOException { throws IOException {
store.applicationFinished(ApplicationFinishData.newInstance(appId, 0, store.applicationFinished(ApplicationFinishData.newInstance(appId, 0,

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java
View File

@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.applicationhistoryservice; package org.apache.hadoop.yarn.server.applicationhistoryservice;
import java.io.IOException; import java.io.IOException;
import java.util.Map;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@ -71,4 +72,24 @@ public void testApplicationReport() throws IOException, YarnException {
Assert.assertEquals("test type", appReport.getApplicationType().toString()); Assert.assertEquals("test type", appReport.getApplicationType().toString());
Assert.assertEquals("test queue", appReport.getQueue().toString()); Assert.assertEquals("test queue", appReport.getQueue().toString());
} }
@Test
public void testApplications() throws IOException {
ApplicationId appId1 = ApplicationId.newInstance(0, 1);
ApplicationId appId2 = ApplicationId.newInstance(0, 2);
ApplicationId appId3 = ApplicationId.newInstance(0, 3);
writeApplicationStartData(appId1, 1000);
writeApplicationFinishData(appId1);
writeApplicationStartData(appId2, 3000);
writeApplicationFinishData(appId2);
writeApplicationStartData(appId3, 4000);
writeApplicationFinishData(appId3);
Map<ApplicationId, ApplicationReport> reports =
applicationHistoryManagerImpl.getApplications(2, 2000L, 5000L);
Assert.assertNotNull(reports);
Assert.assertEquals(2, reports.size());
Assert.assertNull(reports.get("1"));
Assert.assertNull(reports.get("2"));
Assert.assertNull(reports.get("3"));
}
} }