Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19972 Should rethrow the RetriesExhaustedWithDetailsException when failed to apply the batch in ReplicationSink; ADDENDUM to fix TestReplicationSink

This commit is contained in:
Michael Stack 2018-02-12 10:47:06 -08:00
parent 1c67d8a46f
commit 00f8877323
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java
View File

@ -158,7 +158,7 @@ public class AssignProcedure extends RegionTransitionProcedure {
LOG.info("Assigned, not reassigning; " + this + "; " + regionNode.toShortString()); LOG.info("Assigned, not reassigning; " + this + "; " + regionNode.toShortString());
return false; return false;
} }
// Don't assign if table is in disabling of disabled state. // Don't assign if table is in disabling or disabled state.
TableStateManager tsm = env.getMasterServices().getTableStateManager(); TableStateManager tsm = env.getMasterServices().getTableStateManager();
TableName tn = regionNode.getRegionInfo().getTable(); TableName tn = regionNode.getRegionInfo().getTable();
if (tsm.isTableState(tn, TableState.State.DISABLING, TableState.State.DISABLED)) { if (tsm.isTableState(tn, TableState.State.DISABLING, TableState.State.DISABLED)) {
@ -166,7 +166,7 @@ public class AssignProcedure extends RegionTransitionProcedure {
return false; return false;
} }
// If the region is SPLIT, we can't assign it. But state might be CLOSED, rather than // If the region is SPLIT, we can't assign it. But state might be CLOSED, rather than
// SPLIT which is what a region gets set to when Unassigned as part of SPLIT. FIX. // SPLIT which is what a region gets set to when unassigned as part of SPLIT. FIX.
if (regionNode.isInState(State.SPLIT) || if (regionNode.isInState(State.SPLIT) ||
(regionNode.getRegionInfo().isOffline() && regionNode.getRegionInfo().isSplit())) { (regionNode.getRegionInfo().isOffline() && regionNode.getRegionInfo().isSplit())) {
LOG.info("SPLIT, cannot be assigned; " + this + "; " + regionNode + LOG.info("SPLIT, cannot be assigned; " + this + "; " + regionNode +

13
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
View File

@ -1,4 +1,4 @@
/** /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
@ -317,8 +317,8 @@ public class TestReplicationSink {
Path dir = TEST_UTIL.getDataTestDirOnTestFS("testReplicateEntries"); Path dir = TEST_UTIL.getDataTestDirOnTestFS("testReplicateEntries");
Path familyDir = new Path(dir, Bytes.toString(FAM_NAME1)); Path familyDir = new Path(dir, Bytes.toString(FAM_NAME1));
int numRows = 10; int numRows = 10;
List<Path> p = new ArrayList<>(1); List<Path> p = new ArrayList<>(1);
final String hfilePrefix = "hfile-";
// 1. Generate 25 hfile ranges // 1. Generate 25 hfile ranges
Random rng = new SecureRandom(); Random rng = new SecureRandom();
@ -335,7 +335,7 @@ public class TestReplicationSink {
FileSystem fs = dir.getFileSystem(conf); FileSystem fs = dir.getFileSystem(conf);
Iterator<Integer> numbersItr = numberList.iterator(); Iterator<Integer> numbersItr = numberList.iterator();
for (int i = 0; i < 25; i++) { for (int i = 0; i < 25; i++) {
Path hfilePath = new Path(familyDir, "hfile_" + i); Path hfilePath = new Path(familyDir, hfilePrefix + i);
HFileTestUtil.createHFile(conf, fs, hfilePath, FAM_NAME1, FAM_NAME1, HFileTestUtil.createHFile(conf, fs, hfilePath, FAM_NAME1, FAM_NAME1,
Bytes.toBytes(numbersItr.next()), Bytes.toBytes(numbersItr.next()), numRows); Bytes.toBytes(numbersItr.next()), Bytes.toBytes(numbersItr.next()), numRows);
p.add(hfilePath); p.add(hfilePath);
@ -370,10 +370,10 @@ public class TestReplicationSink {
.append(Bytes.toString(TABLE_NAME1.getName())).append(Path.SEPARATOR) .append(Bytes.toString(TABLE_NAME1.getName())).append(Path.SEPARATOR)
.append(Bytes.toString(loadDescriptor.getEncodedRegionName().toByteArray())) .append(Bytes.toString(loadDescriptor.getEncodedRegionName().toByteArray()))
.append(Path.SEPARATOR).append(Bytes.toString(FAM_NAME1)).append(Path.SEPARATOR) .append(Path.SEPARATOR).append(Bytes.toString(FAM_NAME1)).append(Path.SEPARATOR)
.append("hfile_" + i).toString(); .append(hfilePrefix + i).toString();
String dst = baseNamespaceDir + Path.SEPARATOR + pathToHfileFromNS; String dst = baseNamespaceDir + Path.SEPARATOR + pathToHfileFromNS;
Path dstPath = new Path(dst);
FileUtil.copy(fs, p.get(0), fs, new Path(dst), false, conf); FileUtil.copy(fs, p.get(0), fs, dstPath, false, conf);
} }
entries.add(builder.build()); entries.add(builder.build());
@ -388,6 +388,7 @@ public class TestReplicationSink {
// 8. Assert data is replicated // 8. Assert data is replicated
assertEquals(numRows, scanner.next(numRows).length); assertEquals(numRows, scanner.next(numRows).length);
} }
// Clean up the created hfiles or it will mess up subsequent tests
} }
private WALEntry createEntry(TableName table, int row, KeyValue.Type type, List<Cell> cells) { private WALEntry createEntry(TableName table, int row, KeyValue.Type type, List<Cell> cells) {