You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ha...@apache.org on 2022/03/15 14:16:19 UTC
[hbase] branch branch-2.5 updated (102e51a -> 4d00165)
This is an automated email from the ASF dual-hosted git repository.
haxiaolin pushed a change to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 102e51a HBASE-26835 Rewrite TestLruAdaptiveBlockCache to make it more stable (#4219)
new 8349965 HBASE-26840 Fix NPE in the retry of logroller (#4224)
new 4d00165 HBASE-26833 Avoid waiting to clear buffer usage of ReplicationSourceShipper when aborting the RS (#4218)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop/hbase/replication/regionserver/ReplicationSource.java | 8 +++++---
.../main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java | 3 +--
2 files changed, 6 insertions(+), 5 deletions(-)
[hbase] 01/02: HBASE-26840 Fix NPE in the retry of logroller (#4224)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haxiaolin pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8349965e8ac291ac38bb094801af2f6c213cc6e2
Author: Xiaolin Ha <ha...@apache.org>
AuthorDate: Tue Mar 15 21:59:09 2022 +0800
HBASE-26840 Fix NPE in the retry of logroller (#4224)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java
index 251c8ca..ad7d4da 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AbstractWALRoller.java
@@ -217,8 +217,7 @@ public abstract class AbstractWALRoller<T extends Abortable> extends Thread
if (waitingTime < rollWaitTimeout && nAttempts < maxRollRetry) {
nAttempts++;
LOG.warn("Retry to roll log, nAttempts={}, waiting time={}ms, sleeping 1s to retry,"
- + " last excepiton= {}", nAttempts, waitingTime,
- ioe.getCause().getClass().getSimpleName());
+ + " last exception", nAttempts, waitingTime, ioe);
sleep(1000);
} else {
LOG.error("Roll wal failed and waiting timeout, will not retry", ioe);
[hbase] 02/02: HBASE-26833 Avoid waiting to clear buffer usage of ReplicationSourceShipper when aborting the RS (#4218)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haxiaolin pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 4d0016587b55d8494b2cc73b3aa52a058043562c
Author: Xiaolin Ha <ha...@apache.org>
AuthorDate: Tue Mar 15 22:04:40 2022 +0800
HBASE-26833 Avoid waiting to clear buffer usage of ReplicationSourceShipper when aborting the RS (#4218)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../hadoop/hbase/replication/regionserver/ReplicationSource.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index 92f1979..a1d082e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -704,9 +704,11 @@ public class ReplicationSource implements ReplicationSourceInterface {
worker.entryReader.interrupt();
}
}
- //If worker is already stopped but there was still entries batched,
- //we need to clear buffer used for non processed entries
- worker.clearWALEntryBatch();
+ if (!server.isAborted() && !server.isStopped()) {
+ //If server is running and worker is already stopped but there was still entries batched,
+ //we need to clear buffer used for non processed entries
+ worker.clearWALEntryBatch();
+ }
}
if (join) {