diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java index c34b4de846d..b9601f717a2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java @@ -680,13 +680,7 @@ public class TestFileTruncate { int toTruncateLength = 1; int newLength = startingFileSize - toTruncateLength; cluster.getDataNodes().get(dn).shutdown(); - try { - boolean isReady = fs.truncate(p, newLength); - assertFalse(isReady); - } finally { - cluster.restartDataNode(dn, true, true); - cluster.waitActive(); - } + truncateAndRestartDN(p, dn, newLength); checkBlockRecovery(p); LocatedBlock newBlock = getLocatedBlocks(p).getLastLocatedBlock(); @@ -739,13 +733,7 @@ public class TestFileTruncate { int toTruncateLength = 1; int newLength = startingFileSize - toTruncateLength; cluster.getDataNodes().get(dn).shutdown(); - try { - boolean isReady = fs.truncate(p, newLength); - assertFalse(isReady); - } finally { - cluster.restartDataNode(dn, true, true); - cluster.waitActive(); - } + truncateAndRestartDN(p, dn, newLength); checkBlockRecovery(p); LocatedBlock newBlock = getLocatedBlocks(p).getLastLocatedBlock(); @@ -799,8 +787,8 @@ public class TestFileTruncate { boolean isReady = fs.truncate(p, newLength); assertFalse(isReady); - cluster.restartDataNode(dn0, true, true); - cluster.restartDataNode(dn1, true, true); + cluster.restartDataNode(dn0, false, true); + cluster.restartDataNode(dn1, false, true); cluster.waitActive(); checkBlockRecovery(p); @@ -1240,4 +1228,15 @@ public class TestFileTruncate { .build(); fs = cluster.getFileSystem(); } + + private void truncateAndRestartDN(Path p, int dn, int newLength) + throws IOException { + try { + boolean isReady = fs.truncate(p, newLength); + assertFalse(isReady); + } finally { + cluster.restartDataNode(dn, false, true); + cluster.waitActive(); + } + } }