svn commit: r1561038 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java src/test/java/org/apache/hadoop/fs/TestSymlin
Author: jlowe
Date: Fri Jan 24 15:45:28 2014
New Revision: 1561038
URL: http://svn.apache.org/r1561038
Log:
Addendum patch for HADOOP-9652 to fix performance problems. Contributed by
Andrew Wang
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561038r1=1561037r2=1561038view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Jan
24 15:45:28 2014
@@ -424,6 +424,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
(Liang Xie via stack)
+HADOOP-9652. Allow RawLocalFs#getFileLinkStatus to fill in the link owner
+and mode if requested. (Andrew Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -450,9 +453,6 @@ Release 2.4.0 - UNRELEASED
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1561038r1=1561037r2=1561038view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
Fri Jan 24 15:45:28 2014
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+
package org.apache.hadoop.fs;
+import com.google.common.annotations.VisibleForTesting;
+
import java.io.BufferedOutputStream;
import java.io.DataOutput;
import java.io.File;
@@ -51,7 +54,13 @@ import org.apache.hadoop.util.StringUtil
public class RawLocalFileSystem extends FileSystem {
static final URI NAME = URI.create(file:///);
private Path workingDir;
- private static final boolean useDeprecatedFileStatus = !Stat.isAvailable();
+ // Temporary workaround for HADOOP-9652.
+ private static boolean useDeprecatedFileStatus = true;
+
+ @VisibleForTesting
+ public static void useStatIfAvailable() {
+useDeprecatedFileStatus = !Stat.isAvailable();
+ }
public RawLocalFileSystem() {
workingDir = getInitialWorkingDirectory();
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java?rev=1561038r1=1561037r2=1561038view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Fri Jan 24 15:45:28 2014
@@ -38,6 +38,11 @@ import org.junit.Test;
* Test symbolic links using LocalFs.
*/
abstract public class TestSymlinkLocalFS extends SymlinkBaseTest {
+
+ // Workaround for HADOOP-9652
+ static {
+RawLocalFileSystem.useStatIfAvailable();
+ }
@Override
protected String getScheme() {
svn commit: r1561043 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java src/test/java/org/apache/hadoop/f
Author: jlowe
Date: Fri Jan 24 15:49:14 2014
New Revision: 1561043
URL: http://svn.apache.org/r1561043
Log:
svn merge -c 1561038 FIXES: Addendum patch for HADOOP-9652 to fix performance
problems. Contributed by Andrew Wang
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jan 24 15:49:14 2014
@@ -121,6 +121,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing
time.
(Liang Xie via wang)
+HADOOP-9652. Allow RawLocalFs#getFileLinkStatus to fill in the link owner
+and mode if requested. (Andrew Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -150,9 +153,6 @@ Release 2.4.0 - UNRELEASED
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
Fri Jan 24 15:49:14 2014
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+
package org.apache.hadoop.fs;
+import com.google.common.annotations.VisibleForTesting;
+
import java.io.BufferedOutputStream;
import java.io.DataOutput;
import java.io.File;
@@ -51,7 +54,13 @@ import org.apache.hadoop.util.StringUtil
public class RawLocalFileSystem extends FileSystem {
static final URI NAME = URI.create(file:///);
private Path workingDir;
- private static final boolean useDeprecatedFileStatus = !Stat.isAvailable();
+ // Temporary workaround for HADOOP-9652.
+ private static boolean useDeprecatedFileStatus = true;
+
+ @VisibleForTesting
+ public static void useStatIfAvailable() {
+useDeprecatedFileStatus = !Stat.isAvailable();
+ }
public RawLocalFileSystem() {
workingDir = getInitialWorkingDirectory();
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Fri Jan 24 15:49:14 2014
@@ -38,6 +38,11 @@ import org.junit.Test;
* Test symbolic links using LocalFs.
*/
abstract public class TestSymlinkLocalFS extends SymlinkBaseTest {
+
+ // Workaround for HADOOP-9652
+ static {
+RawLocalFileSystem.useStatIfAvailable();
+ }
@Override
protected String getScheme() {
svn commit: r1561207 - in /hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common: ./ src/main/java/ src/main/java/org/apache/hadoop/conf/ src/main/java/org/apache/hadoop/fs/ src/test/jav
Author: vinodkv
Date: Fri Jan 24 22:02:22 2014
New Revision: 1561207
URL: http://svn.apache.org/r1561207
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561207r1=1561206r2=1561207view=diff
==
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jan 24 22:02:22 2014
@@ -424,6 +424,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
(Liang Xie via stack)
+HADOOP-9652. Allow RawLocalFs#getFileLinkStatus to fill in the link owner
+and mode if requested. (Andrew Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -450,9 +453,6 @@ Release 2.4.0 - UNRELEASED
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
@@ -556,6 +556,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10132. RPC#stopProxy() should log the class of proxy when
IllegalArgumentException
is encountered (Ted yu via umamahesh)
+HADOOP-10248. Property name should be included in the exception where
property value
+is null (Akira AJISAKA via umamahesh)
+
OPTIMIZATIONS
HADOOP-10142. Avoid groups lookup for unprivileged users such as dr.who
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1560867-1561206
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1560467-1561206
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1561207r1=1561206r2=1561207view=diff
==
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Fri Jan 24 22:02:22 2014
@@ -963,7 +963,7 @@ public class Configuration implements It
Property name must not be null);
Preconditions.checkArgument(
value != null,
-Property value must not be null);
+The value of property + name + must not be null);
DeprecationContext deprecations = deprecationContext.get();
if (deprecations.getDeprecatedKeyMap().isEmpty()) {
getProps();
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1561207r1=1561206r2=1561207view=diff
==
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
(original)
+++
svn commit: r1561207 - /hadoop/common/branches/YARN-321/
Author: vinodkv Date: Fri Jan 24 22:02:22 2014 New Revision: 1561207 URL: http://svn.apache.org/r1561207 Log: YARN-321. Forwarding YARN-321 branch to latest trunk. Modified: hadoop/common/branches/YARN-321/ (props changed) Propchange: hadoop/common/branches/YARN-321/ -- Merged /hadoop/common/trunk:r1560867-1561206
