HBASE-28917 ColumnFamilyMismatchException mixes IA public and private (#6369) (#6410)

Signed-off-by: Ray Mattingly <[email protected]>
Co-authored-by: Hernan Romer <[email protected]>
Co-authored-by: Hernan Gelaf-Romer <[email protected]>

Author: 3 people

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java

@@ -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) {

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java

@@ -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 {
@@ -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);
         }
 
         SnapshotProtos.SnapshotDescription snapshotDescription =