You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ss...@apache.org on 2015/05/19 04:39:24 UTC
hbase git commit: HBASE-13673 WALProcedureStore procedure is chatty
Repository: hbase
Updated Branches:
refs/heads/master 92e66ef52 -> bc189d049
HBASE-13673 WALProcedureStore procedure is chatty
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bc189d04
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bc189d04
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bc189d04
Branch: refs/heads/master
Commit: bc189d0497e4052159242b9a358e8d6e2f4a2f2b
Parents: 92e66ef
Author: Srikanth Srungarapu <ss...@cloudera.com>
Authored: Mon May 18 19:37:29 2015 -0700
Committer: Srikanth Srungarapu <ss...@cloudera.com>
Committed: Mon May 18 19:37:29 2015 -0700
----------------------------------------------------------------------
.../procedure2/store/wal/WALProcedureStore.java | 73 ++++++++++++--------
1 file changed, 43 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bc189d04/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 0bda0d1..1884adc 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
@@ -141,7 +141,7 @@ public class WALProcedureStore implements ProcedureStore {
try {
syncLoop();
} catch (IOException e) {
- LOG.error("got an exception from the sync-loop", e);
+ LOG.error("Got an exception from the sync-loop", e);
sendAbortProcessSignal();
}
}
@@ -219,21 +219,23 @@ public class WALProcedureStore implements ProcedureStore {
// Create new state-log
if (!rollWriter(flushLogId)) {
- // someone else has already created this log
- LOG.debug("someone else has already created log " + flushLogId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Someone else has already created log: " + flushLogId);
+ }
continue;
}
// We have the lease on the log
oldLogs = getLogFiles();
if (getMaxLogId(oldLogs) > flushLogId) {
- // Someone else created new logs
- LOG.debug("someone else created new logs. expected maxLogId < " + flushLogId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Someone else created new logs. Expected maxLogId < " + flushLogId);
+ }
logs.getLast().removeFile();
continue;
}
- LOG.info("lease acquired flushLogId=" + flushLogId);
+ LOG.info("Lease acquired for flushLogId: " + flushLogId);
break;
}
}
@@ -246,7 +248,9 @@ public class WALProcedureStore implements ProcedureStore {
// Nothing to do, If we have only the current log.
if (logs.size() == 1) {
- LOG.debug("No state logs to replay");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("No state logs to replay.");
+ }
return null;
}
@@ -282,7 +286,7 @@ public class WALProcedureStore implements ProcedureStore {
@Override
public void insert(final Procedure proc, final Procedure[] subprocs) {
if (LOG.isTraceEnabled()) {
- LOG.trace("insert " + proc + " subproc=" + Arrays.toString(subprocs));
+ LOG.trace("Insert " + proc + ", subproc=" + Arrays.toString(subprocs));
}
ByteSlot slot = acquireSlot();
@@ -302,7 +306,7 @@ public class WALProcedureStore implements ProcedureStore {
// We are not able to serialize the procedure.
// this is a code error, and we are not able to go on.
LOG.fatal("Unable to serialize one of the procedure: proc=" + proc +
- " subprocs=" + Arrays.toString(subprocs), e);
+ ", subprocs=" + Arrays.toString(subprocs), e);
throw new RuntimeException(e);
} finally {
releaseSlot(slot);
@@ -317,7 +321,7 @@ public class WALProcedureStore implements ProcedureStore {
@Override
public void update(final Procedure proc) {
if (LOG.isTraceEnabled()) {
- LOG.trace("update " + proc);
+ LOG.trace("Update " + proc);
}
ByteSlot slot = acquireSlot();
@@ -354,7 +358,7 @@ public class WALProcedureStore implements ProcedureStore {
@Override
public void delete(final long procId) {
if (LOG.isTraceEnabled()) {
- LOG.trace("delete " + procId);
+ LOG.trace("Delete " + procId);
}
ByteSlot slot = acquireSlot();
@@ -469,9 +473,9 @@ public class WALProcedureStore implements ProcedureStore {
long syncWaitMs = System.currentTimeMillis() - syncWaitSt;
if (LOG.isTraceEnabled() && (syncWaitMs > 10 || slotIndex < slots.length)) {
float rollSec = (System.currentTimeMillis() - lastRollTs) / 1000.0f;
- LOG.trace("sync wait " + StringUtils.humanTimeDiff(syncWaitMs) +
- " slotIndex=" + slotIndex +
- " totalSynced=" + StringUtils.humanSize(totalSynced.get()) +
+ LOG.trace("Sync wait " + StringUtils.humanTimeDiff(syncWaitMs) +
+ ", slotIndex=" + slotIndex +
+ ", totalSynced=" + StringUtils.humanSize(totalSynced.get()) +
" " + StringUtils.humanSize(totalSynced.get() / rollSec) + "/sec");
}
@@ -499,7 +503,7 @@ public class WALProcedureStore implements ProcedureStore {
break;
} catch (Throwable e) {
if (++retry == MAX_RETRIES_BEFORE_ABORT) {
- LOG.error("sync slot failed, abort.", e);
+ LOG.error("Sync slot failed, abort.", e);
sendAbortProcessSignal();
}
}
@@ -524,7 +528,7 @@ public class WALProcedureStore implements ProcedureStore {
if (LOG.isTraceEnabled()) {
LOG.trace("Sync slots=" + count + '/' + slots.length +
- " flushed=" + StringUtils.humanSize(totalSynced));
+ ", flushed=" + StringUtils.humanSize(totalSynced));
}
return totalSynced;
}
@@ -581,7 +585,9 @@ public class WALProcedureStore implements ProcedureStore {
} finally {
lock.unlock();
}
- LOG.info("Roll new state log: " + logId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Roll new state log: " + logId);
+ }
return true;
}
@@ -603,24 +609,31 @@ public class WALProcedureStore implements ProcedureStore {
}
private void removeAllLogs(long lastLogId) {
- LOG.info("Remove all state logs with ID less then " + lastLogId);
- while (!logs.isEmpty()) {
+ if (logs.size() <= 1) {
+ assert logs.size() == 1: "Expected at least one active log to be running.";
+ return;
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Remove all state logs with ID less than " + lastLogId);
+ }
+ do {
ProcedureWALFile log = logs.getFirst();
if (lastLogId < log.getLogId()) {
break;
}
-
removeLogFile(log);
- }
+ } while(!logs.isEmpty());
}
private boolean removeLogFile(final ProcedureWALFile log) {
try {
- LOG.debug("remove log: " + log);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Remove log: " + log);
+ }
log.removeFile();
logs.remove(log);
} catch (IOException e) {
- LOG.error("unable to remove log " + log, e);
+ LOG.error("Unable to remove log: " + log, e);
return false;
}
return true;
@@ -666,7 +679,7 @@ public class WALProcedureStore implements ProcedureStore {
}
});
} catch (FileNotFoundException e) {
- LOG.warn("log directory not found: " + e.getMessage());
+ LOG.warn("Log directory not found: " + e.getMessage());
return null;
}
}
@@ -723,16 +736,17 @@ public class WALProcedureStore implements ProcedureStore {
private ProcedureWALFile initOldLog(final FileStatus logFile) throws IOException {
ProcedureWALFile log = new ProcedureWALFile(fs, logFile);
if (logFile.getLen() == 0) {
- LOG.warn("Remove uninitialized log " + logFile);
+ LOG.warn("Remove uninitialized log: " + logFile);
log.removeFile();
return null;
}
-
- LOG.debug("opening state-log: " + logFile);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Opening state-log: " + logFile);
+ }
try {
log.open();
} catch (ProcedureWALFormat.InvalidWALDataException e) {
- LOG.warn("Remove uninitialized log " + logFile, e);
+ LOG.warn("Remove uninitialized log: " + logFile, e);
log.removeFile();
return null;
} catch (IOException e) {
@@ -745,8 +759,7 @@ public class WALProcedureStore implements ProcedureStore {
try {
log.readTrailer();
} catch (IOException e) {
- // unfinished compacted log throw it away
- LOG.warn("Unfinished compacted log " + logFile, e);
+ LOG.warn("Unfinished compacted log: " + logFile, e);
log.removeFile();
return null;
}