Skip to content

Incremental backups fail on archived bulkloaded HFiles (not yet upstream) #201

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

Merged
hgromer merged 3 commits into from
Sep 23, 2025
Merged

Incremental backups fail on archived bulkloaded HFiles (not yet upstream) #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bba5c7
Incremental backups fail on archived HFiles
Sep 23, 2025
710b6c6
spotless
Sep 23, 2025
9d7cc5d
PR comments
Sep 23, 2025
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
19 changes: 17 additions & 2 deletions ...ackup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,24 @@ private void updateFileLists(List<String> activeFiles, List<String> archiveFiles
}
}

if (newlyArchived.size() > 0) {
if (!newlyArchived.isEmpty()) {
String rootDir = CommonFSUtils.getRootDir(conf).toString();

activeFiles.removeAll(newlyArchived);
archiveFiles.addAll(newlyArchived);
for (String file : newlyArchived) {
String archivedFile = file.substring(rootDir.length() + 1);
Path archivedFilePath = new Path(HFileArchiveUtil.getArchivePath(conf), archivedFile);
archivedFile = archivedFilePath.toString();

if (!fs.exists(archivedFilePath)) {
throw new IOException(
String.format("File %s not longer exists, and no archived file %s exists for it", file,
archivedFile));
}

LOG.debug("Archived file {} has been updated", archivedFile);
archiveFiles.add(archivedFile);
}
}

LOG.debug(newlyArchived.size() + " files have been archived.");
Expand Down
1 change: 1 addition & 0 deletions hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.apache.hadoop.hbase.regionserver.HStoreFile.BULKLOAD_TIME_KEY;
import static org.apache.hadoop.hbase.regionserver.HStoreFile.EXCLUDE_FROM_MINOR_COMPACTION_KEY;
import static org.apache.hadoop.hbase.regionserver.HStoreFile.MAJOR_COMPACTION_KEY;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
Expand Down
1 change: 0 additions & 1 deletion hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableSet;

import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableSet;

Expand Down
1 change: 1 addition & 0 deletions hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
Expand Down