HBASE-22157 Include the cause when constructing RestoreSnapshotExcept…

…ion in restoreSnapshot Signed-off-by: Zheng Hu <openinx@gmail.com>
apache · Apr 4, 2019 · 3e81528 · 3e81528
1 parent 129d806
commit 3e81528
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
@@ -1942,7 +1942,7 @@ private CompletableFuture<Void> restoreSnapshot(String snapshotName, TableName t
                       String msg =
                         "Restore snapshot=" + snapshotName + " failed. Rollback to snapshot=" +
                           failSafeSnapshotSnapshotName + " succeeded.";
-                      future.completeExceptionally(new RestoreSnapshotException(msg));
+                      future.completeExceptionally(new RestoreSnapshotException(msg, err2));
                     }
                   });
               } else {

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java
@@ -65,7 +65,7 @@ public HBaseSnapshotException(String msg, Throwable cause, SnapshotDescription d
    * @param message description of what caused the failure
    * @param e root cause
    */
-  public HBaseSnapshotException(String message, Exception e) {
+  public HBaseSnapshotException(String message, Throwable e) {
     super(message, e);
   }
 

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java
@@ -39,7 +39,7 @@ public RestoreSnapshotException(String msg) {
     super(msg);
   }
 
-  public RestoreSnapshotException(String message, Exception e) {
+  public RestoreSnapshotException(String message, Throwable e) {
     super(message, e);
   }
 }