date:20140611

svn commit: r1601869 - in /hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common: ./ src/main/java/ src/main/java/org/apache/hadoop/net/ src/test/java/org/apache/hadoop/net/

2014-06-11 Thread vinayakumarb

Author: vinayakumarb
Date: Wed Jun 11 12:20:48 2014
New Revision: 1601869

URL: http://svn.apache.org/r1601869
Log:
Merged revision(s) 1601144-1601868, 1598456-1601149 from hadoop/common/trunk

Modified:

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java

hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java

Modified: 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1601869&r1=1601868&r2=1601869&view=diff
==
--- 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
 Wed Jun 11 12:20:48 2014
@@ -297,9 +297,6 @@ Trunk (Unreleased)
 HADOOP-9394. Port findHangingTest.sh from HBase to Hadoop. (Andrew Wang
 via atm)
 
-HADOOP-9099. NetUtils.normalizeHostName fails on domains where 
-UnknownHost resolves to an IP address. (Ivan Mitic via suresh)
-
 HADOOP-9431 TestSecurityUtil#testLocalHostNameForNullOrWild on systems 
where hostname
 contains capital letters  (Chris Nauroth via sanjay)
 
@@ -373,6 +370,11 @@ Release 2.5.0 - UNRELEASED
 
 HADOOP-9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex 
Newman and Babak Behzad via raviprak)
 
+HADOOP-9629. Support Windows Azure Storage - Blob as a file system in 
Hadoop.
+(Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao,
+Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys,
+Alexander Stojanovic, Brian Swan, and Min Wei via cnauroth)
+
   IMPROVEMENTS
 
 HADOOP-10451. Remove unused field and imports from SaslRpcServer.
@@ -429,6 +431,10 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10448. Support pluggable mechanism to specify proxy user settings.
 (Benoy Antony via Arpit Agarwal)
 
+HADOOP-9555. HA functionality that uses ZooKeeper may experience 
inadvertent
+TCP RST and miss session expiration event due to bug in client connection
+management. (cnauroth)
+
   OPTIMIZATIONS
 
   BUG FIXES 
@@ -536,6 +542,11 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java.
 (Gene Kim via stevel)
 
+HADOOP-9099. NetUtils.normalizeHostName fails on domains where
+UnknownHost resolves to an IP address. (Ivan Mitic via suresh)
+
+HADOOP-10664. TestNetUtils.testNormalizeHostName fails. (atm)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1601151-1601868

Propchange: 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1601151-1601868

Modified: 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==
--- 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
 (original)
+++ 
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
 Wed Jun 11 12:20:48 2014
@@ -883,15 +883,16 @@ public class NetworkTopology {
* @param seed Used to seed the pseudo-random generator that randomizes the
*  set of nodes at each network distance.
*/
-  public void sortByDistance(Node reader, Node[] nodes, long seed) {
+  public void sortByDistance(Node reader, Node[] nodes,
+  int activeLen, long seed) {
 /** Sort weights for the nodes array */
-int[] weights = ne

svn commit: r1601869 - in /hadoop/common/branches/HDFS-5442: ./ hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-azure/ hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/ had

2014-06-11 Thread vinayakumarb

Author: vinayakumarb
Date: Wed Jun 11 12:20:48 2014
New Revision: 1601869

URL: http://svn.apache.org/r1601869
Log:
Merged revision(s) 1601144-1601868, 1598456-1601149 from hadoop/common/trunk

Added:
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-azure/
  - copied from r1601868, hadoop/common/trunk/hadoop-tools/hadoop-azure/
Modified:
hadoop/common/branches/HDFS-5442/   (props changed)
hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml

hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml

Propchange: hadoop/common/branches/HDFS-5442/
--
  Merged /hadoop/common/trunk:r1601151-1601868

Modified: hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml?rev=1601869&r1=1601868&r2=1601869&view=diff
==
--- hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml Wed Jun 11 12:20:48 
2014
@@ -65,6 +65,8 @@
 
 2.5.0
 ${env.HADOOP_PROTOC_PATH}
+
+3.4.6
   
 
   
@@ -307,6 +309,12 @@
 hadoop-openstack
 ${project.version}
   
+  
+  
+org.apache.hadoop
+hadoop-azure
+${project.version}
+  
 
   
 com.google.guava
@@ -672,7 +680,7 @@
   
 org.apache.zookeeper
 zookeeper
-3.4.5
+${zookeeper.version}
 
   
 
@@ -696,7 +704,7 @@
   
 org.apache.zookeeper
 zookeeper
-3.4.5
+${zookeeper.version}
 test-jar
 test
 
@@ -766,6 +774,12 @@
 1.8
   
 
+  
+com.microsoft.windowsazure.storage
+microsoft-windowsazure-storage-sdk
+0.6.0
+
+  
 
   
 

Modified: 
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==
--- 
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
 (original)
+++ 
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
 Wed Jun 11 12:20:48 2014
@@ -376,7 +376,7 @@ public class TestGridMixClasses {
   /*
* test LoadSortComparator
*/
-  @Test (timeout=1000)
+  @Test (timeout=3000)
   public void testLoadJobLoadSortComparator() throws Exception {
 LoadJob.LoadSortComparator test = new LoadJob.LoadSortComparator();
 
@@ -409,7 +409,7 @@ public class TestGridMixClasses {
   /*
* test SpecGroupingComparator
*/
-  @Test (timeout=1000)
+  @Test (timeout=3000)
   public void testGridmixJobSpecGroupingComparator() throws Exception {
 GridmixJob.SpecGroupingComparator test = new 
GridmixJob.SpecGroupingComparator();
 
@@ -452,7 +452,7 @@ public class TestGridMixClasses {
   /*
* test CompareGridmixJob only equals and compare
*/
-  @Test (timeout=1)
+  @Test (timeout=3)
   public void testCompareGridmixJob() throws Exception {
 Configuration conf = new Configuration();
 Path outRoot = new Path("target");
@@ -478,7 +478,7 @@ public class TestGridMixClasses {
   /*
* test ReadRecordFactory. should read all data from inputstream
*/
-  @Test (timeout=1000)
+  @Test (timeout=3000)
   public void testReadRecordFactory() throws Exception {
 
 // RecordFactory factory, InputStream src, Configuration conf
@@ -589,7 +589,7 @@ public class TestGridMixClasses {
   /*
* test LoadRecordReader. It class reads data from some files.
*/
-  @Test (timeout=1000)
+  @Test (timeout=3000)
   public void testLoadJobLoadRecordReader() throws Exception {
 LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader();
 Configuration conf = new Configuration();
@@ -652,7 +652,7 @@ public class TestGridMixClasses {
* test LoadReducer
*/
 
-  @Test (timeout=1000)
+  @Test (timeout=3000)
   public void testLoadJobLoadReducer() throws Exception {
 LoadJob.LoadReducer test = new LoadJob.LoadReducer();
 
@@ -772,7 +772,7 @@ public class TestGridMixClasses {
   /*
* test SerialJobFactory
*/
-  @Test (timeout=4)
+  @Test (timeout=12)
   public void testSerialReaderThread() throws Exception {
 
 Configuration conf = new Configuration();

svn commit: r1601985 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java

2014-06-11 Thread brandonli

Author: brandonli
Date: Wed Jun 11 18:54:09 2014
New Revision: 1601985

URL: http://svn.apache.org/r1601985
Log:
HADOOP-10656. The password keystore file is not picked by LDAP group mapping. 
Contributed by Brandon Li

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/security/LdapGroupsMapping.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=1601985&r1=1601984&r2=1601985&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jun 
11 18:54:09 2014
@@ -547,6 +547,9 @@ Release 2.5.0 - UNRELEASED
 
 HADOOP-10664. TestNetUtils.testNormalizeHostName fails. (atm)
 
+HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
+(brandonli)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java?rev=1601985&r1=1601984&r2=1601985&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
 Wed Jun 11 18:54:09 2014
@@ -40,6 +40,7 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.IOUtils;
 
 /**
  * An implementation of {@link GroupMappingServiceProvider} which
@@ -312,8 +313,8 @@ public class LdapGroupsMapping
 keystorePass =
 conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT);
 if (keystorePass.isEmpty()) {
-  keystorePass = extractPassword(
-conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT));
+  keystorePass = extractPassword(conf.get(LDAP_KEYSTORE_PASSWORD_FILE_KEY,
+  LDAP_KEYSTORE_PASSWORD_FILE_DEFAULT));
 }
 
 bindUser = conf.get(BIND_USER_KEY, BIND_USER_DEFAULT);
@@ -346,18 +347,20 @@ public class LdapGroupsMapping
   return "";
 }
 
+Reader reader = null;
 try {
   StringBuilder password = new StringBuilder();
-  Reader reader = new FileReader(pwFile);
+  reader = new FileReader(pwFile);
   int c = reader.read();
   while (c > -1) {
 password.append((char)c);
 c = reader.read();
   }
-  reader.close();
   return password.toString().trim();
 } catch (IOException ioe) {
   throw new RuntimeException("Could not read password file: " + pwFile, 
ioe);
+} finally {
+  IOUtils.cleanup(LOG, reader);
 }
   }
 }

svn commit: r1601986 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java

2014-06-11 Thread brandonli

Author: brandonli
Date: Wed Jun 11 18:58:44 2014
New Revision: 1601986

URL: http://svn.apache.org/r1601986
Log:
HADOOP-10656. Merging change r1601985 from trunk

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/security/LdapGroupsMapping.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=1601986&r1=1601985&r2=1601986&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 
Wed Jun 11 18:58:44 2014
@@ -192,6 +192,9 @@ Release 2.5.0 - UNRELEASED
 
 HADOOP-10664. TestNetUtils.testNormalizeHostName fails. (atm)
 
+HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
+(brandonli)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java?rev=1601986&r1=1601985&r2=1601986&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
 Wed Jun 11 18:58:44 2014
@@ -40,6 +40,7 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.IOUtils;
 
 /**
  * An implementation of {@link GroupMappingServiceProvider} which
@@ -312,8 +313,8 @@ public class LdapGroupsMapping
 keystorePass =
 conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT);
 if (keystorePass.isEmpty()) {
-  keystorePass = extractPassword(
-conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT));
+  keystorePass = extractPassword(conf.get(LDAP_KEYSTORE_PASSWORD_FILE_KEY,
+  LDAP_KEYSTORE_PASSWORD_FILE_DEFAULT));
 }
 
 bindUser = conf.get(BIND_USER_KEY, BIND_USER_DEFAULT);
@@ -346,18 +347,20 @@ public class LdapGroupsMapping
   return "";
 }
 
+Reader reader = null;
 try {
   StringBuilder password = new StringBuilder();
-  Reader reader = new FileReader(pwFile);
+  reader = new FileReader(pwFile);
   int c = reader.read();
   while (c > -1) {
 password.append((char)c);
 c = reader.read();
   }
-  reader.close();
   return password.toString().trim();
 } catch (IOException ioe) {
   throw new RuntimeException("Could not read password file: " + pwFile, 
ioe);
+} finally {
+  IOUtils.cleanup(LOG, reader);
 }
   }
 }

svn commit: r1601992 - 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/

2014-06-11 Thread umamahesh

Author: umamahesh
Date: Wed Jun 11 19:25:17 2014
New Revision: 1601992

URL: http://svn.apache.org/r1601992
Log:
Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2

Added:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
  - copied unchanged from r1596575, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrSetFlag.java
  - copied unchanged from r1596575, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrSetFlag.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
  - copied unchanged from r1596575, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
  - copied unchanged from r1596575, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
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
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/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/FileSystem.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
   (props changed)

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
--
  Merged /hadoop/common/trunk/hadoop-common-project:r1596575

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
--
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1596575

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=1601992&r1=1601991&r2=1601992&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 
Wed Jun 11 19:25:17 2014
@@ -195,6 +195,24 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
 (brandonli)
 
+  BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
+
+HADOOP-10520. Extended attributes definition and FileSystem APIs for
+extended attributes. (Yi Liu via wang)
+
+HADOOP-10546. Javadoc and other small fixes for extended attributes in
+hadoop-common. (Charles Lamb via wang)
+
+HADOOP-10521. FsShell commands for extended attributes. (Yi Liu via wang)
+
+HADOOP-10548. Improve FsShell xattr error handling and other fixes. 
(Charles Lamb via umamahesh)
+
+HADOOP-10567. Shift XAttr value encoding code out for reuse. (Yi Liu via 
umamahesh)
+
+HADOOP-1062

svn commit: r1601992 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml

2014-06-11 Thread umamahesh

Author: umamahesh
Date: Wed Jun 11 19:25:17 2014
New Revision: 1601992

URL: http://svn.apache.org/r1601992
Log:
Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2

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/trunk:r1596575

Propchange: hadoop/common/branches/branch-2/hadoop-project/
--
  Merged /hadoop/common/trunk/hadoop-project:r1596575

Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
--
  Merged /hadoop/common/trunk/hadoop-project/src/site:r1596575

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=1601992&r1=1601991&r2=1601992&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 Wed Jun 11 
19:25:17 2014
@@ -85,6 +85,7 @@
   
   
   
+

svn commit: r1602003 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

2014-06-11 Thread umamahesh

Author: umamahesh
Date: Wed Jun 11 19:51:36 2014
New Revision: 1602003

URL: http://svn.apache.org/r1602003
Log:
Moved the HDFS-2006 break down tasks list to 2.5 section in merging HDFS-2006 
to branch-2

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

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=1602003&r1=1602002&r2=1602003&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jun 
11 19:51:36 2014
@@ -342,24 +342,6 @@ Trunk (Unreleased)
 
 HADOOP-8589. ViewFs tests fail when tests and home dirs are nested (sanjay 
Radia)
 
-  BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
-
-HADOOP-10520. Extended attributes definition and FileSystem APIs for
-extended attributes. (Yi Liu via wang)
-
-HADOOP-10546. Javadoc and other small fixes for extended attributes in
-hadoop-common. (Charles Lamb via wang)
-
-HADOOP-10521. FsShell commands for extended attributes. (Yi Liu via wang)
-
-HADOOP-10548. Improve FsShell xattr error handling and other fixes. 
(Charles Lamb via umamahesh)
-
-HADOOP-10567. Shift XAttr value encoding code out for reuse. (Yi Liu via 
umamahesh)
-
-HADOOP-10621. Remove CRLF for xattr value base64 encoding for better 
display.(Yi Liu via umamahesh)
-
-HADOOP-10575. Small fixes for XAttrCommands and test. (Yi Liu via 
umamahesh)
-
 Release 2.5.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -550,6 +532,24 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
 (brandonli)
 
+  BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
+
+HADOOP-10520. Extended attributes definition and FileSystem APIs for
+extended attributes. (Yi Liu via wang)
+
+HADOOP-10546. Javadoc and other small fixes for extended attributes in
+hadoop-common. (Charles Lamb via wang)
+
+HADOOP-10521. FsShell commands for extended attributes. (Yi Liu via wang)
+
+HADOOP-10548. Improve FsShell xattr error handling and other fixes. 
(Charles Lamb via umamahesh)
+
+HADOOP-10567. Shift XAttr value encoding code out for reuse. (Yi Liu via 
umamahesh)
+
+HADOOP-10621. Remove CRLF for xattr value base64 encoding for better 
display.(Yi Liu via umamahesh)
+
+HADOOP-10575. Small fixes for XAttrCommands and test. (Yi Liu via 
umamahesh)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

svn commit: r1602033 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java

2014-06-11 Thread jlowe

Author: jlowe
Date: Wed Jun 11 22:05:04 2014
New Revision: 1602033

URL: http://svn.apache.org/r1602033
Log:
HADOOP-10622. Shell.runCommand can deadlock. Contributed by Gera Shegalov

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/util/Shell.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=1602033&r1=1602032&r2=1602033&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jun 
11 22:05:04 2014
@@ -532,6 +532,8 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
 (brandonli)
 
+HADOOP-10622. Shell.runCommand can deadlock (Gera Shegalov via jlowe)
+
   BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
 
 HADOOP-10520. Extended attributes definition and FileSystem APIs for

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1602033&r1=1602032&r2=1602033&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
 Wed Jun 11 22:05:04 2014
@@ -526,12 +526,8 @@ abstract public class Shell {
   }
   // wait for the process to finish and check the exit code
   exitCode  = process.waitFor();
-  try {
-// make sure that the error thread exits
-errThread.join();
-  } catch (InterruptedException ie) {
-LOG.warn("Interrupted while reading the error stream", ie);
-  }
+  // make sure that the error thread exits
+  joinThread(errThread);
   completed.set(true);
   //the timeout thread handling
   //taken care in finally block
@@ -560,13 +556,9 @@ abstract public class Shell {
   } catch (IOException ioe) {
 LOG.warn("Error while closing the input stream", ioe);
   }
-  try {
-if (!completed.get()) {
-  errThread.interrupt();
-  errThread.join();
-}
-  } catch (InterruptedException ie) {
-LOG.warn("Interrupted while joining errThread");
+  if (!completed.get()) {
+errThread.interrupt();
+joinThread(errThread);
   }
   try {
 InputStream stderr = process.getErrorStream();
@@ -581,6 +573,19 @@ abstract public class Shell {
 }
   }
 
+  private static void joinThread(Thread t) {
+while (t.isAlive()) {
+  try {
+t.join();
+  } catch (InterruptedException ie) {
+if (LOG.isWarnEnabled()) {
+  LOG.warn("Interrupted while joining on: " + t, ie);
+}
+t.interrupt(); // propagate interrupt
+  }
+}
+  }
+
   /** return an array containing the command name & its parameters */ 
   protected abstract String[] getExecString();

svn commit: r1602034 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java

2014-06-11 Thread jlowe

Author: jlowe
Date: Wed Jun 11 22:06:12 2014
New Revision: 1602034

URL: http://svn.apache.org/r1602034
Log:
svn merge -c 1602033 FIXES: HADOOP-10622. Shell.runCommand can deadlock. 
Contributed by Gera Shegalov

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/util/Shell.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=1602034&r1=1602033&r2=1602034&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 
Wed Jun 11 22:06:12 2014
@@ -195,6 +195,8 @@ Release 2.5.0 - UNRELEASED
 HADOOP-10656. The password keystore file is not picked by LDAP group 
mapping
 (brandonli)
 
+HADOOP-10622. Shell.runCommand can deadlock (Gera Shegalov via jlowe)
+
   BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
 
 HADOOP-10520. Extended attributes definition and FileSystem APIs for

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1602034&r1=1602033&r2=1602034&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
 Wed Jun 11 22:06:12 2014
@@ -526,12 +526,8 @@ abstract public class Shell {
   }
   // wait for the process to finish and check the exit code
   exitCode  = process.waitFor();
-  try {
-// make sure that the error thread exits
-errThread.join();
-  } catch (InterruptedException ie) {
-LOG.warn("Interrupted while reading the error stream", ie);
-  }
+  // make sure that the error thread exits
+  joinThread(errThread);
   completed.set(true);
   //the timeout thread handling
   //taken care in finally block
@@ -560,13 +556,9 @@ abstract public class Shell {
   } catch (IOException ioe) {
 LOG.warn("Error while closing the input stream", ioe);
   }
-  try {
-if (!completed.get()) {
-  errThread.interrupt();
-  errThread.join();
-}
-  } catch (InterruptedException ie) {
-LOG.warn("Interrupted while joining errThread");
+  if (!completed.get()) {
+errThread.interrupt();
+joinThread(errThread);
   }
   try {
 InputStream stderr = process.getErrorStream();
@@ -581,6 +573,19 @@ abstract public class Shell {
 }
   }
 
+  private static void joinThread(Thread t) {
+while (t.isAlive()) {
+  try {
+t.join();
+  } catch (InterruptedException ie) {
+if (LOG.isWarnEnabled()) {
+  LOG.warn("Interrupted while joining on: " + t, ie);
+}
+t.interrupt(); // propagate interrupt
+  }
+}
+  }
+
   /** return an array containing the command name & its parameters */ 
   protected abstract String[] getExecString();

svn commit: r1602040 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

2014-06-11 Thread tucu

Author: tucu
Date: Wed Jun 11 22:35:18 2014
New Revision: 1602040

URL: http://svn.apache.org/r1602040
Log:
HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu)

Modified:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java?rev=1602040&r1=1602039&r2=1602040&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
 Wed Jun 11 22:35:18 2014
@@ -298,4 +298,18 @@ public class AclEntry {
 AclEntry aclEntry = builder.build();
 return aclEntry;
   }
+
+  /**
+   * Convert a List of AclEntries into a string - the reverse of parseAclSpec.
+   * @param aclSpec List of AclEntries to convert
+   * @return String representation of aclSpec
+   */
+  public static String aclSpecToString(List aclSpec) {
+StringBuilder buf = new StringBuilder();
+for ( AclEntry e : aclSpec ) {
+  buf.append(e.toString());
+  buf.append(",");
+}
+return buf.substring(0, buf.length()-1);  // remove last ,
+  }
 }

svn commit: r1602042 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

2014-06-11 Thread tucu

Author: tucu
Date: Wed Jun 11 22:40:15 2014
New Revision: 1602042

URL: http://svn.apache.org/r1602042
Log:
HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu)

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java?rev=1602042&r1=1602041&r2=1602042&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
 Wed Jun 11 22:40:15 2014
@@ -298,4 +298,18 @@ public class AclEntry {
 AclEntry aclEntry = builder.build();
 return aclEntry;
   }
+
+  /**
+   * Convert a List of AclEntries into a string - the reverse of parseAclSpec.
+   * @param aclSpec List of AclEntries to convert
+   * @return String representation of aclSpec
+   */
+  public static String aclSpecToString(List aclSpec) {
+StringBuilder buf = new StringBuilder();
+for ( AclEntry e : aclSpec ) {
+  buf.append(e.toString());
+  buf.append(",");
+}
+return buf.substring(0, buf.length()-1);  // remove last ,
+  }
 }

svn commit: r1602055 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/ha

2014-06-11 Thread arp

Author: arp
Date: Thu Jun 12 01:27:39 2014
New Revision: 1602055

URL: http://svn.apache.org/r1602055
Log:
HADOOP-10376. Refactor refresh*Protocols into a single generic 
refreshConfigProtocol. (Contributed by Chris Li)

Added:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/GenericRefreshProtocol.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshHandler.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshResponse.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolClientSideTranslatorPB.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolPB.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolServerSideTranslatorPB.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.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=1602055&r1=1602054&r2=1602055&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jun 
12 01:27:39 2014
@@ -417,6 +417,9 @@ Release 2.5.0 - UNRELEASED
 TCP RST and miss session expiration event due to bug in client connection
 management. (cnauroth)
 
+HADOOP-10376. Refactor refresh*Protocols into a single generic
+refreshConfigProtocol. (Chris Li via Arpit Agarwal)
+
   OPTIMIZATIONS
 
   BUG FIXES 

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1602055&r1=1602054&r2=1602055&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
 Thu Jun 12 01:27:39 2014
@@ -287,6 +287,10 @@
   
   
 
+
+  
+  
+

svn commit: r1602057 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/main/java/o

2014-06-11 Thread arp

Author: arp
Date: Thu Jun 12 01:43:01 2014
New Revision: 1602057

URL: http://svn.apache.org/r1602057
Log:
HADOOP-10376: Merging r1602055 from trunk to branch-2.

Added:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/GenericRefreshProtocol.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/GenericRefreshProtocol.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshHandler.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshHandler.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshResponse.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshResponse.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolClientSideTranslatorPB.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolClientSideTranslatorPB.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolPB.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolPB.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolServerSideTranslatorPB.java
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/GenericRefreshProtocolServerSideTranslatorPB.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto
  - copied unchanged from r1602055, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto
Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.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=1602057&r1=1602056&r2=1602057&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 
Thu Jun 12 01:43:01 2014
@@ -72,6 +72,9 @@ Release 2.5.0 - UNRELEASED
 TCP RST and miss session expiration event due to bug in client connection
 management. (cnauroth)
 
+HADOOP-10376. Refactor refresh*Protocols into a single generic
+refreshConfigProtocol. (Chris Li via Arpit Agarwal)
+
   OPTIMIZATIONS
 
   BUG FIXES 

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1602057&r1=1602056&r2=1602057&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
 Thu Jun 12 01:43:01 2014
@@ -305,6 +305,10 @@
   
   
 
+
+  
+  
+

svn commit: r1602071 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

2014-06-11 Thread zjshen

Author: zjshen
Date: Thu Jun 12 06:40:32 2014
New Revision: 1602071

URL: http://svn.apache.org/r1602071
Log:
YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji 
Kikushima.

Modified:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java?rev=1602071&r1=1602070&r2=1602071&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
 Thu Jun 12 06:40:32 2014
@@ -19,6 +19,7 @@ package org.apache.hadoop.ha;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
@@ -68,7 +69,7 @@ public abstract class HAAdmin extends Co
   protected final static Map USAGE =
 ImmutableMap.builder()
 .put("-transitionToActive",
-new UsageInfo("  [--"+FORCEACTIVE+"]", "Transitions the 
service into Active state"))
+new UsageInfo(" [--"+FORCEACTIVE+"]", "Transitions the 
service into Active state"))
 .put("-transitionToStandby",
 new UsageInfo("", "Transitions the service into Standby 
state"))
 .put("-failover",
@@ -104,7 +105,8 @@ public abstract class HAAdmin extends Co
   protected abstract HAServiceTarget resolveTarget(String string);
   
   protected Collection getTargetIds(String targetNodeToActivate) {
-return Arrays.asList(new String[]{targetNodeToActivate});
+return new ArrayList(
+Arrays.asList(new String[]{targetNodeToActivate}));
   }
 
   protected String getUsageString() {

svn commit: r1602073 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

2014-06-11 Thread zjshen

Author: zjshen
Date: Thu Jun 12 06:48:49 2014
New Revision: 1602073

URL: http://svn.apache.org/r1602073
Log:
YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji 
Kikushima.
svn merge --ignore-ancestry -c 1602071 ../../trunk/

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java?rev=1602073&r1=1602072&r2=1602073&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
 Thu Jun 12 06:48:49 2014
@@ -19,6 +19,7 @@ package org.apache.hadoop.ha;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
@@ -68,7 +69,7 @@ public abstract class HAAdmin extends Co
   protected final static Map USAGE =
 ImmutableMap.builder()
 .put("-transitionToActive",
-new UsageInfo("  [--"+FORCEACTIVE+"]", "Transitions the 
service into Active state"))
+new UsageInfo(" [--"+FORCEACTIVE+"]", "Transitions the 
service into Active state"))
 .put("-transitionToStandby",
 new UsageInfo("", "Transitions the service into Standby 
state"))
 .put("-failover",
@@ -104,7 +105,8 @@ public abstract class HAAdmin extends Co
   protected abstract HAServiceTarget resolveTarget(String string);
   
   protected Collection getTargetIds(String targetNodeToActivate) {
-return Arrays.asList(new String[]{targetNodeToActivate});
+return new ArrayList(
+Arrays.asList(new String[]{targetNodeToActivate}));
   }
 
   protected String getUsageString() {

svn commit: r1601869 - in /hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common: ./ src/main/java/ src/main/java/org/apache/hadoop/net/ src/test/java/org/apache/hadoop/net/

svn commit: r1601869 - in /hadoop/common/branches/HDFS-5442: ./ hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-azure/ hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/ had

svn commit: r1601985 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java

svn commit: r1601986 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java

svn commit: r1601992 - 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/

svn commit: r1601992 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml

svn commit: r1602003 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

svn commit: r1602033 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java

svn commit: r1602034 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java

svn commit: r1602040 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

svn commit: r1602042 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java

svn commit: r1602055 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/ha

svn commit: r1602057 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/main/java/o

svn commit: r1602071 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

svn commit: r1602073 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java

15 matches

Site Navigation

Mail list logo

Footer information