You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by na...@apache.org on 2017/05/01 11:20:59 UTC
hadoop git commit: YARN-6518. Fix warnings from Spotbugs in
hadoop-yarn-server-timelineservice. Contributed by Weiwei Yang.
Repository: hadoop
Updated Branches:
refs/heads/trunk 4b5bd73ac -> 0f1af3178
YARN-6518. Fix warnings from Spotbugs in hadoop-yarn-server-timelineservice. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f1af317
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f1af317
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f1af317
Branch: refs/heads/trunk
Commit: 0f1af3178eb2a38aaaa1e1a27edd409cda19a198
Parents: 4b5bd73
Author: Naganarasimha <na...@apache.org>
Authored: Mon May 1 16:49:30 2017 +0530
Committer: Naganarasimha <na...@apache.org>
Committed: Mon May 1 16:49:30 2017 +0530
----------------------------------------------------------------------
.../storage/FileSystemTimelineReaderImpl.java | 129 ++++++++++---------
1 file changed, 67 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f1af317/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
index cfd5bd4..967702b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
@@ -278,69 +278,74 @@ public class FileSystemTimelineReaderImpl extends AbstractService
}
}
);
- for (File entityFile : dir.listFiles()) {
- if (!entityFile.getName().contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) {
- continue;
- }
- try (BufferedReader reader =
- new BufferedReader(
- new InputStreamReader(
- new FileInputStream(
- entityFile), Charset.forName("UTF-8")))) {
- TimelineEntity entity = readEntityFromFile(reader);
- if (!entity.getType().equals(entityType)) {
- continue;
- }
- if (!isTimeInRange(entity.getCreatedTime(),
- filters.getCreatedTimeBegin(), filters.getCreatedTimeEnd())) {
- continue;
- }
- if (filters.getRelatesTo() != null &&
- !filters.getRelatesTo().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchRelatesTo(entity,
- filters.getRelatesTo())) {
- continue;
- }
- if (filters.getIsRelatedTo() != null &&
- !filters.getIsRelatedTo().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchIsRelatedTo(entity,
- filters.getIsRelatedTo())) {
- continue;
- }
- if (filters.getInfoFilters() != null &&
- !filters.getInfoFilters().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchInfoFilters(entity,
- filters.getInfoFilters())) {
- continue;
- }
- if (filters.getConfigFilters() != null &&
- !filters.getConfigFilters().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchConfigFilters(entity,
- filters.getConfigFilters())) {
- continue;
- }
- if (filters.getMetricFilters() != null &&
- !filters.getMetricFilters().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchMetricFilters(entity,
- filters.getMetricFilters())) {
- continue;
- }
- if (filters.getEventFilters() != null &&
- !filters.getEventFilters().getFilterList().isEmpty() &&
- !TimelineStorageUtils.matchEventFilters(entity,
- filters.getEventFilters())) {
- continue;
- }
- TimelineEntity entityToBeReturned = createEntityToBeReturned(
- entity, dataToRetrieve.getFieldsToRetrieve());
- Set<TimelineEntity> entitiesCreatedAtSameTime =
- sortedEntities.get(entityToBeReturned.getCreatedTime());
- if (entitiesCreatedAtSameTime == null) {
- entitiesCreatedAtSameTime = new HashSet<TimelineEntity>();
+ if (dir != null) {
+ File[] files = dir.listFiles();
+ if (files != null) {
+ for (File entityFile : files) {
+ if (!entityFile.getName()
+ .contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) {
+ continue;
+ }
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(new FileInputStream(entityFile),
+ Charset.forName("UTF-8")))) {
+ TimelineEntity entity = readEntityFromFile(reader);
+ if (!entity.getType().equals(entityType)) {
+ continue;
+ }
+ if (!isTimeInRange(entity.getCreatedTime(),
+ filters.getCreatedTimeBegin(),
+ filters.getCreatedTimeEnd())) {
+ continue;
+ }
+ if (filters.getRelatesTo() != null &&
+ !filters.getRelatesTo().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchRelatesTo(entity,
+ filters.getRelatesTo())) {
+ continue;
+ }
+ if (filters.getIsRelatedTo() != null &&
+ !filters.getIsRelatedTo().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchIsRelatedTo(entity,
+ filters.getIsRelatedTo())) {
+ continue;
+ }
+ if (filters.getInfoFilters() != null &&
+ !filters.getInfoFilters().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchInfoFilters(entity,
+ filters.getInfoFilters())) {
+ continue;
+ }
+ if (filters.getConfigFilters() != null &&
+ !filters.getConfigFilters().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchConfigFilters(entity,
+ filters.getConfigFilters())) {
+ continue;
+ }
+ if (filters.getMetricFilters() != null &&
+ !filters.getMetricFilters().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchMetricFilters(entity,
+ filters.getMetricFilters())) {
+ continue;
+ }
+ if (filters.getEventFilters() != null &&
+ !filters.getEventFilters().getFilterList().isEmpty() &&
+ !TimelineStorageUtils.matchEventFilters(entity,
+ filters.getEventFilters())) {
+ continue;
+ }
+ TimelineEntity entityToBeReturned = createEntityToBeReturned(
+ entity, dataToRetrieve.getFieldsToRetrieve());
+ Set<TimelineEntity> entitiesCreatedAtSameTime =
+ sortedEntities.get(entityToBeReturned.getCreatedTime());
+ if (entitiesCreatedAtSameTime == null) {
+ entitiesCreatedAtSameTime = new HashSet<TimelineEntity>();
+ }
+ entitiesCreatedAtSameTime.add(entityToBeReturned);
+ sortedEntities.put(entityToBeReturned.getCreatedTime(),
+ entitiesCreatedAtSameTime);
+ }
}
- entitiesCreatedAtSameTime.add(entityToBeReturned);
- sortedEntities.put(
- entityToBeReturned.getCreatedTime(), entitiesCreatedAtSameTime);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org