Skip to content

HBASE-28917 ColumnFamilyMismatchException mixes IA public and private #6369

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
merged 1 commit into from
Oct 28, 2024
Merged

HBASE-28917 ColumnFamilyMismatchException mixes IA public and private #6369

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
3 changes: 2 additions & 1 deletion ...ckup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hbase.HBaseIOException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.yetus.audience.InterfaceAudience;

@InterfaceAudience.Public
public final class ColumnFamilyMismatchException extends BackupException {
public final class ColumnFamilyMismatchException extends HBaseIOException {
private final List<TableName> mismatchedTables;

private ColumnFamilyMismatchException(String msg, List<TableName> mismatchedTables) {
Expand Down
8 changes: 7 additions & 1 deletion ...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 @@ -267,6 +267,12 @@ private void updateFileLists(List<String> activeFiles, List<String> archiveFiles
LOG.debug(newlyArchived.size() + " files have been archived.");
}

/**
* @throws IOException If the execution of the backup fails
* @throws ColumnFamilyMismatchException If the column families of the current table do not match
* the column families for the last full backup. In which
* case, a full backup should be taken
*/
@Override
public void execute() throws IOException, ColumnFamilyMismatchException {
try {
Expand Down Expand Up @@ -489,7 +495,7 @@ private void verifyCfCompatibility(Set<TableName> tables,
try {
fs = FileSystem.get(new URI(fullBackupInfo.getBackupRootDir()), conf);
} catch (URISyntaxException e) {
throw new IOException("Unable to get fs", e);
throw new IOException("Unable to get fs for backup " + fullBackupInfo.getBackupId(), e);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just addressing this comment, while I'm here.

}

SnapshotProtos.SnapshotDescription snapshotDescription =
Expand Down