You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/04/04 03:05:35 UTC
[hbase] branch master updated: HBASE-22157 Include the cause when
constructing RestoreSnapshotException in restoreSnapshot
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 3e81528 HBASE-22157 Include the cause when constructing RestoreSnapshotException in restoreSnapshot
3e81528 is described below
commit 3e8152837e6803061117b42e2484202efc45ee8f
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Apr 3 18:52:58 2019 +0800
HBASE-22157 Include the cause when constructing RestoreSnapshotException in restoreSnapshot
Signed-off-by: Zheng Hu <op...@gmail.com>
---
.../main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java | 2 +-
.../java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java | 2 +-
.../java/org/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 77e1423..6c89fc8 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 @@ class RawAsyncHBaseAdmin implements AsyncAdmin {
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 07cf928..90a509e 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 class HBaseSnapshotException extends DoNotRetryIOException {
* @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 a203ab7..b2b335c 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 class RestoreSnapshotException extends HBaseSnapshotException {
super(msg);
}
- public RestoreSnapshotException(String message, Exception e) {
+ public RestoreSnapshotException(String message, Throwable e) {
super(message, e);
}
}