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/05/18 02:29:24 UTC
[1/5] hadoop git commit: HDFS-13586. Fsync fails on directories on
Windows. Contributed by Lukas Majercack.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 a5ec44c65 -> c4d4ae62c
refs/heads/branch-2.9 905c37734 -> 8e5b5a108
refs/heads/branch-3.0 cdc16b3a2 -> 7336d0123
refs/heads/branch-3.1 079178557 -> 472495ed1
refs/heads/trunk 2f2dd22aa -> 878361369
HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/87836136
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/87836136
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/87836136
Branch: refs/heads/trunk
Commit: 8783613696674aba4ae1739c6e8f48cda0d1c386
Parents: 2f2dd22
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 19:26:44 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 19:26:44 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/io/IOUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/87836136/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index f451ff3..7288812 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -414,6 +414,13 @@ public class IOUtils {
"File/Directory " + fileToSync.getAbsolutePath() + " does not exist");
}
boolean isDir = fileToSync.isDirectory();
+
+ // HDFS-13586, FileChannel.open fails with AccessDeniedException
+ // for any directory, ignore.
+ if (isDir && Shell.WINDOWS) {
+ return;
+ }
+
// If the file is a directory we have to open read-only, for regular files
// we must open r/w for the fsync to have an effect. See
// http://blog.httrack.com/blog/2013/11/15/
---------------------------------------------------------------------
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-13586. Fsync fails on directories on
Windows. Contributed by Lukas Majercack.
Posted by in...@apache.org.
HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack.
(cherry picked from commit 8783613696674aba4ae1739c6e8f48cda0d1c386)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8e5b5a10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8e5b5a10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8e5b5a10
Branch: refs/heads/branch-2.9
Commit: 8e5b5a108b57c9c147eb93abefa7d7076bda4064
Parents: 905c377
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 19:26:44 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 19:28:44 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/io/IOUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e5b5a10/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index 03c488c..547a5b4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -398,6 +398,13 @@ public class IOUtils {
"File/Directory " + fileToSync.getAbsolutePath() + " does not exist");
}
boolean isDir = fileToSync.isDirectory();
+
+ // HDFS-13586, FileChannel.open fails with AccessDeniedException
+ // for any directory, ignore.
+ if (isDir && Shell.WINDOWS) {
+ return;
+ }
+
// If the file is a directory we have to open read-only, for regular files
// we must open r/w for the fsync to have an effect. See
// http://blog.httrack.com/blog/2013/11/15/
---------------------------------------------------------------------
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-13586. Fsync fails on directories on
Windows. Contributed by Lukas Majercack.
Posted by in...@apache.org.
HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack.
(cherry picked from commit 8783613696674aba4ae1739c6e8f48cda0d1c386)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/472495ed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/472495ed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/472495ed
Branch: refs/heads/branch-3.1
Commit: 472495ed1e053fc8bb0e519bda2e9eccacee4baf
Parents: 0791785
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 19:26:44 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 19:27:23 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/io/IOUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/472495ed/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index f451ff3..7288812 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -414,6 +414,13 @@ public class IOUtils {
"File/Directory " + fileToSync.getAbsolutePath() + " does not exist");
}
boolean isDir = fileToSync.isDirectory();
+
+ // HDFS-13586, FileChannel.open fails with AccessDeniedException
+ // for any directory, ignore.
+ if (isDir && Shell.WINDOWS) {
+ return;
+ }
+
// If the file is a directory we have to open read-only, for regular files
// we must open r/w for the fsync to have an effect. See
// http://blog.httrack.com/blog/2013/11/15/
---------------------------------------------------------------------
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-13586. Fsync fails on directories on
Windows. Contributed by Lukas Majercack.
Posted by in...@apache.org.
HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack.
(cherry picked from commit 8783613696674aba4ae1739c6e8f48cda0d1c386)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7336d012
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7336d012
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7336d012
Branch: refs/heads/branch-3.0
Commit: 7336d0123d825b6fa5943582d156559357fb201c
Parents: cdc16b3
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 19:26:44 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 19:27:51 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/io/IOUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7336d012/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index 46ea1c8..a4339e6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -400,6 +400,13 @@ public class IOUtils {
"File/Directory " + fileToSync.getAbsolutePath() + " does not exist");
}
boolean isDir = fileToSync.isDirectory();
+
+ // HDFS-13586, FileChannel.open fails with AccessDeniedException
+ // for any directory, ignore.
+ if (isDir && Shell.WINDOWS) {
+ return;
+ }
+
// If the file is a directory we have to open read-only, for regular files
// we must open r/w for the fsync to have an effect. See
// http://blog.httrack.com/blog/2013/11/15/
---------------------------------------------------------------------
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-13586. Fsync fails on directories on
Windows. Contributed by Lukas Majercack.
Posted by in...@apache.org.
HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack.
(cherry picked from commit 8783613696674aba4ae1739c6e8f48cda0d1c386)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4d4ae62
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4d4ae62
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4d4ae62
Branch: refs/heads/branch-2
Commit: c4d4ae62cb94189ad2a37a6c3c47d01abf592cbb
Parents: a5ec44c
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 19:26:44 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 19:28:28 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/io/IOUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4d4ae62/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index 03c488c..547a5b4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -398,6 +398,13 @@ public class IOUtils {
"File/Directory " + fileToSync.getAbsolutePath() + " does not exist");
}
boolean isDir = fileToSync.isDirectory();
+
+ // HDFS-13586, FileChannel.open fails with AccessDeniedException
+ // for any directory, ignore.
+ if (isDir && Shell.WINDOWS) {
+ return;
+ }
+
// If the file is a directory we have to open read-only, for regular files
// we must open r/w for the fsync to have an effect. See
// http://blog.httrack.com/blog/2013/11/15/
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org