svn commit: r1575972 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt
Author: jlowe Date: Mon Mar 10 15:29:07 2014 New Revision: 1575972 URL: http://svn.apache.org/r1575972 Log: svn merge -c 1543190 FIXES: HADOOP-10110. hadoop-auth has a build break due to missing dependency. Contributed by Chuan Liu Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml?rev=1575972&r1=1575971&r2=1575972&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml Mon Mar 10 15:29:07 2014 @@ -54,6 +54,11 @@ org.mortbay.jetty + jetty-util + test + + + org.mortbay.jetty jetty test Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1575972&r1=1575971&r2=1575972&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar 10 15:29:07 2014 @@ -24,6 +24,9 @@ Release 0.23.11 - UNRELEASED HADOOP-10112. har file listing doesn't work with wild card (Brandon Li via jlowe) +HADOOP-10110. hadoop-auth has a build break due to missing dependency. +(Chuan Liu via arp) + Release 0.23.10 - 2013-12-09 INCOMPATIBLE CHANGES
svn commit: r1576048 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Mon Mar 10 19:05:10 2014 New Revision: 1576048 URL: http://svn.apache.org/r1576048 Log: HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream. Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2/ -- Merged /hadoop/common/trunk:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml -- Merged /hadoop/common/trunk/hadoop-project/pom.xml:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1576047
svn commit: r1576048 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common
Author: wang Date: Mon Mar 10 19:05:10 2014 New Revision: 1576048 URL: http://svn.apache.org/r1576048 Log: HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream. Modified: hadoop/common/branches/branch-2/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-common-project/ -- Merged /hadoop/common/trunk/hadoop-common-project:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1576047 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1576047
svn commit: r1576051 - in /hadoop/common/branches/branch-2.4/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-comm
Author: wang Date: Mon Mar 10 19:05:44 2014 New Revision: 1576051 URL: http://svn.apache.org/r1576051 Log: HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream. Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/ -- Merged /hadoop/common/trunk/hadoop-common-project:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1576047
svn commit: r1576051 - in /hadoop/common/branches/branch-2.4: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Mon Mar 10 19:05:44 2014 New Revision: 1576051 URL: http://svn.apache.org/r1576051 Log: HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream. Modified: hadoop/common/branches/branch-2.4/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2.4/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2.4/ -- Merged /hadoop/common/trunk:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/pom.xml -- Merged /hadoop/common/trunk/hadoop-project/pom.xml:r1576047 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1576047
svn commit: r1576124 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java src/main/java/org/apache/hadoop/fs/FileContex
Author: cnauroth
Date: Mon Mar 10 23:10:41 2014
New Revision: 1576124
URL: http://svn.apache.org/r1576124
Log:
HADOOP-10399. FileContext API for ACLs. Contributed by Vinayakumar B.
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/AbstractFileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.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=1576124&r1=1576123&r2=1576124&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar
10 23:10:41 2014
@@ -448,6 +448,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10361. Correct alignment in CLI output for ACLs. (cnauroth)
+HADOOP-10399. FileContext API for ACLs. (Vinayakumar B via cnauroth)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java?rev=1576124&r1=1576123&r2=1576124&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
Mon Mar 10 23:10:41 2014
@@ -42,6 +42,8 @@ import org.apache.hadoop.fs.FileSystem.S
import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.fs.Options.CreateOpts;
import org.apache.hadoop.fs.Options.Rename;
+import org.apache.hadoop.fs.permission.AclEntry;
+import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.InvalidPathException;
import org.apache.hadoop.security.AccessControlException;
@@ -955,7 +957,89 @@ public abstract class AbstractFileSystem
public List> getDelegationTokens(String renewer) throws IOException
{
return new ArrayList>(0);
}
-
+
+ /**
+ * Modifies ACL entries of files and directories. This method can add new
ACL
+ * entries or modify the permissions on existing ACL entries. All existing
+ * ACL entries that are not specified in this call are retained without
+ * changes. (Modifications are merged into the current ACL.)
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing modifications
+ * @throws IOException if an ACL could not be modified
+ */
+ public void modifyAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support modifyAclEntries");
+ }
+
+ /**
+ * Removes ACL entries from files and directories. Other ACL entries are
+ * retained.
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing entries to remove
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAclEntries");
+ }
+
+ /**
+ * Removes all default ACL entries from files and directories.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeDefaultAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeDefaultAcl");
+ }
+
+ /**
+ * Removes all but the base ACL entries of files and directories. The
entries
+ * for user, group, and others are retained for compatibility with permission
+ * bits.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be removed
+ */
+ public void removeAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAcl");
+ }
+
+ /**
+ * Fully replaces ACL of files and directories, discarding all existing
+ * entries.
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing modifications, must include
entries
+ * for user, group, and others for compatibility with permission bits.
+ * @throws IOException if an ACL could not
svn commit: r1576126 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/
Author: cnauroth
Date: Mon Mar 10 23:15:51 2014
New Revision: 1576126
URL: http://svn.apache.org/r1576126
Log:
HADOOP-10399. Merging change r1576124 from trunk to branch-2.
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/AbstractFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.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=1576126&r1=1576125&r2=1576126&view=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
Mon Mar 10 23:15:51 2014
@@ -145,6 +145,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10361. Correct alignment in CLI output for ACLs. (cnauroth)
+HADOOP-10399. FileContext API for ACLs. (Vinayakumar B via cnauroth)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java?rev=1576126&r1=1576125&r2=1576126&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
Mon Mar 10 23:15:51 2014
@@ -42,6 +42,8 @@ import org.apache.hadoop.fs.FileSystem.S
import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.fs.Options.CreateOpts;
import org.apache.hadoop.fs.Options.Rename;
+import org.apache.hadoop.fs.permission.AclEntry;
+import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.InvalidPathException;
import org.apache.hadoop.security.AccessControlException;
@@ -955,7 +957,89 @@ public abstract class AbstractFileSystem
public List> getDelegationTokens(String renewer) throws IOException
{
return new ArrayList>(0);
}
-
+
+ /**
+ * Modifies ACL entries of files and directories. This method can add new
ACL
+ * entries or modify the permissions on existing ACL entries. All existing
+ * ACL entries that are not specified in this call are retained without
+ * changes. (Modifications are merged into the current ACL.)
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing modifications
+ * @throws IOException if an ACL could not be modified
+ */
+ public void modifyAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support modifyAclEntries");
+ }
+
+ /**
+ * Removes ACL entries from files and directories. Other ACL entries are
+ * retained.
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing entries to remove
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAclEntries");
+ }
+
+ /**
+ * Removes all default ACL entries from files and directories.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeDefaultAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeDefaultAcl");
+ }
+
+ /**
+ * Removes all but the base ACL entries of files and directories. The
entries
+ * for user, group, and others are retained for compatibility with permission
+ * bits.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be removed
+ */
+ public void removeAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAcl");
+ }
+
+ /**
+ * Fully replaces ACL of files and directories, discarding all existing
+ * entries.
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing modifications, mus
svn commit: r1576128 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml
Author: szetszwo Date: Mon Mar 10 23:37:46 2014 New Revision: 1576128 URL: http://svn.apache.org/r1576128 Log: svn merge -c 1574259 from trunk for HDFS-5535. Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Propchange: hadoop/common/branches/branch-2/ -- Merged /hadoop/common/branches/HDFS-5535:r1550130-1574256 Merged /hadoop/common/trunk:r1574259 Propchange: hadoop/common/branches/branch-2/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1574259 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1574259 Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1576128&r1=1576127&r2=1576128&view=diff == --- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original) +++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Mon Mar 10 23:37:46 2014 @@ -83,6 +83,7 @@ href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/> +
svn commit: r1576128 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-common/ hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common/src/main/java/ hadoop-common/src/main/
Author: szetszwo
Date: Mon Mar 10 23:37:46 2014
New Revision: 1576128
URL: http://svn.apache.org/r1576128
Log:
svn merge -c 1574259 from trunk for HDFS-5535.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
--
Merged /hadoop/common/trunk/hadoop-common-project:r1574259
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
--
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1574259
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt:r1550130-1574256
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1574259
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
--
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1574259
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1574259
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/docs:r1550130-1574256
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1574259
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java:r1550130-1574256
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java?rev=1576128&r1=1576127&r2=1576128&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
Mon Mar 10 23:37:46 2014
@@ -244,13 +244,14 @@ public class LightWeightGSet {
+ public class SetIterator implements Iterator {
/** The starting modification for fail-fast. */
private int iterModification = modification;
/** The current index of the entry array. */
private int index = -1;
private LinkedElement cur = null;
private LinkedElement next = nextNonemptyEntry();
+private boolean trackModification = true;
/** Find the next nonempty entry starting at (index + 1). */
private LinkedElement nextNonemptyEntry() {
@@ -259,7 +260,7 @@ public class LightWeightGSet
svn commit: r1576129 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/
Author: cnauroth
Date: Mon Mar 10 23:38:50 2014
New Revision: 1576129
URL: http://svn.apache.org/r1576129
Log:
HADOOP-10399. Merging change r1576126 from branch-2 to branch-2.4
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1576129&r1=1576128&r2=1576129&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Mar 10 23:38:50 2014
@@ -127,6 +127,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10361. Correct alignment in CLI output for ACLs. (cnauroth)
+HADOOP-10399. FileContext API for ACLs. (Vinayakumar B via cnauroth)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java?rev=1576129&r1=1576128&r2=1576129&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
Mon Mar 10 23:38:50 2014
@@ -42,6 +42,8 @@ import org.apache.hadoop.fs.FileSystem.S
import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.fs.Options.CreateOpts;
import org.apache.hadoop.fs.Options.Rename;
+import org.apache.hadoop.fs.permission.AclEntry;
+import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.InvalidPathException;
import org.apache.hadoop.security.AccessControlException;
@@ -955,7 +957,89 @@ public abstract class AbstractFileSystem
public List> getDelegationTokens(String renewer) throws IOException
{
return new ArrayList>(0);
}
-
+
+ /**
+ * Modifies ACL entries of files and directories. This method can add new
ACL
+ * entries or modify the permissions on existing ACL entries. All existing
+ * ACL entries that are not specified in this call are retained without
+ * changes. (Modifications are merged into the current ACL.)
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing modifications
+ * @throws IOException if an ACL could not be modified
+ */
+ public void modifyAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support modifyAclEntries");
+ }
+
+ /**
+ * Removes ACL entries from files and directories. Other ACL entries are
+ * retained.
+ *
+ * @param path Path to modify
+ * @param aclSpec List describing entries to remove
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeAclEntries(Path path, List aclSpec)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAclEntries");
+ }
+
+ /**
+ * Removes all default ACL entries from files and directories.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be modified
+ */
+ public void removeDefaultAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeDefaultAcl");
+ }
+
+ /**
+ * Removes all but the base ACL entries of files and directories. The
entries
+ * for user, group, and others are retained for compatibility with permission
+ * bits.
+ *
+ * @param path Path to modify
+ * @throws IOException if an ACL could not be removed
+ */
+ public void removeAcl(Path path)
+ throws IOException {
+throw new UnsupportedOperationException(getClass().getSimpleName()
++ " doesn't support removeAcl");
+ }
+
+ /**
+ * Fully replaces ACL of files and directories, discarding all existing
+ * entries.
+ *
+ * @param path Path to modify
+ * @param aclSpec List d
svn commit: r1576130 - in /hadoop/common/branches/branch-2.4: ./ hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml
Author: szetszwo Date: Mon Mar 10 23:40:21 2014 New Revision: 1576130 URL: http://svn.apache.org/r1576130 Log: svn merge -c 1576128 from branch-2 for HDFS-5535. Modified: hadoop/common/branches/branch-2.4/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/src/site/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml Propchange: hadoop/common/branches/branch-2.4/ -- Merged /hadoop/common/branches/branch-2:r1576128 Merged /hadoop/common/branches/HDFS-5535:r1550130-1574256 Merged /hadoop/common/trunk:r1574259 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1574259 Merged /hadoop/common/branches/branch-2/hadoop-project:r1576128 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1574259 Merged /hadoop/common/branches/branch-2/hadoop-project/src/site:r1576128 Modified: hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml?rev=1576130&r1=1576129&r2=1576130&view=diff == --- hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml (original) +++ hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml Mon Mar 10 23:40:21 2014 @@ -83,6 +83,7 @@ href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/> +
svn commit: r1576130 - in /hadoop/common/branches/branch-2.4/hadoop-common-project: ./ hadoop-common/ hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common/src/main/java/ hadoop-common/src/mai
Author: szetszwo
Date: Mon Mar 10 23:40:21 2014
New Revision: 1576130
URL: http://svn.apache.org/r1576130
Log:
svn merge -c 1576128 from branch-2 for HDFS-5535.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/
--
Merged /hadoop/common/trunk/hadoop-common-project:r1574259
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1576128
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/
--
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1574259
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1576128
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1576128
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt:r1550130-1574256
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1574259
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/
--
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:r1576128
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1574259
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1574259
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1576128
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/docs:r1550130-1574256
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1574259
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1576128
Merged
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java:r1550130-1574256
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java?rev=1576130&r1=1576129&r2=1576130&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
Mon Mar 10 23:40:21 2014
@@ -244,13 +244,14 @@ public class LightWeightGSet {
+ public class SetIterator implements Iterator {
/** The starting modification for fail-fast. */
private int iterModification = modification;
/** The current index of the entry array. */
private int index = -1;
private LinkedElement cur = null;
private LinkedElement next = nextNonemptyEntry();
+private boolean trackModification = true;
/** Find the next nonempty entry starting at (index + 1). */
private LinkedElement nextNonemptyEntry() {
@@ -259,7 +260,7 @@ public class LightWeightGSet
svn commit: r1576141 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Author: arp
Date: Mon Mar 10 23:56:24 2014
New Revision: 1576141
URL: http://svn.apache.org/r1576141
Log:
HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.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=1576141&r1=1576140&r2=1576141&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar
10 23:56:24 2014
@@ -413,6 +413,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo)
+HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
+
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java?rev=1576141&r1=1576140&r2=1576141&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Mon Mar 10 23:56:24 2014
@@ -190,8 +190,6 @@ public class TestCallQueueManager {
Thread.sleep(10);
-assertTrue(manager.size() > 0);
-
for (int i=0; i < 5; i++) {
manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
}
svn commit: r1576142 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Author: arp
Date: Mon Mar 10 23:58:05 2014
New Revision: 1576142
URL: http://svn.apache.org/r1576142
Log:
HADOOP-10395. Merging r1575562 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.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=1576142&r1=1576141&r2=1576142&view=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
Mon Mar 10 23:58:05 2014
@@ -110,6 +110,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo)
+HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
+
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java?rev=1576142&r1=1576141&r2=1576142&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Mon Mar 10 23:58:05 2014
@@ -190,8 +190,6 @@ public class TestCallQueueManager {
Thread.sleep(10);
-assertTrue(manager.size() > 0);
-
for (int i=0; i < 5; i++) {
manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
}
svn commit: r1576144 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Author: arp
Date: Tue Mar 11 00:00:22 2014
New Revision: 1576144
URL: http://svn.apache.org/r1576144
Log:
HADOOP-10395. Merging r1576142 from branch-2 to branch-2.4.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1576144&r1=1576143&r2=1576144&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Mar 11 00:00:22 2014
@@ -92,6 +92,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo)
+HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
+
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth)
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java?rev=1576144&r1=1576143&r2=1576144&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Tue Mar 11 00:00:22 2014
@@ -190,8 +190,6 @@ public class TestCallQueueManager {
Thread.sleep(10);
-assertTrue(manager.size() > 0);
-
for (int i=0; i < 5; i++) {
manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
}
svn commit: r1576145 - in /hadoop/common/trunk/hadoop-common-project: hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java hadoop-common/CHANGES.txt
Author: arp
Date: Tue Mar 11 00:02:14 2014
New Revision: 1576145
URL: http://svn.apache.org/r1576145
Log:
HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java?rev=1576145&r1=1576144&r2=1576145&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
Tue Mar 11 00:02:14 2014
@@ -37,8 +37,13 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
public class TestAuthenticationFilter {
+ private static final long TOKEN_VALIDITY_SEC = 1000;
+
@Test
public void testGetConfiguration() throws Exception {
AuthenticationFilter filter = new AuthenticationFilter();
@@ -123,7 +128,7 @@ public class TestAuthenticationFilter {
String param = request.getParameter("authenticated");
if (param != null && param.equals("true")) {
token = new AuthenticationToken("u", "p", "t");
-token.setExpires((expired) ? 0 : System.currentTimeMillis() + 1000);
+token.setExpires((expired) ? 0 : System.currentTimeMillis() +
TOKEN_VALIDITY_SEC);
} else {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
@@ -139,7 +144,8 @@ public class TestAuthenticationFilter {
try {
FilterConfig config = Mockito.mock(FilterConfig.class);
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE)).thenReturn("simple");
-
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn(
+ (new Long(TOKEN_VALIDITY_SEC)).toString());
Mockito.when(config.getInitParameterNames()).thenReturn(
new Vector(Arrays.asList(AuthenticationFilter.AUTH_TYPE,
AuthenticationFilter.AUTH_TOKEN_VALIDITY)).elements());
@@ -148,7 +154,7 @@ public class TestAuthenticationFilter {
Assert.assertTrue(filter.isRandomSecret());
Assert.assertNull(filter.getCookieDomain());
Assert.assertNull(filter.getCookiePath());
- Assert.assertEquals(1000, filter.getValidity());
+ Assert.assertEquals(TOKEN_VALIDITY_SEC, filter.getValidity());
} finally {
filter.destroy();
}
@@ -265,7 +271,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
DummyAuthenticationHandler.TYPE);
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -298,7 +304,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() - 1000);
+ token.setExpires(System.currentTimeMillis() - TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -337,7 +343,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -410,7 +416,7 @@ public class TestAuthenticationFilter {
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE))
.thenReturn(DummyAuthenticationHandler.class.getName());
Mockito.when(config.getInitParameter(AuthenticationFilter
-.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+.AUTH_TOKEN_VALIDITY)).thenReturn(new
Long(TOKEN_VALIDITY_SEC).toString());
Mockito.when(
svn commit: r1576146 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java hadoop-common
Author: arp
Date: Tue Mar 11 00:03:11 2014
New Revision: 1576146
URL: http://svn.apache.org/r1576146
Log:
HADOOP-10394. Merging r1576145 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java?rev=1576146&r1=1576145&r2=1576146&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
Tue Mar 11 00:03:11 2014
@@ -37,8 +37,13 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
public class TestAuthenticationFilter {
+ private static final long TOKEN_VALIDITY_SEC = 1000;
+
@Test
public void testGetConfiguration() throws Exception {
AuthenticationFilter filter = new AuthenticationFilter();
@@ -123,7 +128,7 @@ public class TestAuthenticationFilter {
String param = request.getParameter("authenticated");
if (param != null && param.equals("true")) {
token = new AuthenticationToken("u", "p", "t");
-token.setExpires((expired) ? 0 : System.currentTimeMillis() + 1000);
+token.setExpires((expired) ? 0 : System.currentTimeMillis() +
TOKEN_VALIDITY_SEC);
} else {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
@@ -139,7 +144,8 @@ public class TestAuthenticationFilter {
try {
FilterConfig config = Mockito.mock(FilterConfig.class);
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE)).thenReturn("simple");
-
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn(
+ (new Long(TOKEN_VALIDITY_SEC)).toString());
Mockito.when(config.getInitParameterNames()).thenReturn(
new Vector(Arrays.asList(AuthenticationFilter.AUTH_TYPE,
AuthenticationFilter.AUTH_TOKEN_VALIDITY)).elements());
@@ -148,7 +154,7 @@ public class TestAuthenticationFilter {
Assert.assertTrue(filter.isRandomSecret());
Assert.assertNull(filter.getCookieDomain());
Assert.assertNull(filter.getCookiePath());
- Assert.assertEquals(1000, filter.getValidity());
+ Assert.assertEquals(TOKEN_VALIDITY_SEC, filter.getValidity());
} finally {
filter.destroy();
}
@@ -265,7 +271,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
DummyAuthenticationHandler.TYPE);
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -298,7 +304,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() - 1000);
+ token.setExpires(System.currentTimeMillis() - TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -337,7 +343,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -410,7 +416,7 @@ public class TestAuthenticationFilter {
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE))
.thenReturn(DummyAuthenticationHandler.class.getName());
Mockito.when(config.getInitParameter(AuthenticationFilter
-.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+.AUTH_TOKEN_VALIDITY)).thenRetur
svn commit: r1576147 - in /hadoop/common/branches/branch-2.4/hadoop-common-project: hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java hadoop-comm
Author: arp
Date: Tue Mar 11 00:04:09 2014
New Revision: 1576147
URL: http://svn.apache.org/r1576147
Log:
HADOOP-10394. Merging r1576146 from branch-2 to branch-2.4.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java?rev=1576147&r1=1576146&r2=1576147&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
Tue Mar 11 00:04:09 2014
@@ -37,8 +37,13 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
public class TestAuthenticationFilter {
+ private static final long TOKEN_VALIDITY_SEC = 1000;
+
@Test
public void testGetConfiguration() throws Exception {
AuthenticationFilter filter = new AuthenticationFilter();
@@ -123,7 +128,7 @@ public class TestAuthenticationFilter {
String param = request.getParameter("authenticated");
if (param != null && param.equals("true")) {
token = new AuthenticationToken("u", "p", "t");
-token.setExpires((expired) ? 0 : System.currentTimeMillis() + 1000);
+token.setExpires((expired) ? 0 : System.currentTimeMillis() +
TOKEN_VALIDITY_SEC);
} else {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
@@ -139,7 +144,8 @@ public class TestAuthenticationFilter {
try {
FilterConfig config = Mockito.mock(FilterConfig.class);
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE)).thenReturn("simple");
-
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TOKEN_VALIDITY)).thenReturn(
+ (new Long(TOKEN_VALIDITY_SEC)).toString());
Mockito.when(config.getInitParameterNames()).thenReturn(
new Vector(Arrays.asList(AuthenticationFilter.AUTH_TYPE,
AuthenticationFilter.AUTH_TOKEN_VALIDITY)).elements());
@@ -148,7 +154,7 @@ public class TestAuthenticationFilter {
Assert.assertTrue(filter.isRandomSecret());
Assert.assertNull(filter.getCookieDomain());
Assert.assertNull(filter.getCookiePath());
- Assert.assertEquals(1000, filter.getValidity());
+ Assert.assertEquals(TOKEN_VALIDITY_SEC, filter.getValidity());
} finally {
filter.destroy();
}
@@ -265,7 +271,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
DummyAuthenticationHandler.TYPE);
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -298,7 +304,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() - 1000);
+ token.setExpires(System.currentTimeMillis() - TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -337,7 +343,7 @@ public class TestAuthenticationFilter {
filter.init(config);
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
- token.setExpires(System.currentTimeMillis() + 1000);
+ token.setExpires(System.currentTimeMillis() + TOKEN_VALIDITY_SEC);
Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
@@ -410,7 +416,7 @@ public class TestAuthenticationFilter {
Mockito.when(config.getInitParameter(AuthenticationFilter.AUTH_TYPE))
.thenReturn(DummyAuthenticationHandler.class.getName());
Mockito.when(config.getInitParameter(AuthenticationFilter
-.AUTH_TOKEN_VALIDITY)).thenReturn("1000");
+.AUTH_TOKEN_VAL
svn commit: r1576154 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common
Author: wang Date: Tue Mar 11 00:34:16 2014 New Revision: 1576154 URL: http://svn.apache.org/r1576154 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-common-project/ -- Merged /hadoop/common/trunk/hadoop-common-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1575611
svn commit: r1576154 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Tue Mar 11 00:34:16 2014 New Revision: 1576154 URL: http://svn.apache.org/r1576154 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2/ -- Merged /hadoop/common/trunk:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml -- Merged /hadoop/common/trunk/hadoop-project/pom.xml:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1575611
svn commit: r1576155 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common
Author: wang Date: Tue Mar 11 00:40:46 2014 New Revision: 1576155 URL: http://svn.apache.org/r1576155 Log: Revert bad HDFS-3405 merge from trunk to retry Modified: hadoop/common/branches/branch-2/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-common-project/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ -- Reverse-merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1575611
svn commit: r1576155 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Tue Mar 11 00:40:46 2014 New Revision: 1576155 URL: http://svn.apache.org/r1576155 Log: Revert bad HDFS-3405 merge from trunk to retry Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2/ -- Reverse-merged /hadoop/common/trunk:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/ -- Reverse-merged /hadoop/common/trunk/hadoop-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml -- Reverse-merged /hadoop/common/trunk/hadoop-project/pom.xml:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ -- Reverse-merged /hadoop/common/trunk/hadoop-project/src/site:r1575611
svn commit: r1576157 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Tue Mar 11 00:44:56 2014 New Revision: 1576157 URL: http://svn.apache.org/r1576157 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2/ -- Merged /hadoop/common/trunk:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml -- Merged /hadoop/common/trunk/hadoop-project/pom.xml:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1575611
svn commit: r1576157 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-common
Author: wang Date: Tue Mar 11 00:44:56 2014 New Revision: 1576157 URL: http://svn.apache.org/r1576157 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-common-project/ -- Merged /hadoop/common/trunk/hadoop-common-project:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1575611 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1575611
svn commit: r1576159 - in /hadoop/common/branches/branch-2.4: ./ hadoop-project/ hadoop-project/pom.xml hadoop-project/src/site/
Author: wang Date: Tue Mar 11 00:47:55 2014 New Revision: 1576159 URL: http://svn.apache.org/r1576159 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2.4/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/ (props changed) hadoop/common/branches/branch-2.4/hadoop-project/pom.xml (props changed) hadoop/common/branches/branch-2.4/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2.4/ -- Merged /hadoop/common/branches/branch-2:r1576157 Merged /hadoop/common/trunk:r1575611 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/ -- Merged /hadoop/common/trunk/hadoop-project:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-project:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/pom.xml -- Merged /hadoop/common/trunk/hadoop-project/pom.xml:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-project/pom.xml:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-project/src/site/ -- Merged /hadoop/common/trunk/hadoop-project/src/site:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-project/src/site:r1576157
svn commit: r1576159 - in /hadoop/common/branches/branch-2.4/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/ hadoop-common/src/main/docs/ hadoop-comm
Author: wang Date: Tue Mar 11 00:47:55 2014 New Revision: 1576159 URL: http://svn.apache.org/r1576159 Log: HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B. Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/ -- Merged /hadoop/common/trunk/hadoop-common-project:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-auth/ -- Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1576157 Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1575611 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1576157 Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1575611 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ -- Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:r1576157 Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1575611 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1575611 Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1576157 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core:r1576157 Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1575611
svn commit: r1576171 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Author: vinodkv
Date: Tue Mar 11 01:30:20 2014
New Revision: 1576171
URL: http://svn.apache.org/r1576171
Log:
MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a
large value of io.sort.mb is set. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1576170 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java?rev=1576171&r1=1576170&r2=1576171&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Tue Mar 11 01:30:20 2014
@@ -90,7 +90,10 @@ public class DataInputBuffer extends Dat
/** Returns the current position in the input. */
public int getPosition() { return buffer.getPosition(); }
- /** Returns the length of the input. */
+ /**
+ * Returns the index one greater than the last valid character in the input
+ * stream buffer.
+ */
public int getLength() { return buffer.getLength(); }
}
svn commit: r1576170 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Author: vinodkv
Date: Tue Mar 11 01:29:56 2014
New Revision: 1576170
URL: http://svn.apache.org/r1576170
Log:
MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a
large value of io.sort.mb is set. Contributed by Karthik Kambatla.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java?rev=1576170&r1=1576169&r2=1576170&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Tue Mar 11 01:29:56 2014
@@ -90,7 +90,10 @@ public class DataInputBuffer extends Dat
/** Returns the current position in the input. */
public int getPosition() { return buffer.getPosition(); }
- /** Returns the length of the input. */
+ /**
+ * Returns the index one greater than the last valid character in the input
+ * stream buffer.
+ */
public int getLength() { return buffer.getLength(); }
}
svn commit: r1576172 - /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Author: vinodkv
Date: Tue Mar 11 01:30:32 2014
New Revision: 1576172
URL: http://svn.apache.org/r1576172
Log:
MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a
large value of io.sort.mb is set. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1576170 ../../trunk/
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java?rev=1576172&r1=1576171&r2=1576172&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
Tue Mar 11 01:30:32 2014
@@ -90,7 +90,10 @@ public class DataInputBuffer extends Dat
/** Returns the current position in the input. */
public int getPosition() { return buffer.getPosition(); }
- /** Returns the length of the input. */
+ /**
+ * Returns the index one greater than the last valid character in the input
+ * stream buffer.
+ */
public int getLength() { return buffer.getLength(); }
}
svn commit: r1576187 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Author: stack
Date: Tue Mar 11 04:34:13 2014
New Revision: 1576187
URL: http://svn.apache.org/r1576187
Log:
HADOOP-10337 ConcurrentModificationException from
MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
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/metrics/util/MetricsRegistry.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=1576187&r1=1576186&r2=1576187&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Mar
11 04:34:13 2014
@@ -416,6 +416,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal)
+
+HADOOP-10337 ConcurrentModificationException from
+MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java?rev=1576187&r1=1576186&r2=1576187&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Tue Mar 11 04:34:13 2014
@@ -18,8 +18,7 @@
package org.apache.hadoop.metrics.util;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -32,7 +31,8 @@ import org.apache.hadoop.classification.
*/
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsRegistry {
- private Map metricsList = new HashMap();
+ private ConcurrentHashMap metricsList =
+ new ConcurrentHashMap();
public MetricsRegistry() {
}
@@ -51,11 +51,11 @@ public class MetricsRegistry {
* @param theMetricsObj - the metrics
* @throws IllegalArgumentException if a name is already registered
*/
- public synchronized void add(final String metricsName, final MetricsBase
theMetricsObj) {
-if (metricsList.containsKey(metricsName)) {
- throw new IllegalArgumentException("Duplicate metricsName:" +
metricsName);
+ public void add(final String metricsName, final MetricsBase theMetricsObj) {
+if (metricsList.putIfAbsent(metricsName, theMetricsObj) != null) {
+ throw new IllegalArgumentException("Duplicate metricsName:" +
+ metricsName);
}
-metricsList.put(metricsName, theMetricsObj);
}
@@ -65,7 +65,7 @@ public class MetricsRegistry {
* @return the metrics if there is one registered by the supplied name.
* Returns null if none is registered
*/
- public synchronized MetricsBase get(final String metricsName) {
+ public MetricsBase get(final String metricsName) {
return metricsList.get(metricsName);
}
@@ -74,7 +74,7 @@ public class MetricsRegistry {
*
* @return the list of metrics names
*/
- public synchronized Collection getKeyList() {
+ public Collection getKeyList() {
return metricsList.keySet();
}
@@ -82,7 +82,7 @@ public class MetricsRegistry {
*
* @return the list of metrics
*/
- public synchronized Collection getMetricsList() {
+ public Collection getMetricsList() {
return metricsList.values();
}
}
svn commit: r1576189 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Author: stack
Date: Tue Mar 11 04:38:06 2014
New Revision: 1576189
URL: http://svn.apache.org/r1576189
Log:
HADOOP-10337 ConcurrentModificationException from
MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
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/metrics/util/MetricsRegistry.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=1576189&r1=1576188&r2=1576189&view=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
Tue Mar 11 04:38:06 2014
@@ -113,6 +113,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal)
+
+HADOOP-10337 ConcurrentModificationException from
+MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java?rev=1576189&r1=1576188&r2=1576189&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Tue Mar 11 04:38:06 2014
@@ -18,8 +18,7 @@
package org.apache.hadoop.metrics.util;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -32,7 +31,8 @@ import org.apache.hadoop.classification.
*/
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsRegistry {
- private Map metricsList = new HashMap();
+ private ConcurrentHashMap metricsList =
+ new ConcurrentHashMap();
public MetricsRegistry() {
}
@@ -51,11 +51,11 @@ public class MetricsRegistry {
* @param theMetricsObj - the metrics
* @throws IllegalArgumentException if a name is already registered
*/
- public synchronized void add(final String metricsName, final MetricsBase
theMetricsObj) {
-if (metricsList.containsKey(metricsName)) {
- throw new IllegalArgumentException("Duplicate metricsName:" +
metricsName);
+ public void add(final String metricsName, final MetricsBase theMetricsObj) {
+if (metricsList.putIfAbsent(metricsName, theMetricsObj) != null) {
+ throw new IllegalArgumentException("Duplicate metricsName:" +
+ metricsName);
}
-metricsList.put(metricsName, theMetricsObj);
}
@@ -65,7 +65,7 @@ public class MetricsRegistry {
* @return the metrics if there is one registered by the supplied name.
* Returns null if none is registered
*/
- public synchronized MetricsBase get(final String metricsName) {
+ public MetricsBase get(final String metricsName) {
return metricsList.get(metricsName);
}
@@ -74,7 +74,7 @@ public class MetricsRegistry {
*
* @return the list of metrics names
*/
- public synchronized Collection getKeyList() {
+ public Collection getKeyList() {
return metricsList.keySet();
}
@@ -82,7 +82,7 @@ public class MetricsRegistry {
*
* @return the list of metrics
*/
- public synchronized Collection getMetricsList() {
+ public Collection getMetricsList() {
return metricsList.values();
}
}
svn commit: r1576190 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Author: stack
Date: Tue Mar 11 04:43:22 2014
New Revision: 1576190
URL: http://svn.apache.org/r1576190
Log:
HADOOP-10337 ConcurrentModificationException from
MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1576190&r1=1576189&r2=1576190&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Mar 11 04:43:22 2014
@@ -95,6 +95,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal)
+
+HADOOP-10337 ConcurrentModificationException from
+MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java?rev=1576190&r1=1576189&r2=1576190&view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
Tue Mar 11 04:43:22 2014
@@ -18,8 +18,7 @@
package org.apache.hadoop.metrics.util;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -32,7 +31,8 @@ import org.apache.hadoop.classification.
*/
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsRegistry {
- private Map metricsList = new HashMap();
+ private ConcurrentHashMap metricsList =
+ new ConcurrentHashMap();
public MetricsRegistry() {
}
@@ -51,11 +51,11 @@ public class MetricsRegistry {
* @param theMetricsObj - the metrics
* @throws IllegalArgumentException if a name is already registered
*/
- public synchronized void add(final String metricsName, final MetricsBase
theMetricsObj) {
-if (metricsList.containsKey(metricsName)) {
- throw new IllegalArgumentException("Duplicate metricsName:" +
metricsName);
+ public void add(final String metricsName, final MetricsBase theMetricsObj) {
+if (metricsList.putIfAbsent(metricsName, theMetricsObj) != null) {
+ throw new IllegalArgumentException("Duplicate metricsName:" +
+ metricsName);
}
-metricsList.put(metricsName, theMetricsObj);
}
@@ -65,7 +65,7 @@ public class MetricsRegistry {
* @return the metrics if there is one registered by the supplied name.
* Returns null if none is registered
*/
- public synchronized MetricsBase get(final String metricsName) {
+ public MetricsBase get(final String metricsName) {
return metricsList.get(metricsName);
}
@@ -74,7 +74,7 @@ public class MetricsRegistry {
*
* @return the list of metrics names
*/
- public synchronized Collection getKeyList() {
+ public Collection getKeyList() {
return metricsList.keySet();
}
@@ -82,7 +82,7 @@ public class MetricsRegistry {
*
* @return the list of metrics
*/
- public synchronized Collection getMetricsList() {
+ public Collection getMetricsList() {
return metricsList.values();
}
}
svn commit: r1576196 - /hadoop/common/branches/branch-2.4/
Author: cmccabe Date: Tue Mar 11 06:25:47 2014 New Revision: 1576196 URL: http://svn.apache.org/r1576196 Log: HDFS-6085. Improve CacheReplicationMonitor log messages a bit (cmccabe) Modified: hadoop/common/branches/branch-2.4/ (props changed) Propchange: hadoop/common/branches/branch-2.4/ -- Merged /hadoop/common/trunk:r1576194
svn commit: r1576195 - /hadoop/common/branches/branch-2/
Author: cmccabe Date: Tue Mar 11 06:25:27 2014 New Revision: 1576195 URL: http://svn.apache.org/r1576195 Log: HDFS-6085. Improve CacheReplicationMonitor log messages a bit (cmccabe) Modified: hadoop/common/branches/branch-2/ (props changed) Propchange: hadoop/common/branches/branch-2/ -- Merged /hadoop/common/trunk:r1576194
