Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6518. Fix warnings from Spotbugs in hadoop-yarn-server-timelineservice. Contributed by Weiwei Yang. 

(cherry picked from commit 0f1af3178e)
This commit is contained in:
Naganarasimha 2017-05-01 16:49:30 +05:30 committed by Varun Saxena
parent 7338dbe5c0
commit e1d2f6ebdd
1 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
View File

@ -279,21 +279,24 @@ public class FileSystemTimelineReaderImpl extends AbstractService
} }
} }
); );
for (File entityFile : dir.listFiles()) { if (dir != null) {
if (!entityFile.getName().contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) { File[] files = dir.listFiles();
if (files != null) {
for (File entityFile : files) {
if (!entityFile.getName()
.contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) {
continue; continue;
} }
try (BufferedReader reader = try (BufferedReader reader = new BufferedReader(
new BufferedReader( new InputStreamReader(new FileInputStream(entityFile),
new InputStreamReader( Charset.forName("UTF-8")))) {
new FileInputStream(
entityFile), Charset.forName("UTF-8")))) {
TimelineEntity entity = readEntityFromFile(reader); TimelineEntity entity = readEntityFromFile(reader);
if (!entity.getType().equals(entityType)) { if (!entity.getType().equals(entityType)) {
continue; continue;
} }
if (!isTimeInRange(entity.getCreatedTime(), if (!isTimeInRange(entity.getCreatedTime(),
filters.getCreatedTimeBegin(), filters.getCreatedTimeEnd())) { filters.getCreatedTimeBegin(),
filters.getCreatedTimeEnd())) {
continue; continue;
} }
if (filters.getRelatesTo() != null && if (filters.getRelatesTo() != null &&
@ -340,8 +343,10 @@ public class FileSystemTimelineReaderImpl extends AbstractService
entitiesCreatedAtSameTime = new HashSet<TimelineEntity>(); entitiesCreatedAtSameTime = new HashSet<TimelineEntity>();
} }
entitiesCreatedAtSameTime.add(entityToBeReturned); entitiesCreatedAtSameTime.add(entityToBeReturned);
sortedEntities.put( sortedEntities.put(entityToBeReturned.getCreatedTime(),
entityToBeReturned.getCreatedTime(), entitiesCreatedAtSameTime); entitiesCreatedAtSameTime);
}
}
} }
} }