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 2024/10/01 19:56:40 UTC
(hbase) 01/02: HBASE-28884 SFT's BrokenStoreFileCleaner may cause data loss (#6308) (#6315)
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
commit a3f873848a2628e2a81ed31777828ce30d283983
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Fri Sep 27 16:34:55 2024 +0100
HBASE-28884 SFT's BrokenStoreFileCleaner may cause data loss (#6308) (#6315)
Signed-off-by: Peter Somogyi <ps...@apache.org>
Signed-off-by: Ankit Singhal <an...@apache.org>
---
.../hbase/regionserver/BrokenStoreFileCleaner.java | 6 +++
.../regionserver/TestBrokenStoreFileCleaner.java | 48 +++++++++++++++++++++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/BrokenStoreFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/BrokenStoreFileCleaner.java
index c235bdc29dc..df71adecd0c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/BrokenStoreFileCleaner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/BrokenStoreFileCleaner.java
@@ -147,6 +147,12 @@ public class BrokenStoreFileCleaner extends ScheduledChore {
return;
}
+ if (!store.getHRegion().isAvailable()) {
+ LOG.trace("This store's region {} is no longer open, so it might have moved elsewhere. "
+ + "Skipping cleanup.", store.getRegionInfo().getEncodedName());
+ return;
+ }
+
deleteFile(file, store, deletedFiles, failedDeletes);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBrokenStoreFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBrokenStoreFileCleaner.java
index 66abc5dc3c0..11a1276e497 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBrokenStoreFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBrokenStoreFileCleaner.java
@@ -20,8 +20,12 @@ package org.apache.hadoop.hbase.regionserver;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
@@ -69,7 +73,6 @@ public class TestBrokenStoreFileCleaner {
@After
public void tearDown() throws Exception {
- testUtil.deleteTable(tableName);
testUtil.shutdownMiniCluster();
}
@@ -104,7 +107,6 @@ public class TestBrokenStoreFileCleaner {
// verify no storefile got deleted
int currentStoreFiles = store.getStorefilesCount();
assertEquals(currentStoreFiles, storeFiles);
-
}
@Test
@@ -192,6 +194,48 @@ public class TestBrokenStoreFileCleaner {
assertEquals(currentStoreFiles, storeFiles);
}
+ @Test
+ public void testWhenRegionIsClosing() throws Exception {
+ tableName = TableName.valueOf(getClass().getSimpleName() + "testWhenRegionIsClosing");
+ createTableWithData(tableName);
+
+ HRegion region = testUtil.getMiniHBaseCluster().getRegions(tableName).get(0);
+ ServerName sn = testUtil.getMiniHBaseCluster().getServerHoldingRegion(tableName,
+ region.getRegionInfo().getRegionName());
+ HRegionServer rs = testUtil.getMiniHBaseCluster().getRegionServer(sn);
+
+ HStore store = region.getStore(fam);
+ int expectedStoreFiles = store.getStorefilesCount();
+ assertTrue(expectedStoreFiles > 0);
+ Path cfPath = store.getRegionFileSystem().getStoreDir(store.getColumnFamilyName());
+ // because we use FILE SFT, there will be a .filelist dir under the store dir
+ int totalFiles = store.getRegionFileSystem().getFileSystem().listStatus(cfPath).length - 1;
+ assertEquals(expectedStoreFiles, totalFiles);
+
+ HRegionServer mockedServer = mock(HRegionServer.class);
+ HRegion mockedRegion = mock(HRegion.class);
+ when(mockedRegion.isAvailable()).thenReturn(region.isAvailable());
+ when(mockedRegion.getRegionFileSystem()).thenReturn(region.getRegionFileSystem());
+ List<HRegion> mockedRegionsList = new ArrayList<>();
+ mockedRegionsList.add(mockedRegion);
+ when(mockedServer.getRegions()).thenReturn(mockedRegionsList);
+ when(mockedServer.getServerName()).thenReturn(rs.getServerName());
+ when(mockedRegion.getStores()).thenAnswer(i -> {
+ region.close();
+ return region.getStores();
+ });
+
+ BrokenStoreFileCleaner cleaner =
+ new BrokenStoreFileCleaner(15000000, 0, rs, rs.getConfiguration(), mockedServer);
+
+ cleaner.chore();
+
+ // verify no storefile got deleted
+ int currentStoreFiles =
+ store.getRegionFileSystem().getFileSystem().listStatus(cfPath).length - 1;
+ assertEquals(expectedStoreFiles, currentStoreFiles);
+ }
+
private Table createTableWithData(TableName tableName) throws IOException {
Table table = testUtil.createTable(tableName, fam);
try {