Skip to content

HBASE-28620 Release inflight buffer when replication source terminates #8663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Huginn-kio wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −1
Open

HBASE-28620 Release inflight buffer when replication source terminates #8663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .../main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ void shipEdits(WALEntryBatch entryBatch) throws IOException {
persistLogPosition();
return;
}
boolean bufferReleased = false;
while (isActive()) {
try {
try {
Expand Down Expand Up @@ -253,6 +254,7 @@ void shipEdits(WALEntryBatch entryBatch) throws IOException {
// acquireBufferQuota() in ReplicationSourceWALReader because they maintain
// same variable: totalBufferUsed
source.postShipEdits(entries, entryBatch.getUsedBufferSize());
bufferReleased = true;
// FIXME check relationship between wal group and overall
source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize,
entryBatch.getNbHFiles());
Expand All @@ -277,12 +279,14 @@ void shipEdits(WALEntryBatch entryBatch) throws IOException {
}
}
}

accumulatedSizeSinceLastUpdate += currentSize;
lastShippedBatch = entryBatch;
if (shouldPersistLogPosition()) {
persistLogPosition();
}
if (!bufferReleased) {
source.getSourceManager().releaseWALEntryBatchBufferQuota(entryBatch);
}
}

private boolean shouldPersistLogPosition() {
Expand Down
40 changes: 40 additions & 0 deletions ...src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,46 @@ public void testTerminateClearsBuffer() throws Exception {
assertEquals(0, source.getSourceManager().getTotalBufferUsed());
}

@Test
public void testStoppedShipperClearsInflightBuffer() throws Exception {
ReplicationSource source = new ReplicationSource();
ReplicationSourceManager sourceManager =
new ReplicationSourceManager(null, null, conf, null, null, null, null, null, null, null,
mock(MetricsReplicationGlobalSourceSource.class));
ReplicationPeer mockPeer = mock(ReplicationPeer.class);
Mockito.when(mockPeer.getPeerBandwidth()).thenReturn(0L);
ReplicationQueueId queueId =
new ReplicationQueueId(ServerName.valueOf("test,123,123"), "testPeer");
source.init(HBaseConfiguration.create(), null, sourceManager, null, mockPeer,
Mockito.mock(Server.class), new ReplicationQueueData(queueId, ImmutableMap.of()), null,
p -> OptionalLong.empty(),
mock(MetricsSource.class));
ReplicationSourceWALReader reader = new ReplicationSourceWALReader(null,
conf, null, 0, null, source, null);
ReplicationSourceShipper shipper = new ReplicationSourceShipper(conf, null, source, reader);
WALEntryBatch batch = new WALEntryBatch(10, logDir);
WAL.Entry mockEntry = mock(WAL.Entry.class);
WALEdit mockEdit = mock(WALEdit.class);
WALKeyImpl mockKey = mock(WALKeyImpl.class);
when(mockEntry.getEdit()).thenReturn(mockEdit);
when(mockEdit.isEmpty()).thenReturn(false);
when(mockEntry.getKey()).thenReturn(mockKey);
when(mockKey.estimatedSerializedSizeOf()).thenReturn(1000L);
when(mockEdit.heapSize()).thenReturn(10000L);
when(mockEdit.size()).thenReturn(0);
ArrayList<Cell> cells = new ArrayList<>();
KeyValue kv = new KeyValue(Bytes.toBytes("0001"), Bytes.toBytes("f"),
Bytes.toBytes("1"), Bytes.toBytes("v1"));
cells.add(kv);
when(mockEdit.getCells()).thenReturn(cells);
reader.addEntryToBatch(batch, mockEntry);
assertEquals(11000, source.getSourceManager().getTotalBufferUsed());
shipper.setWorkerState(ReplicationSourceShipper.WorkerState.RUNNING);
shipper.stopWorker();
shipper.shipEdits(batch);
assertEquals(0, source.getSourceManager().getTotalBufferUsed());
}

/**
* Tests that recovered queues are preserved on a regionserver shutdown. See HBASE-18192
*/
Expand Down