From fb18cc5eaa637772d5c8479cbae1bd19aa00e7fb Mon Sep 17 00:00:00 2001
From: Tsz Wo Nicholas Sze <szetszwo@apache.org>
Date: Fri, 12 Oct 2018 10:37:37 +0800
Subject: [PATCH] HDDS-625. putKey hangs for a long time after completion,
 sometimes forever.  Contributed by Arpit Agarwal

---
 .../common/transport/server/ratis/XceiverServerRatis.java     | 4 +++-
 hadoop-project/pom.xml                                        | 2 +-
 2 files changed, 4 insertions(+), 2 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 9094217ba08..0cd407a5e78 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
@@ -70,6 +70,7 @@
 import java.net.ServerSocket;
 import java.net.SocketAddress;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -240,7 +241,8 @@ private RaftProperties newRaftProperties(Configuration conf) {
 
     // Set the ratis storage directory
     String storageDir = HddsServerUtil.getOzoneDatanodeRatisDirectory(conf);
-    RaftServerConfigKeys.setStorageDir(properties, new File(storageDir));
+    RaftServerConfigKeys.setStorageDirs(properties,
+        Collections.singletonList(new File(storageDir)));
 
     // For grpc set the maximum message size
     GrpcConfigKeys.setMessageSizeMax(properties,
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 7472a5402d2..b850c7c462f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -103,7 +103,7 @@
     <ldap-api.version>1.0.0-M33</ldap-api.version>
 
     <!-- Apache Ratis version -->
-    <ratis.version>0.3.0-9b84d79-SNAPSHOT</ratis.version>
+    <ratis.version>0.3.0-9b2d7b6-SNAPSHOT</ratis.version>
     <jcache.version>1.0-alpha-1</jcache.version>
     <ehcache.version>3.3.1</ehcache.version>
     <hikari.version>2.4.12</hikari.version>