From 29ed65ff9b8a2b20c8bd18e5e65f29d64ad61aca Mon Sep 17 00:00:00 2001
From: Andrew Wang <wang@apache.org>
Date: Sun, 15 May 2016 22:15:05 -0700
Subject: [PATCH] HDFS-10333. Intermittent
 org.apache.hadoop.hdfs.TestFileAppend failure in trunk. Contributed by Yiqun
 Lin.

(cherry picked from commit 45788204ae2ac82ccb3b4fe2fd22aead1dd79f0d)
(cherry picked from commit 413f3dabbd398b7d837893963556d9e6dd9e10e2)
---
 .../src/test/java/org/apache/hadoop/hdfs/TestFileAppend.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend.java
index 40589f5e9ba..ada4224b7f3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.HardLink;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
+import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
 import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
 import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
@@ -371,6 +372,9 @@ public class TestFileAppend{
     final Configuration conf = new HdfsConfiguration();
     conf.setInt(
         DFSConfigKeys.DFS_NAMENODE_FILE_CLOSE_NUM_COMMITTED_ALLOWED_KEY, 1);
+    conf.setBoolean(
+        HdfsClientConfigKeys.BlockWrite.ReplaceDatanodeOnFailure.ENABLE_KEY,
+        false);
 
     final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
         .numDataNodes(4).build();