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:28 UTC
[1/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f951d92d4 -> 3e177a1d6
refs/heads/branch-2.9 bdf9e29ee -> 692292e30
refs/heads/branch-3.0 563d56be6 -> 98f2444a7
refs/heads/branch-3.1 8ffc191f6 -> 177ccbc43
refs/heads/trunk fa9ef15ec -> 7296b644f
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/trunk
Commit: 7296b644f7c44400f03995668573a4cfd2ee552c
Parents: fa9ef15
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: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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
Posted by in...@apache.org.
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/692292e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/692292e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/692292e3
Branch: refs/heads/branch-2.9
Commit: 692292e303f31460fbfefb16b35a33428083f66d
Parents: bdf9e29
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:38:56 2018 -0700
----------------------------------------------------------------------
.../blockmanagement/TestNameNodePrunesMissingStorages.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/692292e3/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 68a0d6d..ababdbc 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
@@ -289,8 +289,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
[3/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
Posted by in...@apache.org.
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/98f2444a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/98f2444a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/98f2444a
Branch: refs/heads/branch-3.0
Commit: 98f2444a7d69b1a870ec95f8128c79871db95f00
Parents: 563d56b
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:36 2018 -0700
----------------------------------------------------------------------
.../blockmanagement/TestNameNodePrunesMissingStorages.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/98f2444a/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
[4/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
Posted by in...@apache.org.
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/3e177a1d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e177a1d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e177a1d
Branch: refs/heads/branch-2
Commit: 3e177a1d62a1b5832e99684f0ba6cc29e204b6b8
Parents: f951d92
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:38:13 2018 -0700
----------------------------------------------------------------------
.../blockmanagement/TestNameNodePrunesMissingStorages.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e177a1d/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 68a0d6d..ababdbc 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
@@ -289,8 +289,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
[2/5] hadoop git commit: HDFS-13714. Fix
TestNameNodePrunesMissingStorages test failures on Windows. Contributed by
Lukas Majercak.
Posted by in...@apache.org.
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