[01/50] [abbrv] hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. [Forced Update!]
Repository: hadoop Updated Branches: refs/heads/YARN-1011 4c501b46d -> f6e03a59b (forced update) YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/YARN-1011 Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore {
[04/50] [abbrv] hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/YARN-6592 Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK); } } finally { - IOUtils.cleanup(LOG,
[08/50] [abbrv] hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/HDFS-10467 Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK); } } finally { - IOUtils.cleanup(LOG,
[35/50] [abbrv] hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/YARN-5881 Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK); } } finally { - IOUtils.cleanup(LOG,
hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
Repository: hadoop Updated Branches: refs/heads/branch-2 c556cdaaf -> 1f80e05eb YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f80e05e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f80e05e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f80e05e Branch: refs/heads/branch-2 Commit: 1f80e05eb4400d98a794ee42ee27279654076de8 Parents: c556cda Author: Akira AjisakaAuthored: Thu Aug 10 22:14:44 2017 +0900 Committer: Akira Ajisaka Committed: Thu Aug 10 22:14:44 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f80e05e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 53c1655..633f65a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import org.codehaus.jackson.map.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK); } } finally { - IOUtils.cleanup(LOG, localFS); + IOUtils.cleanupWithLogger(LOG, localFS); } LOG.info("Using leveldb path " + dbPath); entityDb = factory.open(new File(dbPath.toString()), options); @@ -113,7 +113,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { @Override protected synchronized void serviceStop() throws Exception { -IOUtils.cleanup(LOG, entityDb); +IOUtils.cleanupWithLogger(LOG, entityDb); Path dbPath = new Path( configuration.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_PATH), dbId + CACHED_LDB_FILE_PREFIX); @@ -125,7 +125,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { "timeline store " + dbPath); } } finally { - IOUtils.cleanup(LOG, localFS); + IOUtils.cleanupWithLogger(LOG, localFS); } super.serviceStop(); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[50/51] [abbrv] hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/HADOOP-13345 Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK); } } finally { - IOUtils.cleanup(LOG,
hadoop git commit: YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang.
Repository: hadoop Updated Branches: refs/heads/trunk 69afa26f1 -> 63cfcb90a YARN-6958. Moving logging APIs over to slf4j in hadoop-yarn-server-timelineservice. Contributed by Yeliang Cang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63cfcb90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63cfcb90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63cfcb90 Branch: refs/heads/trunk Commit: 63cfcb90ac6fbb79ba9ed6b3044cd999fc74e58c Parents: 69afa26 Author: Akira AjisakaAuthored: Wed Aug 9 23:58:22 2017 +0900 Committer: Akira Ajisaka Committed: Wed Aug 9 23:58:22 2017 +0900 -- .../server/timeline/LevelDBCacheTimelineStore.java| 14 +++--- .../reader/filter/TimelineFilterUtils.java| 7 --- .../storage/HBaseTimelineReaderImpl.java | 8 .../storage/HBaseTimelineWriterImpl.java | 8 .../storage/TimelineSchemaCreator.java| 7 --- .../storage/application/ApplicationTable.java | 7 --- .../storage/apptoflow/AppToFlowTable.java | 7 --- .../timelineservice/storage/common/ColumnHelper.java | 8 +--- .../storage/common/HBaseTimelineStorageUtils.java | 8 .../timelineservice/storage/entity/EntityTable.java | 7 --- .../storage/flow/FlowActivityTable.java | 7 --- .../storage/flow/FlowRunCoprocessor.java | 7 --- .../timelineservice/storage/flow/FlowRunTable.java| 7 --- .../timelineservice/storage/flow/FlowScanner.java | 7 --- .../storage/reader/TimelineEntityReader.java | 7 --- .../collector/AppLevelTimelineCollector.java | 7 --- .../collector/NodeTimelineCollectorManager.java | 8 .../PerNodeTimelineCollectorsAuxService.java | 10 +- .../timelineservice/collector/TimelineCollector.java | 7 --- .../collector/TimelineCollectorManager.java | 8 .../collector/TimelineCollectorWebService.java| 8 .../timelineservice/reader/TimelineReaderServer.java | 9 + .../reader/TimelineReaderWebServices.java | 8 .../storage/FileSystemTimelineReaderImpl.java | 8 .../storage/common/TimelineStorageUtils.java | 4 25 files changed, 102 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63cfcb90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index 7379dd6..f7a3d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.timeline; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -34,6 +32,8 @@ import org.fusesource.leveldbjni.JniDBFactory; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -58,8 +58,8 @@ import java.util.Map; @Private @Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { - private static final Log LOG - = LogFactory.getLog(LevelDBCacheTimelineStore.class); + private static final Logger LOG + = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb"; private String dbId; private DB entityDb; @@ -102,7 +102,7 @@ public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { localFS.setPermission(dbPath,