You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2022/05/09 14:25:58 UTC
[hbase] branch branch-2.5 updated: HBASE-26999 HStore should try write WAL compaction marker before repl… (#4407)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new cdc0975d2e4 HBASE-26999 HStore should try write WAL compaction marker before repl… (#4407)
cdc0975d2e4 is described below
commit cdc0975d2e41499e9d4f6266643ea041764dc541
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Mon May 9 10:24:47 2022 +0100
HBASE-26999 HStore should try write WAL compaction marker before repl… (#4407)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Andrew Purtell <ap...@apache.org>
(cherry picked from commit 7b7f57619b841c8aab483a1a5a6b11f1d87e7d5a)
---
.../java/org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++++++----
.../org/apache/hadoop/hbase/regionserver/StoreEngine.java | 8 +++++---
.../java/org/apache/hadoop/hbase/regionserver/TestHStore.java | 4 ++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 83c30a10020..fe4bf2bfc72 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1231,14 +1231,17 @@ public class HStore
allowedOnPath = ".*/(HStore|TestHStore).java")
void replaceStoreFiles(Collection<HStoreFile> compactedFiles, Collection<HStoreFile> result,
boolean writeCompactionMarker) throws IOException {
- storeEngine.replaceStoreFiles(compactedFiles, result, () -> {
+ storeEngine.replaceStoreFiles(compactedFiles, result,
+ () -> {
+ if (writeCompactionMarker) {
+ writeCompactionWalRecord(compactedFiles, result);
+ }
+ },
+ () -> {
synchronized (filesCompacting) {
filesCompacting.removeAll(compactedFiles);
}
});
- if (writeCompactionMarker) {
- writeCompactionWalRecord(compactedFiles, result);
- }
// These may be null when the RS is shutting down. The space quota Chores will fix the Region
// sizes later so it's not super-critical if we miss these.
RegionServerServices rsServices = region.getRegionServerServices();
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java
index 91fe44c350c..a9863ea8451 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java
@@ -34,6 +34,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.CellComparator;
@@ -407,8 +408,7 @@ public abstract class StoreEngine<SF extends StoreFlusher, CP extends Compaction
List<HStoreFile> openedFiles = openStoreFiles(toBeAddedFiles, false);
// propogate the file changes to the underlying store file manager
- replaceStoreFiles(toBeRemovedStoreFiles, openedFiles, () -> {
- }); // won't throw an exception
+ replaceStoreFiles(toBeRemovedStoreFiles, openedFiles, () -> {}, () -> {}); // won't throw an exception
}
/**
@@ -491,9 +491,11 @@ public abstract class StoreEngine<SF extends StoreFlusher, CP extends Compaction
}
public void replaceStoreFiles(Collection<HStoreFile> compactedFiles,
- Collection<HStoreFile> newFiles, Runnable actionUnderLock) throws IOException {
+ Collection<HStoreFile> newFiles, IOExceptionRunnable walMarkerWriter,
+ Runnable actionUnderLock) throws IOException {
storeFileTracker.replace(StoreUtils.toStoreFileInfo(compactedFiles),
StoreUtils.toStoreFileInfo(newFiles));
+ walMarkerWriter.run();
writeLock();
try {
storeFileManager.addCompactionResults(compactedFiles, newFiles);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 565cf9eddeb..e9f87353bc7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -1018,14 +1018,14 @@ public class TestHStore {
// call first time after files changed
spiedStoreEngine.refreshStoreFiles();
assertEquals(2, this.store.getStorefilesCount());
- verify(spiedStoreEngine, times(1)).replaceStoreFiles(any(), any(), any());
+ verify(spiedStoreEngine, times(1)).replaceStoreFiles(any(), any(), any(), any());
// call second time
spiedStoreEngine.refreshStoreFiles();
// ensure that replaceStoreFiles is not called, i.e, the times does not change, if files are not
// refreshed,
- verify(spiedStoreEngine, times(1)).replaceStoreFiles(any(), any(), any());
+ verify(spiedStoreEngine, times(1)).replaceStoreFiles(any(), any(), any(), any());
}
private long countMemStoreScanner(StoreScanner scanner) {