diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java index 213b73a..8f0fdc7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java @@ -550,6 +550,7 @@ public class FullTableBackupProcedure backupManager.recordWALFiles(logFiles); } } catch (BackupException e) { + setFailure("Failure in full-backup: pre-snapshot phase", e); // fail the overall backup and return failBackup(env, backupInfo, backupManager, e, "Unexpected BackupException : ", BackupType.FULL, conf); @@ -592,6 +593,7 @@ public class FullTableBackupProcedure try { this.snapshotCopy(backupInfo); } catch (Exception e) { + setFailure("Failure in full-backup: snapshot copy phase" + backupId, e); // fail the overall backup and return failBackup(env, backupInfo, backupManager, e, "Unexpected BackupException : ", BackupType.FULL, conf); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java index d0386bd..4dd8edc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java @@ -164,7 +164,7 @@ public class IncrementalTableBackupProcedure newTimestamps = incrBackupManager.getIncrBackupLogFileList(backupContext); } catch (Exception e) { - LOG.debug("preparing incremental " + backupContext, e); + setFailure("Failure in incremental-backup: preparation phase " + backupId, e); // fail the overall backup and return FullTableBackupProcedure.failBackup(env, backupContext, backupManager, e, "Unexpected Exception : ", BackupType.INCREMENTAL, conf); @@ -180,9 +180,11 @@ public class IncrementalTableBackupProcedure // Save list of WAL files copied backupManager.recordWALFiles(backupContext.getIncrBackupFileList()); } catch (Exception e) { + String msg = "Unexpected exception in incremental-backup: incremental copy " + backupId; + setFailure(msg, e); // fail the overall backup and return FullTableBackupProcedure.failBackup(env, backupContext, backupManager, e, - "Unexpected exception doing incremental copy : ", BackupType.INCREMENTAL, conf); + msg, BackupType.INCREMENTAL, conf); } setNextState(IncrementalTableBackupState.INCR_BACKUP_COMPLETE); break;