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 2020/08/09 18:22:43 UTC
[hbase] branch master updated: HBASE-24830 Some tests involving RS
crash fail with NullPointerException after HBASE-24632 in branch-2
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 11ac0a1 HBASE-24830 Some tests involving RS crash fail with NullPointerException after HBASE-24632 in branch-2
11ac0a1 is described below
commit 11ac0a1ba623c18b9eb481c7ea7381191ceb1ff6
Author: stack <st...@apache.org>
AuthorDate: Fri Aug 7 09:34:41 2020 -0700
HBASE-24830 Some tests involving RS crash fail with NullPointerException after HBASE-24632 in branch-2
---
.../hadoop/hbase/regionserver/SplitLogWorker.java | 4 ++--
.../replication/regionserver/TestReplicationSource.java | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
index 04ef115..90e705c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
@@ -182,8 +182,8 @@ public class SplitLogWorker implements Runnable {
// encountered a bad non-retry-able persistent error.
try {
SplitLogWorkerCoordination splitLogWorkerCoordination =
- server.getCoordinatedStateManager() == null ? null
- : server.getCoordinatedStateManager().getSplitLogWorkerCoordination();
+ server.getCoordinatedStateManager() == null ? null
+ : server.getCoordinatedStateManager().getSplitLogWorkerCoordination();
if (!WALSplitter.splitLogFile(walDir, fs.getFileStatus(new Path(walDir, filename)), fs, conf,
p, sequenceIdChecker, splitLogWorkerCoordination, factory, server)) {
return Status.PREEMPTED;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
index 6323da3..15f202f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
@@ -32,6 +32,9 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellBuilderFactory;
+import org.apache.hadoop.hbase.CellBuilderType;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -172,13 +175,17 @@ public class TestReplicationSource {
TEST_UTIL.waitFor(30000, () -> rs.getWalEntryFilter() != null);
WALEntryFilter wef = rs.getWalEntryFilter();
// Test non-system WAL edit.
+ WALEdit we = new WALEdit().add(CellBuilderFactory.create(CellBuilderType.DEEP_COPY).
+ setRow(HConstants.EMPTY_START_ROW).
+ setFamily(HConstants.CATALOG_FAMILY).
+ setType(Cell.Type.Put).build());
WAL.Entry e = new WAL.Entry(new WALKeyImpl(HConstants.EMPTY_BYTE_ARRAY,
- TableName.valueOf("test"), -1), new WALEdit());
+ TableName.valueOf("test"), -1, -1, uuid), we);
assertTrue(wef.filter(e) == e);
// Test system WAL edit.
e = new WAL.Entry(
- new WALKeyImpl(HConstants.EMPTY_BYTE_ARRAY, TableName.META_TABLE_NAME, -1),
- new WALEdit());
+ new WALKeyImpl(HConstants.EMPTY_BYTE_ARRAY, TableName.META_TABLE_NAME, -1, -1, uuid),
+ we);
assertNull(wef.filter(e));
} finally {
rs.terminate("Done");
@@ -383,6 +390,10 @@ public class TestReplicationSource {
protected void doStop() {
notifyStopped();
}
+
+ @Override public boolean canReplicateToSameCluster() {
+ return true;
+ }
}
/**