HDDS-1441. Remove usage of getRetryFailureException. (swagle).

apache · May 21, 2019 · b82488f · b82488f
1 parent 1b8eaee
commit b82488f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 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
@@ -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
@@ -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/...ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java b/...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
@@ -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>