HDFS-13714. Fix TestNameNodePrunesMissingStorages test failures on Windows. Contributed by Lukas Majercak.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7296b644 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7296b644 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7296b644 Branch: refs/heads/HDFS-12090 Commit: 7296b644f7c44400f03995668573a4cfd2ee552c Parents: fa9ef15 Author: Inigo Goiri <[email protected]> Authored: Mon Jul 2 16:36:25 2018 -0700 Committer: Inigo Goiri <[email protected]> Committed: Mon Jul 2 16:36:25 2018 -0700 ---------------------------------------------------------------------- .../blockmanagement/TestNameNodePrunesMissingStorages.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7296b644/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java index 96d227d..05b6d30 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java @@ -294,8 +294,9 @@ public class TestNameNodePrunesMissingStorages { in = null; out.close(); out = null; - newVersionFile.renameTo(versionFile); - success = true; + // Delete old version file + success = versionFile.delete(); + success &= newVersionFile.renameTo(versionFile); } finally { if (in != null) { in.close(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
