Repository: hbase Updated Branches: refs/heads/HBASE-7912 2ea1cc423 -> 53a2a55ae
HBASE-15734 Propagate exception in table backup procedures Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/53a2a55a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/53a2a55a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/53a2a55a Branch: refs/heads/HBASE-7912 Commit: 53a2a55aeff9422cddfc79ec39b44ab12a2703bd Parents: 2ea1cc4 Author: tedyu <[email protected]> Authored: Fri Apr 29 09:58:47 2016 -0700 Committer: tedyu <[email protected]> Committed: Fri Apr 29 09:58:47 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/backup/master/FullTableBackupProcedure.java | 2 ++ .../hbase/backup/master/IncrementalTableBackupProcedure.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/53a2a55a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java ---------------------------------------------------------------------- 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 bb0219b..1458830 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 @@ -552,6 +552,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, backupContext, backupManager, e, "Unexpected BackupException : ", BackupType.FULL, conf); @@ -594,6 +595,7 @@ public class FullTableBackupProcedure try { this.snapshotCopy(backupContext); } catch (Exception e) { + setFailure("Failure in full-backup: snapshot copy phase" + backupId, e); // fail the overall backup and return failBackup(env, backupContext, backupManager, e, "Unexpected BackupException : ", BackupType.FULL, conf); http://git-wip-us.apache.org/repos/asf/hbase/blob/53a2a55a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java ---------------------------------------------------------------------- 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 3e4cc1e..42c607d 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 @@ -166,6 +166,7 @@ public class IncrementalTableBackupProcedure newTimestamps = incrBackupManager.getIncrBackupLogFileList(backupContext); } catch (Exception 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); @@ -181,9 +182,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;
