hgromer commented on code in PR #6340: URL: https://github.com/apache/hbase/pull/6340#discussion_r1803569339
########## hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java: ########## @@ -434,4 +445,86 @@ protected Path getBulkOutputDir() { path = new Path(path, backupId); return path; } + + private Map<TableName, String> getFullBackupIds() throws IOException { + // Ancestors are stored from newest to oldest, so we can iterate backwards + // in order to populate our backupId map with the most recent full backup + // for a given table + List<BackupManifest.BackupImage> images = getAncestors(backupInfo); + Map<TableName, String> results = new HashMap<>(); + for (int i = images.size() - 1; i >= 0; i--) { + BackupManifest.BackupImage image = images.get(i); + if (image.getType() != BackupType.FULL) { + continue; + } + + for (TableName tn : image.getTableNames()) { + results.put(tn, image.getBackupId()); + } + } + return results; + } + + /** + * Verifies that the current table descriptor CFs matches the descriptor CFs of the last full + * backup for the tables. This ensures CF compatibility across incremental backups. If a mismatch + * is detected, a full table backup should be taken, rather than an incremental one + */ + private void verifyCfCompatibility(Set<TableName> tables, + Map<TableName, String> tablesToFullBackupId) throws IOException, ColumnFamilyMismatchException { + ColumnFamilyMismatchException.ColumnFamilyMismatchExceptionBuilder exBuilder = + ColumnFamilyMismatchException.newBuilder(); + try (Admin admin = conn.getAdmin(); BackupAdminImpl backupAdmin = new BackupAdminImpl(conn)) { + for (TableName tn : tables) { + String backupId = tablesToFullBackupId.get(tn); + BackupInfo fullBackupInfo = backupAdmin.getBackupInfo(backupId); + + ColumnFamilyDescriptor[] currentCfs = admin.getDescriptor(tn).getColumnFamilies(); + String snapshotName = fullBackupInfo.getSnapshotName(tn); + Path root = HBackupFileSystem.getTableBackupPath(tn, + new Path(fullBackupInfo.getBackupRootDir()), fullBackupInfo.getBackupId()); + Path manifestDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, root); + + FileSystem fs; + try { + fs = FileSystem.get(new URI(fullBackupInfo.getBackupRootDir()), conf); + } catch (URISyntaxException e) { + throw new IOException("Unable to get fs", e); Review Comment: Will address this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@hbase.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org