From 90afc9ab0382d45083dca1434f02936985798e48 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Thu, 21 Mar 2019 14:24:02 -0700
Subject: [PATCH] HDDS-1320. Update ozone to latest ratis snapshot build
 (0.4.0-1fc5ace-SNAPSHOT). Contributed by Mukul Kumar Singh.

---
 .../common/transport/server/ratis/XceiverServerRatis.java | 3 ++-
 hadoop-hdds/pom.xml                                       | 2 +-
 .../ozone/om/ratis/TestOzoneManagerStateMachine.java      | 8 ++++----
 hadoop-ozone/pom.xml                                      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
index d0a56f900c3..8f09ff2527a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
@@ -495,7 +495,8 @@ public final class XceiverServerRatis extends XceiverServer {
       RaftClientRequest.Type type) {
     return new RaftClientRequest(clientId, server.getId(),
         RaftGroupId.valueOf(PipelineID.getFromProtobuf(pipelineID).getId()),
-        nextCallId(), 0, Message.valueOf(request.toByteString()), type);
+        nextCallId(), Message.valueOf(request.toByteString()), type,
+        null);
   }
 
   private void handlePipelineFailure(RaftGroupId groupId,
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 9ca65c09218..32b2c03ad9c 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -46,7 +46,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-5680cf5-SNAPSHOT</ratis.version>
+    <ratis.version>0.4.0-1fc5ace-SNAPSHOT</ratis.version>
 
     <bouncycastle.version>1.60</bouncycastle.version>
 
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
index 4c2edfe8013..4406af67220 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
@@ -134,11 +134,11 @@ public class TestOzoneManagerStateMachine {
 
     RaftClientRequest raftClientRequest =
         new RaftClientRequest(ClientId.randomId(),
-            RaftPeerId.valueOf("random"), raftGroupId, 1, 1,
+            RaftPeerId.valueOf("random"), raftGroupId, 1,
             Message.valueOf(
                 OMRatisHelper.convertRequestToByteString(omRequest)),
             RaftClientRequest.Type.valueOf(
-                RaftProtos.WriteRequestTypeProto.getDefaultInstance()));
+                RaftProtos.WriteRequestTypeProto.getDefaultInstance()), null);
 
     TransactionContext transactionContext =
         ozoneManagerStateMachine.startTransaction(raftClientRequest);
@@ -232,11 +232,11 @@ public class TestOzoneManagerStateMachine {
 
     RaftClientRequest raftClientRequest =
         new RaftClientRequest(ClientId.randomId(),
-            RaftPeerId.valueOf("random"), raftGroupId, 1, 1,
+            RaftPeerId.valueOf("random"), raftGroupId, 1,
             Message.valueOf(
                 OMRatisHelper.convertRequestToByteString(omRequest)),
             RaftClientRequest.Type.valueOf(
-                RaftProtos.WriteRequestTypeProto.getDefaultInstance()));
+                RaftProtos.WriteRequestTypeProto.getDefaultInstance()), null);
 
     TransactionContext transactionContext =
         ozoneManagerStateMachine.startTransaction(raftClientRequest);
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 4dcb80e29f9..b243ccc2057 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-5680cf5-SNAPSHOT</ratis.version>
+    <ratis.version>0.4.0-1fc5ace-SNAPSHOT</ratis.version>
     <bouncycastle.version>1.60</bouncycastle.version>
     <ozone.release>Crater Lake</ozone.release>
     <declared.ozone.version>${ozone.version}</declared.ozone.version>