Repository: hbase Updated Branches: refs/heads/HBASE-14614 8bfc2a221 -> 61c904732
Making more logging trace-level Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3d9d69bc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3d9d69bc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3d9d69bc Branch: refs/heads/HBASE-14614 Commit: 3d9d69bc998d3a079a91ad005a6f62e365445c60 Parents: 8bfc2a2 Author: Michael Stack <st...@apache.org> Authored: Fri May 12 10:28:39 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Fri May 12 10:28:39 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java | 6 ++++-- .../hadoop/hbase/procedure2/store/wal/WALProcedureStore.java | 4 ++-- .../org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java index 585762b..2221cfc 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java @@ -167,8 +167,10 @@ public class ProcedureWALFile implements Comparable<ProcedureWALFile> { LOG.warn("Making " + archiveDir, ioe); } Path archivedFile = new Path(archiveDir, logFile.getName()); - LOG.info("ARCHIVED WAL (FIX) " + logFile + " to " + archivedFile); - fs.rename(logFile, archivedFile); + LOG.info("ARCHIVED WAL (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + archivedFile); + if (!fs.rename(logFile, archivedFile)) { + LOG.warn("Failed archive of " + logFile); + } // fs.delete(logFile, false); } http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index 7eeb2df..300e023 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -1079,8 +1079,8 @@ public class WALProcedureStore extends ProcedureStoreBase { private void removeAllLogs(long lastLogId) { if (logs.size() <= 1) return; - if (LOG.isDebugEnabled()) { - LOG.debug("Remove all state logs with ID less than " + lastLogId); + if (LOG.isTraceEnabled()) { + LOG.trace("Remove all state logs with ID less than " + lastLogId); } boolean removed = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java index 69cd233..a6a5c17 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java @@ -88,8 +88,8 @@ public class RegionServerTracker extends ZooKeeperListener { int magicLen = ProtobufUtil.lengthOfPBMagic(); ProtobufUtil.mergeFrom(rsInfoBuilder, data, magicLen, data.length - magicLen); } - if (LOG.isDebugEnabled()) { - LOG.debug("Added tracking of RS " + nodePath); + if (LOG.isTraceEnabled()) { + LOG.trace("Added tracking of RS " + nodePath); } } catch (KeeperException e) { LOG.warn("Get Rs info port from ephemeral node", e);
