From b82488f4647566dfb4c87d63a13c133c9234aa2b Mon Sep 17 00:00:00 2001
From: Siddharth Wagle <swagle@hortonworks.com>
Date: Thu, 18 Apr 2019 12:39:15 -0700
Subject: [PATCH] HDDS-1441. Remove usage of getRetryFailureException.
 (swagle).

---
 .../org/apache/hadoop/hdds/scm/XceiverClientRatis.java   | 9 +--------
 hadoop-hdds/pom.xml                                      | 2 +-
 .../hadoop/ozone/om/ratis/OzoneManagerRatisClient.java   | 9 +--------
 hadoop-ozone/pom.xml                                     | 2 +-
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
index 89ac9b93f5688..10512ca5c7600 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
@@ -322,14 +322,7 @@ public XceiverClientReply sendCommandAsync(
               // to SCM as in this case, it is the raft client which is not
               // able to connect to leader in the pipeline, though the
               // pipeline can still be functional.
-              IOException exception = null;
-              if (reply.getNotLeaderException() != null) {
-                exception = reply.getNotLeaderException();
-              } else if (reply.getNotReplicatedException() != null) {
-                exception = reply.getNotReplicatedException();
-              } else if (reply.getStateMachineException() != null) {
-                exception = reply.getStateMachineException();
-              }
+              IOException exception = reply.getException();
               Preconditions.checkNotNull(exception);
               throw new CompletionException(exception);
             }
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index c063cbf5db9ea..87b9db72dadbb 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -47,7 +47,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <hdds.version>0.5.0-SNAPSHOT</hdds.version>
 
     <!-- Apache Ratis version -->
-    <ratis.version>0.4.0-fe2b15d-SNAPSHOT</ratis.version>
+    <ratis.version>0.4.0-SNAPSHOT</ratis.version>
 
     <bouncycastle.version>1.60</bouncycastle.version>
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
index 79d5e56ff327c..f23c67d6b8296 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
@@ -176,14 +176,7 @@ private CompletableFuture<OMResponse> sendCommandAsync(OMRequest request) {
               try {
                 Preconditions.checkNotNull(reply);
                 if (!reply.isSuccess()) {
-                  IOException exception = null;
-                  if (reply.getNotLeaderException() != null) {
-                    exception = reply.getNotLeaderException();
-                  } else if (reply.getNotReplicatedException() != null) {
-                    exception = reply.getNotReplicatedException();
-                  } else if (reply.getStateMachineException() != null) {
-                    exception = reply.getStateMachineException();
-                  }
+                  IOException exception = reply.getException();
                   Preconditions.checkNotNull(exception);
                   throw new CompletionException(exception);
                 }
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 050d0a665adaa..affb082a00c0c 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -29,7 +29,7 @@
     <hadoop.version>3.2.0</hadoop.version>
     <hdds.version>0.5.0-SNAPSHOT</hdds.version>
     <ozone.version>0.5.0-SNAPSHOT</ozone.version>
-    <ratis.version>0.4.0-fe2b15d-SNAPSHOT</ratis.version>
+    <ratis.version>0.4.0-SNAPSHOT</ratis.version>
     <bouncycastle.version>1.60</bouncycastle.version>
     <ozone.release>Crater Lake</ozone.release>
     <declared.ozone.version>${ozone.version}</declared.ozone.version>