You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/04/11 23:07:47 UTC
[1/2] hbase git commit: HBASE-20347 [DOC] upgrade section should warn
about logging changes
Repository: hbase
Updated Branches:
refs/heads/master 281c29ff6 -> e4b51bb27
HBASE-20347 [DOC] upgrade section should warn about logging changes
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/732c31e0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/732c31e0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/732c31e0
Branch: refs/heads/master
Commit: 732c31e0416afc35366086f19e26f84569a3b43c
Parents: 281c29f
Author: Michael Stack <st...@apache.org>
Authored: Wed Apr 11 15:32:55 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Wed Apr 11 15:34:44 2018 -0700
----------------------------------------------------------------------
src/main/asciidoc/_chapters/upgrading.adoc | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/732c31e0/src/main/asciidoc/_chapters/upgrading.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/upgrading.adoc b/src/main/asciidoc/_chapters/upgrading.adoc
index 67c5dbc..0c7edcc 100644
--- a/src/main/asciidoc/_chapters/upgrading.adoc
+++ b/src/main/asciidoc/_chapters/upgrading.adoc
@@ -430,6 +430,18 @@ The following metrics have been added:
* 'totalRowActionRequestCount' is a count of region row actions summing reads and writes.
+[[upgrade2.0.logging]]
+.Changed logging
+HBase-2.0.0 now uses link:https://www.slf4j.org/[slf4j] as its logging frontend.
+Prevously, we used link:http://logging.apache.org/log4j/1.2/[log4j (1.2)].
+For most the transition should be seamless; slf4j does a good job interpreting
+_log4j.properties_ logging configuration files such that you should not notice
+any difference in your log system emissions.
+
+That said, your _log4j.properties_ may need freshening. See link:https://issues.apache.org/jira/browse/HBASE-20351[HBASE-20351]
+for example, where a stale log configuration file manifest as netty configuration
+being dumped at DEBUG level as preamble on every shell command invocation.
+
[[upgrade2.0.zkconfig]]
.ZooKeeper configs no longer read from zoo.cfg
[2/2] hbase git commit: HBASE-20330 ProcedureExecutor.start() gets
stuck in recover lease on store
Posted by st...@apache.org.
HBASE-20330 ProcedureExecutor.start() gets stuck in recover lease on store
rollWriter() fails after creating the file and returns false. In next iteration of while loop in recoverLease() file list is refreshed.
Signed-off-by: Appy <ap...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4b51bb2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4b51bb2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4b51bb2
Branch: refs/heads/master
Commit: e4b51bb27d87310fd3f6a75c61a1ecda57b069bc
Parents: 732c31e
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Wed Apr 4 16:07:50 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Wed Apr 11 16:07:42 2018 -0700
----------------------------------------------------------------------
hbase-procedure/pom.xml | 5 +++
.../procedure2/store/wal/WALProcedureStore.java | 13 ++++---
.../store/wal/TestWALProcedureStore.java | 37 ++++++++++++++++++++
3 files changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e4b51bb2/hbase-procedure/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index 73bc866..3fedda8 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -100,6 +100,11 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/hbase/blob/e4b51bb2/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 8581d82..c5680cf 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
@@ -359,21 +359,20 @@ public class WALProcedureStore extends ProcedureStoreBase {
lock.lock();
try {
LOG.trace("Starting WAL Procedure Store lease recovery");
- FileStatus[] oldLogs = getLogFiles();
while (isRunning()) {
+ FileStatus[] oldLogs = getLogFiles();
// Get Log-MaxID and recover lease on old logs
try {
flushLogId = initOldLogs(oldLogs);
} catch (FileNotFoundException e) {
LOG.warn("Someone else is active and deleted logs. retrying.", e);
- oldLogs = getLogFiles();
continue;
}
// Create new state-log
if (!rollWriter(flushLogId + 1)) {
// someone else has already created this log
- LOG.debug("Someone else has already created log " + flushLogId);
+ LOG.debug("Someone else has already created log {}. Retrying.", flushLogId);
continue;
}
@@ -1002,7 +1001,8 @@ public class WALProcedureStore extends ProcedureStoreBase {
return true;
}
- private boolean rollWriter(final long logId) throws IOException {
+ @VisibleForTesting
+ boolean rollWriter(final long logId) throws IOException {
assert logId > flushLogId : "logId=" + logId + " flushLogId=" + flushLogId;
assert lock.isHeldByCurrentThread() : "expected to be the lock owner. " + lock.isLocked();
@@ -1072,7 +1072,10 @@ public class WALProcedureStore extends ProcedureStoreBase {
}
private void closeCurrentLogStream() {
- if (stream == null) return;
+ if (stream == null || logs.isEmpty()) {
+ return;
+ }
+
try {
ProcedureWALFile log = logs.getLast();
log.setProcIds(storeTracker.getUpdatedMinProcId(), storeTracker.getUpdatedMaxProcId());
http://git-wip-us.apache.org/repos/asf/hbase/blob/e4b51bb2/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 1929c0c..64cf211 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -54,6 +54,9 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -760,6 +763,40 @@ public class TestWALProcedureStore {
}
@Test
+ public void testLogFileAleadExists() throws IOException {
+ final boolean[] tested = {false};
+ WALProcedureStore mStore = Mockito.spy(procStore);
+
+ Answer<Boolean> ans = new Answer<Boolean>() {
+ @Override
+ public Boolean answer(InvocationOnMock invocationOnMock) throws Throwable {
+ long logId = ((Long) invocationOnMock.getArgument(0)).longValue();
+ switch ((int) logId) {
+ case 2:
+ // Create a file so that real rollWriter() runs into file exists condition
+ Path logFilePath = mStore.getLogFilePath(logId);
+ mStore.getFileSystem().create(logFilePath);
+ break;
+ case 3:
+ // Success only when we retry with logId 3
+ tested[0] = true;
+ default:
+ break;
+ }
+ return (Boolean) invocationOnMock.callRealMethod();
+ }
+ };
+
+ // First time Store has one log file, next id will be 2
+ Mockito.doAnswer(ans).when(mStore).rollWriter(2);
+ // next time its 3
+ Mockito.doAnswer(ans).when(mStore).rollWriter(3);
+
+ mStore.recoverLease();
+ assertTrue(tested[0]);
+ }
+
+ @Test
public void testLoadChildren() throws Exception {
TestProcedure a = new TestProcedure(1, 0);
TestProcedure b = new TestProcedure(2, 1);