HDFS-11252. TestFileTruncate#testTruncateWithDataNodesRestartImmediately can fail with BindException. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ddb8def Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ddb8def Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ddb8def Branch: refs/heads/YARN-5085 Commit: 0ddb8defad6a7fd5eb69847d1789ba51952c0cf0 Parents: 9262797 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Wed Dec 28 10:34:33 2016 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Wed Dec 28 10:34:33 2016 +0530 ---------------------------------------------------------------------- .../hdfs/server/namenode/TestFileTruncate.java | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ddb8def/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java ---------------------------------------------------------------------- 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 d203413..0ea587c 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 @@ -681,13 +681,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(); @@ -740,13 +734,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(); @@ -800,8 +788,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); @@ -1242,4 +1230,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(); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
