svn commit: r1559700 - in /hadoop/common/branches/branch-2/hadoop-tools: hadoop-openstack/ hadoop-sls/
Author: szetszwo Date: Mon Jan 20 14:07:25 2014 New Revision: 1559700 URL: http://svn.apache.org/r1559700 Log: Add .classpath, .project and .settings to svn:ignore. Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/ (props changed) hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/ -- --- svn:ignore (original) +++ svn:ignore Mon Jan 20 14:07:25 2014 @@ -1 +1,4 @@ target +.classpath +.project +.settings Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/ -- --- svn:ignore (original) +++ svn:ignore Mon Jan 20 14:07:25 2014 @@ -1 +1,4 @@ target +.classpath +.project +.settings
svn commit: r1559700 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/
Author: szetszwo Date: Mon Jan 20 14:07:25 2014 New Revision: 1559700 URL: http://svn.apache.org/r1559700 Log: Add .classpath, .project and .settings to svn:ignore. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/ -- --- svn:ignore (original) +++ svn:ignore Mon Jan 20 14:07:25 2014 @@ -1 +1,4 @@ target +.classpath +.project +.settings
[Hadoop Wiki] Update of "HCFS" by SteveWatt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HCFS" page has been changed by SteveWatt: https://wiki.apache.org/hadoop/HCFS?action=diff&rev1=18&rev2=19 * [[http://www.datastax.com/dev/blog/cassandra-file-system-design | CassandraFS]] * [[http://ceph.com/docs/next/cephfs/hadoop/ | CephFS ]] * [[http://www.cleversafe.com/news-reviews/cleversafe-press-releases/2012-press-releases/cleversafe-first-to-deliver-breakthrough-capabilities-for-combined-storage-and-massive-computation | CleverSafe Object Store ]] + & [[https://developers.google.com/hadoop/google-cloud-storage-connector | Google Cloud Storage Connector ]] * [[https://forge.gluster.org/hadoop | GlusterFS]] * [[http://www.gridgain.com/media/in-memory-hdfs-readme.pdf | GridGain ]] * [[http://newsroom.intel.com/community/intel_newsroom/blog/2013/06/12/intel-expands-software-portfolio-for-big-data-solutions | Lustre ]]
[Hadoop Wiki] Trivial Update of "HCFS" by SteveWatt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HCFS" page has been changed by SteveWatt: https://wiki.apache.org/hadoop/HCFS?action=diff&rev1=19&rev2=20 * [[http://www.datastax.com/dev/blog/cassandra-file-system-design | CassandraFS]] * [[http://ceph.com/docs/next/cephfs/hadoop/ | CephFS ]] * [[http://www.cleversafe.com/news-reviews/cleversafe-press-releases/2012-press-releases/cleversafe-first-to-deliver-breakthrough-capabilities-for-combined-storage-and-massive-computation | CleverSafe Object Store ]] - & [[https://developers.google.com/hadoop/google-cloud-storage-connector | Google Cloud Storage Connector ]] + * [[https://developers.google.com/hadoop/google-cloud-storage-connector | Google Cloud Storage Connector ]] * [[https://forge.gluster.org/hadoop | GlusterFS]] * [[http://www.gridgain.com/media/in-memory-hdfs-readme.pdf | GridGain ]] * [[http://newsroom.intel.com/community/intel_newsroom/blog/2013/06/12/intel-expands-software-portfolio-for-big-data-solutions | Lustre ]]
svn commit: r1559793 - in /hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/fs/permission/ main/java/org/apache/hadoop/fs/shell/ test/java/org/apac
Author: cnauroth
Date: Mon Jan 20 18:00:06 2014
New Revision: 1559793
URL: http://svn.apache.org/r1559793
Log:
HADOOP-10213. Fix bugs parsing ACL spec in FsShell setfacl. Contributed by
Vinay.
Modified:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
Modified:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java?rev=1559793&r1=1559792&r2=1559793&view=diff
==
---
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
(original)
+++
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
Mon Jan 20 18:00:06 2014
@@ -17,12 +17,16 @@
*/
package org.apache.hadoop.fs.permission;
-import static org.apache.hadoop.fs.permission.AclEntryScope.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
import com.google.common.base.Objects;
+import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.util.StringUtils;
/**
* Defines a single entry in an ACL. An ACL entry has a type (user, group,
@@ -193,4 +197,74 @@ public class AclEntry {
this.permission = permission;
this.scope = scope;
}
+
+ /**
+ * Parses a string representation of an ACL spec into a list of AclEntry
+ * objects. Example: "user::rwx,user:foo:rw-,group::r--,other::---"
+ *
+ * @param aclSpec
+ * String representation of an ACL spec.
+ * @param includePermission
+ * for setAcl operations this will be true. i.e. AclSpec should
+ * include permissions.
+ * But for removeAcl operation it will be false. i.e. AclSpec should
+ * not contain permissions.
+ * Example: "user:foo,group:bar"
+ * @return Returns list of AclEntries parsed
+ */
+ public static List parseAclSpec(String aclSpec,
+ boolean includePermission) {
+List aclEntries = new ArrayList();
+Collection aclStrings = StringUtils.getStringCollection(aclSpec,
+",");
+for (String aclStr : aclStrings) {
+ AclEntry.Builder builder = new AclEntry.Builder();
+ // Here "::" represent one empty string.
+ // StringUtils.getStringCollection() will ignore this.
+ String[] split = aclStr.split(":");
+ int expectedAclSpecLength = 2;
+ if (includePermission) {
+expectedAclSpecLength = 3;
+ }
+ if (split.length != expectedAclSpecLength
+ && !(split.length == expectedAclSpecLength + 1 && "default"
+ .equals(split[0]))) {
+throw new HadoopIllegalArgumentException("Invalid : "
++ aclStr);
+ }
+ int index = 0;
+ if (split.length == expectedAclSpecLength + 1) {
+assert "default".equals(split[0]);
+// default entry
+index++;
+builder.setScope(AclEntryScope.DEFAULT);
+ }
+ String type = split[index++];
+ AclEntryType aclType = null;
+ try {
+aclType = Enum.valueOf(AclEntryType.class, type.toUpperCase());
+builder.setType(aclType);
+ } catch (IllegalArgumentException iae) {
+throw new HadoopIllegalArgumentException(
+"Invalid type of acl in :" + aclStr);
+ }
+
+ String name = split[index++];
+ if (!name.isEmpty()) {
+builder.setName(name);
+ }
+
+ if (expectedAclSpecLength == 3) {
+String permission = split[index++];
+FsAction fsAction = FsAction.getFsAction(permission);
+if (null == fsAction) {
+ throw new HadoopIllegalArgumentException(
+ "Invalid permission in : " + aclStr);
+}
+builder.setPermission(fsAction);
+ }
+ aclEntries.add(builder.build());
+}
+return aclEntries;
+ }
}
Modified:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java?rev=1559793&r1=1559792&r2=1559793&view=diff
==
--
svn commit: r1559794 - /hadoop/common/branches/HDFS-4685/
Author: cnauroth Date: Mon Jan 20 18:02:27 2014 New Revision: 1559794 URL: http://svn.apache.org/r1559794 Log: Merge trunk to HDFS-4685. Modified: hadoop/common/branches/HDFS-4685/ (props changed) Propchange: hadoop/common/branches/HDFS-4685/ -- Merged /hadoop/common/trunk:r1559324-1559793
svn commit: r1559794 - in /hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common: CHANGES.txt src/main/docs/ src/main/java/ src/test/core/
Author: cnauroth Date: Mon Jan 20 18:02:27 2014 New Revision: 1559794 URL: http://svn.apache.org/r1559794 Log: Merge trunk to HDFS-4685. Modified: hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1559324-1559793 Propchange: hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1559324-1559793 Propchange: hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1559324-1559793 Propchange: hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1559324-1559793
[Hadoop Wiki] Update of "Roadmap" by AndrewWang
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "Roadmap" page has been changed by AndrewWang: https://wiki.apache.org/hadoop/Roadmap?action=diff&rev1=25&rev2=26 == Hadoop 2.x Releases == + === Planned === + + * HDFS + * HDFS Symlinks + === hadoop-2.4 === Hadoop 2.4 is a release with several substantial features, such as: * HDFS - * HDFS Symlinks * Enable support for heterogeneous storages in HDFS (phase 1) [[https://issues.apache.org/jira/browse/HDFS-2832|HDFS-2832]] + * HDFS in-memory caching [[https://issues.apache.org/jira/browse/HDFS-4949|HDFS-4949]] * YARN * Application History Server [[https://issues.apache.org/jira/browse/YARN-321|YARN-321]] * Enable external systems/frameworks to share resources with Hadoop leveraging Yarn resource scheduling (unmanged containers) [[https://issues.apache.org/jira/browse/YARN-1404|YARN-1404]]
svn commit: r1559904 - in /hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common: ./ src/main/bin/ src/main/docs/ src/main/java/ src/main/java/org/apache/hadoop/crypto/key/ src/main/jav
Author: jing9 Date: Tue Jan 21 02:08:36 2014 New Revision: 1559904 URL: http://svn.apache.org/r1559904 Log: Merging r1558604 through r1559901 from trunk. Added: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java - copied unchanged from r1559901, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java - copied unchanged from r1559901, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/bin/hadoop hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/UserProvider.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1559904&r1=1559903&r2=1559904&view=diff == --- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 21 02:08:36 2014 @@ -98,7 +98,8 @@ Trunk (Unreleased) HADOOP-8844. Add a plaintext fs -text test-case. (Akira AJISAKA via harsh) -HADOOP-9432 Add support for markdown .md files in site documentation (stevel) +HADOOP-9432 Add support for markdown .md files in site documentation +(stevel) HADOOP-9186. test-patch.sh should report build failure to JIRA. (Binglin Chang via Colin Patrick McCabe) @@ -110,6 +111,8 @@ Trunk (Unreleased) HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley) +HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -117,8 +120,8 @@ Trunk (Unreleased) HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang) -HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName. -(Devaraj K via umamahesh) +HADOOP-8177. MBeans shouldn't try to register when it fails to create +MBeanName. (Devaraj K via umamahesh) HADOOP-8018. Hudson auto test for HDFS has started throwing javadoc (Jon Eagles via bobby) @@ -287,9 +290,6 @@ Trunk (Unreleased) HADOOP-10044 Improve the javadoc of rpc code (sanjay Radia) -HADOOP-10125. no need to process RPC request if the client connection -has been dropped (Ming Ma via brandonli) - OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) @@ -523,6 +523,13 @@ Release 2.4.0 - UNRELEASED HADOOP-10236. Fix typo in o.a.h.ipc.Client#checkResponse. (Akira Ajisaka via suresh) +HADOOP-10146. Workaround JDK7 Process fd close bug (daryn) + +HADOOP-10125. no need to process RPC request if the client connection +has been dropped (Ming Ma via brandonli) + +HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) + Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -613,6 +620,11 @@ Release 2.3.0 - UNRELEASED HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. (cnauroth) +HADOOP-10240. Windows build instructions incorrectly state requirement of +protoc 2.4.1 instead of 2.5.0. (cnauroth) + +HADOOP-10112. har file listing doesn't work with wild card. (brandonli) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1558604-1559901 Modified: hadoop/common/b
svn commit: r1559904 - in /hadoop/common/branches/HDFS-5698: ./ BUILDING.txt hadoop-project/pom.xml
Author: jing9
Date: Tue Jan 21 02:08:36 2014
New Revision: 1559904
URL: http://svn.apache.org/r1559904
Log:
Merging r1558604 through r1559901 from trunk.
Modified:
hadoop/common/branches/HDFS-5698/ (props changed)
hadoop/common/branches/HDFS-5698/BUILDING.txt
hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-5698/
--
Merged /hadoop/common/trunk:r1558604-1559901
Modified: hadoop/common/branches/HDFS-5698/BUILDING.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/BUILDING.txt?rev=1559904&r1=1559903&r2=1559904&view=diff
==
--- hadoop/common/branches/HDFS-5698/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-5698/BUILDING.txt Tue Jan 21 02:08:36 2014
@@ -183,11 +183,11 @@ Building on Windows
Requirements:
* Windows System
-* JDK 1.6
-* Maven 3.0
-* Windows SDK or Visual Studio 2010 Professional
-* ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
+* JDK 1.6+
+* Maven 3.0 or later
* Findbugs 1.3.9 (if running findbugs)
+* ProtocolBuffer 2.5.0
+* Windows SDK or Visual Studio 2010 Professional
* Unix command-line tools from GnuWin32 or Cygwin: sh, mkdir, rm, cp, tar, gzip
* Internet connection for first build (to fetch all Maven and Hadoop
dependencies)
Modified: hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml?rev=1559904&r1=1559903&r2=1559904&view=diff
==
--- hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml Tue Jan 21 02:08:36
2014
@@ -422,7 +422,7 @@
${jersey.version}
-javax.xml.stream
+stax
stax-api
@@ -770,6 +770,12 @@
org.codehaus.jettison
jettison
1.1
+
+
+stax
+stax-api
+
+
com.sun.jersey
svn commit: r1559923 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/WritableFactories.java
Author: stack
Date: Tue Jan 21 05:14:10 2014
New Revision: 1559923
URL: http://svn.apache.org/r1559923
Log:
HBASE-10143 replace WritableFactories's hashmap with ConcurrentHashMap (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/io/WritableFactories.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=1559923&r1=1559922&r2=1559923&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan
21 05:14:10 2014
@@ -113,6 +113,9 @@ Trunk (Unreleased)
HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
+HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
+(Liang Xie via stack)
+
BUG FIXES
HADOOP-9451. Fault single-layer config if node group topology is enabled.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java?rev=1559923&r1=1559922&r2=1559923&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
Tue Jan 21 05:14:10 2014
@@ -22,25 +22,26 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.ReflectionUtils;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/** Factories for non-public writables. Defining a factory permits {@link
* ObjectWritable} to be able to construct instances of non-public classes. */
@InterfaceAudience.Public
@InterfaceStability.Stable
public class WritableFactories {
- private static final HashMap CLASS_TO_FACTORY =
-new HashMap();
+ private static final Map CLASS_TO_FACTORY =
+new ConcurrentHashMap();
private WritableFactories() {} // singleton
/** Define a factory for a class. */
- public static synchronized void setFactory(Class c, WritableFactory factory)
{
+ public static void setFactory(Class c, WritableFactory factory) {
CLASS_TO_FACTORY.put(c, factory);
}
/** Define a factory for a class. */
- public static synchronized WritableFactory getFactory(Class c) {
+ public static WritableFactory getFactory(Class c) {
return CLASS_TO_FACTORY.get(c);
}
svn commit: r1559924 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/WritableFactories.java
Author: stack
Date: Tue Jan 21 05:16:19 2014
New Revision: 1559924
URL: http://svn.apache.org/r1559924
Log:
HBASE-10143 replace WritableFactories's hashmap with ConcurrentHashMap (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/io/WritableFactories.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=1559924&r1=1559923&r2=1559924&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 Jan 21 05:16:19 2014
@@ -136,6 +136,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
(Haohui Mai via cnauroth)
+HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
+(Liang Xie via stack)
+
BUG FIXES
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java?rev=1559924&r1=1559923&r2=1559924&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
Tue Jan 21 05:16:19 2014
@@ -22,25 +22,26 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.ReflectionUtils;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/** Factories for non-public writables. Defining a factory permits {@link
* ObjectWritable} to be able to construct instances of non-public classes. */
@InterfaceAudience.Public
@InterfaceStability.Stable
public class WritableFactories {
- private static final HashMap CLASS_TO_FACTORY =
-new HashMap();
+ private static final Map CLASS_TO_FACTORY =
+new ConcurrentHashMap();
private WritableFactories() {} // singleton
/** Define a factory for a class. */
- public static synchronized void setFactory(Class c, WritableFactory factory)
{
+ public static void setFactory(Class c, WritableFactory factory) {
CLASS_TO_FACTORY.put(c, factory);
}
/** Define a factory for a class. */
- public static synchronized WritableFactory getFactory(Class c) {
+ public static WritableFactory getFactory(Class c) {
return CLASS_TO_FACTORY.get(c);
}
svn commit: r1559927 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt
Author: cos Date: Tue Jan 21 05:55:32 2014 New Revision: 1559927 URL: http://svn.apache.org/r1559927 Log: HADOOP-10110. hadoop-auth has a build break due to missing dependency. Contributed by Chuan Liu Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml?rev=1559927&r1=1559926&r2=1559927&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml Tue Jan 21 05:55:32 2014 @@ -59,6 +59,11 @@ org.mortbay.jetty + jetty-util + test + + + org.mortbay.jetty jetty test 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=1559927&r1=1559926&r2=1559927&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 Jan 21 05:55:32 2014 @@ -332,6 +332,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10112. har file listing doesn't work with wild card. (brandonli) +HADOOP-10110. hadoop-auth has a build break due to missing dependency +(Chuan Liu via cos) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES
svn commit: r1559928 - in /hadoop/common/branches/branch-2.3/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt
Author: cos Date: Tue Jan 21 05:55:55 2014 New Revision: 1559928 URL: http://svn.apache.org/r1559928 Log: HADOOP-10110. hadoop-auth has a build break due to missing dependency. Contributed by Chuan Liu Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml?rev=1559928&r1=1559927&r2=1559928&view=diff == --- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml Tue Jan 21 05:55:55 2014 @@ -60,6 +60,11 @@ org.mortbay.jetty + jetty-util + test + + + org.mortbay.jetty jetty test Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1559928&r1=1559927&r2=1559928&view=diff == --- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 21 05:55:55 2014 @@ -95,6 +95,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10112. har file listing doesn't work with wild card. (brandonli) +HADOOP-10110. hadoop-auth has a build break due to missing dependency +(Chuan Liu via cos) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES
