From 3e8152837e6803061117b42e2484202efc45ee8f Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Wed, 3 Apr 2019 18:52:58 +0800 Subject: [PATCH] HBASE-22157 Include the cause when constructing RestoreSnapshotException in restoreSnapshot Signed-off-by: Zheng Hu --- .../java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java | 2 +- .../apache/hadoop/hbase/snapshot/HBaseSnapshotException.java | 2 +- .../apache/hadoop/hbase/snapshot/RestoreSnapshotException.java | 2 +- 3 files changed, 3 insertions(+), 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 index 77e142390f8c..6c89fc88b0b1 100644 --- 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 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 index 07cf9285c36a..90a509e38f28 100644 --- 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 index a203ab798803..b2b335cb562d 100644 --- 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); } }