Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Expand Down Expand Up @@ -75,6 +76,8 @@ class ReplicationSourceWALReader extends Thread {
private boolean isReaderRunning = true;
private final String walGroupId;

AtomicBoolean waitingPeerEnabled = new AtomicBoolean(false);

/**
* Creates a reader worker for a given WAL queue. Reads WAL entries off a given queue, batches the
* entries, and puts them on a batch queue.
Expand Down Expand Up @@ -137,8 +140,11 @@ public void run() {
source.getWALFileLengthProvider(), source.getSourceMetrics(), walGroupId)) {
while (isReaderRunning()) { // loop here to keep reusing stream while we can
if (!source.isPeerEnabled()) {
waitingPeerEnabled.set(true);
Threads.sleep(sleepForRetries);
continue;
} else {
waitingPeerEnabled.set(false);
}
if (!checkBufferQuota()) {
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.Closeable;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.OptionalLong;
import java.util.concurrent.PriorityBlockingQueue;
import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -219,6 +220,11 @@ private HasNext prepareReader() {
// we will read from the beginning so we should always clear the compression context
reader.resetTo(-1, true);
}
} catch (FileNotFoundException e) {
// For now, this could happen only when reading meta wal for meta replicas.
// In this case, raising UncheckedIOException will let the endpoint deal with resetting
// the replication source. See HBASE-27871.
throw new UncheckedIOException(e);
} catch (IOException e) {
LOG.warn("Failed to reset reader {} to pos {}, reset compression={}", currentPath,
currentPositionOfEntry, state.resetCompression(), e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
Expand All @@ -53,6 +55,7 @@
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.replication.ReplicationPeerImpl;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil;
Expand Down Expand Up @@ -225,6 +228,51 @@ public void testCatalogReplicaReplicationWithFlushAndCompaction() throws Excepti
}
}

@Test
public void testCatalogReplicaReplicationWALRolledAndDeleted() throws Exception {
TableName tableName = TableName.valueOf("hbase:meta");
try (Connection connection = ConnectionFactory.createConnection(HTU.getConfiguration());
Table table = connection.getTable(tableName)) {
MiniHBaseCluster cluster = HTU.getHBaseCluster();
cluster.getMaster().balanceSwitch(false);
HRegionServer hrs = cluster.getRegionServer(cluster.getServerHoldingMeta());
ReplicationSource source = (ReplicationSource) hrs.getReplicationSourceService()
.getReplicationManager().catalogReplicationSource.get();
((ReplicationPeerImpl) source.replicationPeer).setPeerState(false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this enough to make sure that the replication is already stopped? The check is in another thread, we'd better add some checks here to confirm that the replication source is stopped.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, there's a small chance for race conditions here, although I have run this many times and never faced it.

Nevertheless, I'm putting extra checks to make sure we just proceed with adding data once we are sure the source wal reader knows the peer is disabled now. Please check, @Apache9 .

// there's small chance source reader has passed the peer state check but not yet read the
// wal, which could allow it to read some added entries before the wal gets deleted,
// so we are making sure here we only proceed once the reader loop has managed to
// detect the peer is disabled.
HTU.waitFor(2000, 100, true, () -> {
MutableObject<Boolean> readerWaiting = new MutableObject<>(true);
source.logQueue.getQueues().keySet()
.forEach(w -> readerWaiting.setValue(readerWaiting.getValue()
&& source.workerThreads.get(w).entryReader.waitingPeerEnabled.get()));
return readerWaiting.getValue();
});
// load the data to the table
for (int i = 0; i < 5; i++) {
LOG.info("Writing data from " + i * 1000 + " to " + (i * 1000 + 1000));
HTU.loadNumericRows(table, HConstants.CATALOG_FAMILY, i * 1000, i * 1000 + 1000);
LOG.info("flushing table");
HTU.flush(tableName);
LOG.info("compacting table");
if (i < 4) {
HTU.compact(tableName, false);
}
}
HTU.getHBaseCluster().getMaster().getLogCleaner().triggerCleanerNow().get(1,
TimeUnit.SECONDS);
((ReplicationPeerImpl) source.replicationPeer).setPeerState(true);
// now loads more data without flushing nor compacting
for (int i = 5; i < 10; i++) {
LOG.info("Writing data from " + i * 1000 + " to " + (i * 1000 + 1000));
HTU.loadNumericRows(table, HConstants.CATALOG_FAMILY, i * 1000, i * 1000 + 1000);
}
verifyReplication(tableName, numOfMetaReplica, 0, 10000, HConstants.CATALOG_FAMILY);
}
}

@Test
public void testCatalogReplicaReplicationWithReplicaMoved() throws Exception {
MiniHBaseCluster cluster = HTU.getMiniHBaseCluster();
Expand Down