You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/07/02 23:39:29 UTC
[2/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
HDFS-13714. Fix TestNameNodePrunesMissingStorages test failures on Windows. Contributed by Lukas Majercak.
(cherry picked from commit 7296b644f7c44400f03995668573a4cfd2ee552c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/177ccbc4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/177ccbc4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/177ccbc4
Branch: refs/heads/branch-3.1
Commit: 177ccbc43f8c5fcb2a5d90056f506253f42af320
Parents: 8ffc191
Author: Inigo Goiri <in...@apache.org>
Authored: Mon Jul 2 16:36:25 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Mon Jul 2 16:37:12 2018 -0700
----------------------------------------------------------------------
.../blockmanagement/TestNameNodePrunesMissingStorages.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/177ccbc4/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org