[hadoop] branch trunk updated: HADOOP-16166. TestRawLocalFileSystemContract fails with build Docker container running on Mac. Also provided similar fix for Windows.

[mattf]

This is an automated email from the ASF dual-hosted git repository.

mattf pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new f74159c  HADOOP-16166. TestRawLocalFileSystemContract fails with build 
Docker container running on Mac. Also provided similar fix for Windows.
f74159c is described below

commit f74159c8fc5e7fd0c4357d6dc95ce05f94e60145
Author: Matt Foley 
AuthorDate: Tue Mar 5 02:40:13 2019 -0800

HADOOP-16166. TestRawLocalFileSystemContract fails with build Docker 
container running on Mac.
Also provided similar fix for Windows.
---
 .../hadoop/fs/TestRawLocalFileSystemContract.java  | 42 --
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestRawLocalFileSystemContract.java
 
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestRawLocalFileSystemContract.java
index 908e330..2e514c4 100644
--- 
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestRawLocalFileSystemContract.java
+++ 
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestRawLocalFileSystemContract.java
@@ -18,6 +18,8 @@
 package org.apache.hadoop.fs;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.regex.Pattern;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.test.GenericTestUtils;
@@ -44,6 +46,18 @@ public class TestRawLocalFileSystemContract extends 
FileSystemContractBaseTest {
   private final static Path TEST_BASE_DIR =
   new Path(GenericTestUtils.getRandomizedTestDir().getAbsolutePath());
 
+  // These are the string values that DF sees as "Filesystem" for a
+  // Docker container accessing a Mac or Windows host's filesystem.
+  private static final String FS_TYPE_MAC = "osxfs";
+  private static boolean looksLikeMac(String filesys) {
+return filesys.toLowerCase().contains(FS_TYPE_MAC.toLowerCase());
+  }
+  private static final Pattern HAS_DRIVE_LETTER_SPECIFIER =
+  Pattern.compile("^/?[a-zA-Z]:");
+  private static boolean looksLikeWindows(String filesys) {
+return HAS_DRIVE_LETTER_SPECIFIER.matcher(filesys).find();
+  }
+
   @Before
   public void setUp() throws Exception {
 Configuration conf = new Configuration();
@@ -84,7 +98,29 @@ public class TestRawLocalFileSystemContract extends 
FileSystemContractBaseTest {
 
   @Override
   protected boolean filesystemIsCaseSensitive() {
-return !(Shell.WINDOWS || Shell.MAC);
+if (Shell.WINDOWS || Shell.MAC) {
+  return false;
+}
+// osType is linux or unix-like, but it might be in a container mounting a
+// Mac or Windows volume. Use DF to try to determine if this is the case.
+String rfsPathStr = "uninitialized";
+String rfsType;
+try {
+  RawLocalFileSystem rfs = new RawLocalFileSystem();
+  Configuration conf = new Configuration();
+  rfs.initialize(rfs.getUri(), conf);
+  rfsPathStr = Path.getPathWithoutSchemeAndAuthority(
+  rfs.getWorkingDirectory()).toString();
+  File rfsPath = new File(rfsPathStr);
+  // DF.getFilesystem() only provides indirect info about FS type, but it's
+  // the best we have.  `df -T` would be better, but isn't cross-platform.
+  rfsType = (new DF(rfsPath, conf)).getFilesystem();
+  LOG.info("DF.Filesystem is {} for path {}", rfsType, rfsPath);
+} catch (IOException ex) {
+  LOG.error("DF failed on path {}", rfsPathStr);
+  rfsType = Shell.osType.toString();
+}
+return !(looksLikeMac(rfsType) || looksLikeWindows(rfsType));
   }
 
   // cross-check getPermission using both native/non-native
@@ -107,8 +143,8 @@ public class TestRawLocalFileSystemContract extends 
FileSystemContractBaseTest {
 // test initial permission
 //
 RawLocalFileSystem.DeprecatedRawLocalFileStatus fsNIO =
-  new RawLocalFileSystem.DeprecatedRawLocalFileStatus(
-  file, defaultBlockSize, rfs);
+new RawLocalFileSystem.DeprecatedRawLocalFileStatus(
+file, defaultBlockSize, rfs);
 fsNIO.loadPermissionInfoByNativeIO();
 RawLocalFileSystem.DeprecatedRawLocalFileStatus fsnonNIO =
 new RawLocalFileSystem.DeprecatedRawLocalFileStatus(


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in Hadoop and sub-projects, while adding it in to the only place it is still needed, hadoop-openstack. C

[mattf]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 af3c860bb -> c96cb3fd4


HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in 
Hadoop and sub-projects, while adding it in to the only place it is still 
needed, hadoop-openstack. Contributed by Matt Foley.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c96cb3fd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c96cb3fd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c96cb3fd

Branch: refs/heads/branch-2.8
Commit: c96cb3fd48925b3eb2cc4253e81f8bd35462007c
Parents: af3c860
Author: mattf-horton <mfo...@hortonworks.com>
Authored: Thu Jul 21 14:43:57 2016 -0700
Committer: mattf-horton <mfo...@hortonworks.com>
Committed: Thu Jul 21 16:01:05 2016 -0700

--
 hadoop-project/pom.xml   | 5 -
 hadoop-tools/hadoop-openstack/pom.xml| 1 +
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 6 --
 3 files changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96cb3fd/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 6ec46cd..d8da03f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -458,11 +458,6 @@
 0.52
   
   
-commons-httpclient
-commons-httpclient
-3.1
-  
-  
 org.apache.httpcomponents
 httpclient
 4.5.2

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96cb3fd/hadoop-tools/hadoop-openstack/pom.xml
--
diff --git a/hadoop-tools/hadoop-openstack/pom.xml 
b/hadoop-tools/hadoop-openstack/pom.xml
index dbe2398..84dd7eb 100644
--- a/hadoop-tools/hadoop-openstack/pom.xml
+++ b/hadoop-tools/hadoop-openstack/pom.xml
@@ -119,6 +119,7 @@
 
   commons-httpclient
   commons-httpclient
+  3.1
   compile
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96cb3fd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
index 04f8640..815f59c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
@@ -76,12 +76,6 @@
 
 
 
-  commons-httpclient
-  commons-httpclient
-  test
-
-
-
   junit
   junit
   test


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in Hadoop and sub-projects, while adding it in to the only place it is still needed, hadoop-openstack. C

[mattf]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 382bcf21e -> ea10e1384


HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in 
Hadoop and sub-projects, while adding it in to the only place it is still 
needed, hadoop-openstack. Contributed by Matt Foley.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea10e138
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea10e138
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea10e138

Branch: refs/heads/branch-2
Commit: ea10e1384ff65e275219463aafa1460171f476b4
Parents: 382bcf2
Author: mattf-horton <mfo...@hortonworks.com>
Authored: Thu Jul 21 14:43:57 2016 -0700
Committer: mattf-horton <mfo...@hortonworks.com>
Committed: Thu Jul 21 15:58:05 2016 -0700

--
 hadoop-project/pom.xml   | 5 -
 hadoop-tools/hadoop-openstack/pom.xml| 1 +
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 6 --
 3 files changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea10e138/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 2be74de..a79dbb8 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -458,11 +458,6 @@
 0.52
   
   
-commons-httpclient
-commons-httpclient
-3.1
-  
-  
 org.apache.httpcomponents
 httpclient
 4.5.2

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea10e138/hadoop-tools/hadoop-openstack/pom.xml
--
diff --git a/hadoop-tools/hadoop-openstack/pom.xml 
b/hadoop-tools/hadoop-openstack/pom.xml
index 33542fa..89d5274 100644
--- a/hadoop-tools/hadoop-openstack/pom.xml
+++ b/hadoop-tools/hadoop-openstack/pom.xml
@@ -119,6 +119,7 @@
 
   commons-httpclient
   commons-httpclient
+  3.1
   compile
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea10e138/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
index bf50d65..a4b3bbf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
@@ -76,12 +76,6 @@
 
 
 
-  commons-httpclient
-  commons-httpclient
-  test
-
-
-
   junit
   junit
   test


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in Hadoop and sub-projects, while adding it in to the only place it is still needed, hadoop-openstack. C

[mattf]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 43cf6b101 -> 12aa18447


HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in 
Hadoop and sub-projects, while adding it in to the only place it is still 
needed, hadoop-openstack. Contributed by Matt Foley.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12aa1844
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12aa1844
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12aa1844

Branch: refs/heads/trunk
Commit: 12aa184479675d6c9bd36fd8451f605ee9505b47
Parents: 43cf6b1
Author: mattf-horton <mfo...@hortonworks.com>
Authored: Thu Jul 21 14:43:57 2016 -0700
Committer: mattf-horton <mfo...@hortonworks.com>
Committed: Thu Jul 21 14:43:57 2016 -0700

--
 hadoop-project/pom.xml   | 5 -
 hadoop-tools/hadoop-openstack/pom.xml| 1 +
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 6 --
 3 files changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/12aa1844/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a632bff..318573a 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -486,11 +486,6 @@
 0.52
   
   
-commons-httpclient
-commons-httpclient
-3.1
-  
-  
 org.apache.httpcomponents
 httpclient
 4.5.2

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12aa1844/hadoop-tools/hadoop-openstack/pom.xml
--
diff --git a/hadoop-tools/hadoop-openstack/pom.xml 
b/hadoop-tools/hadoop-openstack/pom.xml
index 7e7e4fd..b036e84 100644
--- a/hadoop-tools/hadoop-openstack/pom.xml
+++ b/hadoop-tools/hadoop-openstack/pom.xml
@@ -136,6 +136,7 @@
 
   commons-httpclient
   commons-httpclient
+  3.1
   compile
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12aa1844/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
index 886c98f..0c78c54 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
@@ -76,12 +76,6 @@
 
 
 
-  commons-httpclient
-  commons-httpclient
-  test
-
-
-
   junit
   junit
   test


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-12617. SPNEGO authentication request to non-default realm gets default realm name inserted in target server principal. (mattf)

[mattf]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 7e4715186 -> ada9c2c41


HADOOP-12617. SPNEGO authentication request to non-default realm gets default 
realm name inserted in target server principal. (mattf)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ada9c2c4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ada9c2c4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ada9c2c4

Branch: refs/heads/trunk
Commit: ada9c2c410c15e95d0a21ea2941986195606aad8
Parents: 7e47151
Author: mattf <ma...@apache.org>
Authored: Tue Dec 8 17:27:50 2015 -0800
Committer: mattf <ma...@apache.org>
Committed: Tue Dec 8 17:27:50 2015 -0800

--
 .../authentication/util/KerberosUtil.java   | 87 ++--
 .../authentication/util/TestKerberosUtil.java   | 31 +--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +
 3 files changed, 107 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ada9c2c4/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
index 0e8d8db..3d7b00d 100644
--- 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
+++ 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
@@ -42,7 +42,7 @@ public class KerberosUtil {
 
   /* Return the Kerberos login module name */
   public static String getKrb5LoginModuleName() {
-return System.getProperty("java.vendor").contains("IBM")
+return (IBM_JAVA)
   ? "com.ibm.security.auth.module.Krb5LoginModule"
   : "com.sun.security.auth.module.Krb5LoginModule";
   }
@@ -72,7 +72,7 @@ public class KerberosUtil {
 Class classRef;
 Method getInstanceMethod;
 Method getDefaultRealmMethod;
-if (System.getProperty("java.vendor").contains("IBM")) {
+if (IBM_JAVA) {
   classRef = Class.forName("com.ibm.security.krb5.internal.Config");
 } else {
   classRef = Class.forName("sun.security.krb5.Config");
@@ -83,17 +83,79 @@ public class KerberosUtil {
  new Class[0]);
 return (String)getDefaultRealmMethod.invoke(kerbConf, new Object[0]);
   }
-  
+
+  public static String getDefaultRealmProtected() {
+String realmString = null;
+try {
+  realmString = getDefaultRealm();
+} catch (RuntimeException rte) {
+  //silently catch everything
+} catch (Exception e) {
+  //silently return null
+}
+return realmString;
+  }
+
+  /*
+   * For a Service Host Principal specification, map the host's domain
+   * to kerberos realm, as specified by krb5.conf [domain_realm] mappings.
+   * Unfortunately the mapping routines are private to the security.krb5
+   * package, so have to construct a PrincipalName instance to derive the 
realm.
+   *
+   * Many things can go wrong with Kerberos configuration, and this is not
+   * the place to be throwing exceptions to help debug them.  Nor do we choose
+   * to make potentially voluminous logs on every call to a communications API.
+   * So we simply swallow all exceptions from the underlying libraries and
+   * return null if we can't get a good value for the realmString.
+   *
+   * @param shortprinc A service principal name with host fqdn as instance, 
e.g.
+   * "HTTP/myhost.mydomain"
+   * @return String value of Kerberos realm, mapped from host fqdn
+   * May be default realm, or may be null.
+   */
+  public static String getDomainRealm(String shortprinc) {
+Class classRef;
+Object principalName; //of type sun.security.krb5.PrincipalName or IBM 
equiv
+String realmString = null;
+try {
+  if (IBM_JAVA) {
+classRef = Class.forName("com.ibm.security.krb5.PrincipalName");
+  } else {
+classRef = Class.forName("sun.security.krb5.PrincipalName");
+  }
+  int tKrbNtSrvHst = classRef.getField("KRB_NT_SRV_HST").getInt(null);
+  principalName = classRef.getConstructor(String.class, int.class).
+  newInstance(shortprinc, tKrbNtSrvHst);
+  realmString = (String)classRef.getMethod("getRealmString", new Class[0]).
+  invoke(principalName, new Object[0]);
+} catch (RuntimeException rte) {
+  //silently catch everything
+} catch (Exception e) {
+  //silently return

hadoop git commit: HADOOP-12617. SPNEGO authentication request to non-default realm gets default realm name inserted in target server principal. (mattf)

[mattf]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7013f9d6c -> 472541291


HADOOP-12617. SPNEGO authentication request to non-default realm gets default 
realm name inserted in target server principal. (mattf)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/47254129
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/47254129
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/47254129

Branch: refs/heads/branch-2
Commit: 472541291bf868c792bb70bbed5400b8520ae7e0
Parents: 7013f9d
Author: mattf <ma...@apache.org>
Authored: Tue Dec 8 17:35:25 2015 -0800
Committer: mattf <ma...@apache.org>
Committed: Tue Dec 8 17:35:25 2015 -0800

--
 .../authentication/util/KerberosUtil.java   | 83 ++--
 .../authentication/util/TestKerberosUtil.java   | 29 +--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +
 3 files changed, 104 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/47254129/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
index f7f5f63..fec7f01 100644
--- 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
+++ 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
@@ -83,17 +83,79 @@ public class KerberosUtil {
  new Class[0]);
 return (String)getDefaultRealmMethod.invoke(kerbConf, new Object[0]);
   }
-  
+
+  public static String getDefaultRealmProtected() {
+String realmString = null;
+try {
+  realmString = getDefaultRealm();
+} catch (RuntimeException rte) {
+  //silently catch everything
+} catch (Exception e) {
+  //silently return null
+}
+return realmString;
+  }
+
+  /*
+   * For a Service Host Principal specification, map the host's domain
+   * to kerberos realm, as specified by krb5.conf [domain_realm] mappings.
+   * Unfortunately the mapping routines are private to the security.krb5
+   * package, so have to construct a PrincipalName instance to derive the 
realm.
+   *
+   * Many things can go wrong with Kerberos configuration, and this is not
+   * the place to be throwing exceptions to help debug them.  Nor do we choose
+   * to make potentially voluminous logs on every call to a communications API.
+   * So we simply swallow all exceptions from the underlying libraries and
+   * return null if we can't get a good value for the realmString.
+   *
+   * @param shortprinc A service principal name with host fqdn as instance, 
e.g.
+   * "HTTP/myhost.mydomain"
+   * @return String value of Kerberos realm, mapped from host fqdn
+   * May be default realm, or may be null.
+   */
+  public static String getDomainRealm(String shortprinc) {
+Class classRef;
+Object principalName; //of type sun.security.krb5.PrincipalName or IBM 
equiv
+String realmString = null;
+try {
+  if (System.getProperty("java.vendor").contains("IBM")) {
+classRef = Class.forName("com.ibm.security.krb5.PrincipalName");
+  } else {
+classRef = Class.forName("sun.security.krb5.PrincipalName");
+  }
+  int tKrbNtSrvHst = classRef.getField("KRB_NT_SRV_HST").getInt(null);
+  principalName = classRef.getConstructor(String.class, int.class).
+  newInstance(shortprinc, tKrbNtSrvHst);
+  realmString = (String)classRef.getMethod("getRealmString", new Class[0]).
+  invoke(principalName, new Object[0]);
+} catch (RuntimeException rte) {
+  //silently catch everything
+} catch (Exception e) {
+  //silently return default realm (which may itself be null)
+}
+if (null == realmString || realmString.equals("")) {
+  return getDefaultRealmProtected();
+} else {
+  return realmString;
+}
+  }
+
   /* Return fqdn of the current host */
   static String getLocalHostName() throws UnknownHostException {
 return InetAddress.getLocalHost().getCanonicalHostName();
   }
   
   /**
-   * Create Kerberos principal for a given service and hostname. It converts
+   * Create Kerberos principal for a given service and hostname,
+   * inferring realm from the fqdn of the hostname. It converts
* hostname to lower case. If hostname is null or "0.0.0.0", it uses
* dynamically looked-up fqdn of the 

svn commit: r1510100 - in /hadoop/common/tags: release-1.2.1-rc0/ release-1.2.1/

[mattf]

Author: mattf
Date: Sun Aug  4 06:15:30 2013
New Revision: 1510100

URL: http://svn.apache.org/r1510100
Log:
Hadoop 1.2.1 release.

Added:
hadoop/common/tags/release-1.2.1/   (props changed)
  - copied from r1510099, hadoop/common/tags/release-1.2.1-rc0/
Removed:
hadoop/common/tags/release-1.2.1-rc0/

Propchange: hadoop/common/tags/release-1.2.1/
--
--- svn:ignore (added)
+++ svn:ignore Sun Aug  4 06:15:30 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.2.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug  4 06:15:30 2013
@@ -0,0 +1,10 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1455883,1461952,1470660,1471078,1471747,1477769,1478517,1478524,1478997
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/common/branches/branch-1.1:1347101,1358689,1408468,1478102
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1510110 - in /hadoop/common/site/main/publish/docs/r1.2.1: ./ api/ api/org/ api/org/apache/ api/org/apache/hadoop/ api/org/apache/hadoop/class-use/ api/org/apache/hadoop/classification/ a

[mattf]

Author: mattf
Date: Sun Aug  4 08:13:21 2013
New Revision: 1510110

URL: http://svn.apache.org/r1510110
Log:
Publishing docs for release 1.2.1.


[This commit notification would consist of 570 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1510111 - /hadoop/common/site/main/publish/docs/stable

[mattf]

Author: mattf
Date: Sun Aug  4 08:16:49 2013
New Revision: 1510111

URL: http://svn.apache.org/r1510111
Log:
Updating link to stable docs.

Modified:
hadoop/common/site/main/publish/docs/stable

Modified: hadoop/common/site/main/publish/docs/stable
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/docs/stable?rev=1510111r1=1510110r2=1510111view=diff
==
--- hadoop/common/site/main/publish/docs/stable (original)
+++ hadoop/common/site/main/publish/docs/stable Sun Aug  4 08:16:49 2013
@@ -1 +1 @@
-link r1.1.2
\ No newline at end of file
+link r1.2.1
\ No newline at end of file

svn commit: r1510328 [1/2] - in /hadoop/common/branches/branch-1.2: build.xml lib/jdiff/hadoop_1.2.1.xml

[mattf]

Author: mattf
Date: Sun Aug  4 19:56:05 2013
New Revision: 1510328

URL: http://svn.apache.org/r1510328
Log:
JDiff output for release 1.2.1

Added:
hadoop/common/branches/branch-1.2/lib/jdiff/hadoop_1.2.1.xml
Modified:
hadoop/common/branches/branch-1.2/build.xml

Modified: hadoop/common/branches/branch-1.2/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/build.xml?rev=1510328r1=1510327r2=1510328view=diff
==
--- hadoop/common/branches/branch-1.2/build.xml (original)
+++ hadoop/common/branches/branch-1.2/build.xml Sun Aug  4 19:56:05 2013
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.2.0/
+  property name=jdiff.stable value=1.2.1/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1510332 - /hadoop/common/branches/branch-1.2/CHANGES.txt

[mattf]

Author: mattf
Date: Sun Aug  4 20:13:49 2013
New Revision: 1510332

URL: http://svn.apache.org/r1510332
Log:
corrected minor typo in CHANGES.txt

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1510332r1=1510331r2=1510332view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Sun Aug  4 20:13:49 2013
@@ -39,7 +39,7 @@ Release 1.2.1 - 2013.07.15
 DataNode.checkDiskError calls. (Chris Nauroth via kihwal)
 
 HDFS-4261. Fix bugs in Balaner causing infinite loop and
-TestBalancerWithNodeGroup timeing out.  (Junping Du via szetszwo)
+TestBalancerWithNodeGroup timing out.  (Junping Du via szetszwo)
 
 MAPREDUCE-5260. Fix JvmManager to deal better with corner-cases in
 shutting down. (zhaoyunjiong via acmurthy) 

svn commit: r1510333 [1/3] - in /hadoop/common/branches/branch-1: CHANGES.txt build.xml lib/jdiff/hadoop_1.2.1.xml src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Sun Aug  4 20:15:27 2013
New Revision: 1510333

URL: http://svn.apache.org/r1510333
Log:
Update JDiff, releasenotes, and CHANGES.txt in branch-1 upon release of 1.2.1.

Added:
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.2.1.xml
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/build.xml
hadoop/common/branches/branch-1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1510333r1=1510332r2=1510333view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Aug  4 20:15:27 2013
@@ -117,7 +117,7 @@ Release 1.3.0 - unreleased
 HDFS-5028. LeaseRenewer throws ConcurrentModificationException when 
timeout.
 (zhaoyunjiong via szetszwo)
 
-Release 1.2.1 - 2013.07.06
+Release 1.2.1 - 2013.07.15
 
   INCOMPATIBLE CHANGES
 
@@ -128,6 +128,9 @@ Release 1.2.1 - 2013.07.06
 HDFS-4880. Print the image and edits file loaded by the namenode in the
 logs. (Arpit Agarwal via suresh)
 
+MAPREDUCE-4838. Addendum patch to fix TestRumenJobTraces.
+(Arun C Murthy)
+
   BUG FIXES
 
 MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer.
@@ -176,6 +179,9 @@ Release 1.2.1 - 2013.07.06
 values for hash-tables to store Locality and Avataar for TaskAttempts.
 (zhaoyunjiong via acmurthy)
 
+HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. (Giridharan 
Kesavan
+via mattf)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1510333r1=1510332r2=1510333view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Sun Aug  4 20:15:27 2013
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.2.0/
+  property name=jdiff.stable value=1.2.1/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1503152 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/docs/releasenotes.html src/packages/rpm/spec/hadoop.spec

[mattf]

Author: mattf
Date: Mon Jul 15 09:36:11 2013
New Revision: 1503152

URL: http://svn.apache.org/r1503152
Log:
HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. Contributed by 
Giridharan Kesavan.

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
hadoop/common/branches/branch-1.2/src/packages/rpm/spec/hadoop.spec

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1503152r1=1503151r2=1503152view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Mon Jul 15 09:36:11 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.1 - 2013.07.14
+Release 1.2.1 - 2013.07.15
 
   INCOMPATIBLE CHANGES
 
@@ -62,6 +62,9 @@ Release 1.2.1 - 2013.07.14
 values for hash-tables to store Locality and Avataar for TaskAttempts.
 (zhaoyunjiong via acmurthy)
 
+HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. (Giridharan 
Kesavan
+via mattf)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/releasenotes.html?rev=1503152r1=1503151r2=1503152view=diff
==
--- hadoop/common/branches/branch-1.2/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.2/src/docs/releasenotes.html Mon Jul 15 
09:36:11 2013
@@ -44,6 +44,11 @@
  bBlockDecompressorStream#decompress will throw EOFException instead of 
return -1 when EOF/bbr
  blockquoteBlockDecompressorStream#decompress ultimately calls 
rawReadInt, which will throw EOFException instead of return -1 when 
encountering end of a stream. Then, decompress will be called by read. However, 
InputStream#read is supposed to return -1 instead of throwing EOFException to 
indicate the end of a stream. This explains why in LineReader,br{code}br
  if (bufferPosn gt;= bufferLength) {brstartPosn = bufferPosn = 
0;brif (prevCharCR)br  ++bytesConsumed; //account for CR 
from .../blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9730;HADOOP-9730/a.
+ Major bug reported by gkesavan and fixed by gkesavan (build)br
+ bfix hadoop.spec to add task-log4j.properties /bbr
+ blockquote/blockquote/li
+
 li a href=https://issues.apache.org/jira/browse/HDFS-4261;HDFS-4261/a.
  Major bug reported by szetszwo and fixed by djp (balancer)br
  bTestBalancerWithNodeGroup times out/bbr

Modified: hadoop/common/branches/branch-1.2/src/packages/rpm/spec/hadoop.spec
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/packages/rpm/spec/hadoop.spec?rev=1503152r1=1503151r2=1503152view=diff
==
--- hadoop/common/branches/branch-1.2/src/packages/rpm/spec/hadoop.spec 
(original)
+++ hadoop/common/branches/branch-1.2/src/packages/rpm/spec/hadoop.spec Mon Jul 
15 09:36:11 2013
@@ -186,6 +186,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-
 %config(noreplace) %{_conf_dir}/hadoop-policy.xml
 %config(noreplace) %{_conf_dir}/hdfs-site.xml
 %config(noreplace) %{_conf_dir}/log4j.properties
+%config(noreplace) %{_conf_dir}/task-log4j.properties
 %config(noreplace) %{_conf_dir}/mapred-queue-acls.xml
 %config(noreplace) %{_conf_dir}/mapred-site.xml
 %config(noreplace) %{_conf_dir}/masters
@@ -194,6 +195,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-
 %config(noreplace) %{_conf_dir}/ssl-server.xml.example
 %config(noreplace) %{_conf_dir}/taskcontroller.cfg
 %config(noreplace) %{_conf_dir}/fair-scheduler.xml
+
 %{_prefix}
 %attr(0755,root,root) %{_prefix}/libexec
 %attr(0755,root,root) /etc/rc.d/init.d

svn commit: r1503091 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Mon Jul 15 00:38:20 2013
New Revision: 1503091

URL: http://svn.apache.org/r1503091
Log:
Release Notes for release candidate 1.2.1-rc0, and minor tweaks to CHANGES.txt 
for consistency.

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1503091r1=1503090r2=1503091view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Mon Jul 15 00:38:20 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.1 - 2013.07.06
+Release 1.2.1 - 2013.07.14
 
   INCOMPATIBLE CHANGES
 
@@ -11,6 +11,9 @@ Release 1.2.1 - 2013.07.06
 HDFS-4880. Print the image and edits file loaded by the namenode in the
 logs. (Arpit Agarwal via suresh)
 
+MAPREDUCE-4838. Addendum patch to fix TestRumenJobTraces.
+(Arun C Murthy)
+
   BUG FIXES
 
 MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer.

Modified: hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/releasenotes.html?rev=1503091r1=1503090r2=1503091view=diff
==
--- hadoop/common/branches/branch-1.2/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.2/src/docs/releasenotes.html Mon Jul 15 
00:38:20 2013
@@ -2,7 +2,7 @@
 html
 head
 META http-equiv=Content-Type content=text/html; charset=UTF-8
-titleHadoop 1.2.0 Release Notes/title
+titleHadoop 1.2.1 Release Notes/title
 STYLE type=text/css
H1 {font-family: sans-serif}
H2 {font-family: sans-serif; margin-left: 7mm}
@@ -10,11 +10,114 @@
/STYLE
 /head
 body
-h1Hadoop 1.2.0 Release Notes/h1
+h1Hadoop 1.2.1 Release Notes/h1
These release notes include new developer and user-facing 
incompatibilities, features, and major improvements. 
 
 a name=changes/
 
+h2Changes since Hadoop 1.2.0/h2
+
+h3Jiras with Release Notes (describe major or incompatible changes)/h3
+ul
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-3859;MAPREDUCE-3859/a.
+ Major bug reported by sergeant and fixed by sergeant (capacity-sched)br
+ bCapacityScheduler incorrectly utilizes extra-resources of queue for 
high-memory jobs/bbr
+ blockquote  Fixed wrong 
CapacityScheduler resource allocation for high memory consumption jobs
+
+  
+/blockquote/li
+
+/ul
+
+
+h3Other Jiras (describe bug fixes and minor changes)/h3
+ul
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9504;HADOOP-9504/a.
+ Critical bug reported by xieliang007 and fixed by xieliang007 
(metrics)br
+ bMetricsDynamicMBeanBase has concurrency issues in 
createMBeanInfo/bbr
+ blockquotePlease see HBASE-8416 for detail information.brwe need to 
take care of the synchronization for HashMap put(), otherwise it may lead to 
spin loop./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9665;HADOOP-9665/a.
+ Critical bug reported by zjshen and fixed by zjshen br
+ bBlockDecompressorStream#decompress will throw EOFException instead of 
return -1 when EOF/bbr
+ blockquoteBlockDecompressorStream#decompress ultimately calls 
rawReadInt, which will throw EOFException instead of return -1 when 
encountering end of a stream. Then, decompress will be called by read. However, 
InputStream#read is supposed to return -1 instead of throwing EOFException to 
indicate the end of a stream. This explains why in LineReader,br{code}br
  if (bufferPosn gt;= bufferLength) {brstartPosn = bufferPosn = 
0;brif (prevCharCR)br  ++bytesConsumed; //account for CR 
from .../blockquote/li
+
+li a href=https://issues.apache.org/jira/browse/HDFS-4261;HDFS-4261/a.
+ Major bug reported by szetszwo and fixed by djp (balancer)br
+ bTestBalancerWithNodeGroup times out/bbr
+ blockquoteWhen I manually ran TestBalancerWithNodeGroup, it always 
timed out in my machine.  Looking at the Jerkins report [build 
#3573|https://builds.apache.org/job/PreCommit-HDFS-Build/3573//testReport/org.apache.hadoop.hdfs.server.balancer/],
 TestBalancerWithNodeGroup somehow was skipped so that the problem was not 
detected./blockquote/li
+
+li a href=https://issues.apache.org/jira/browse/HDFS-4581;HDFS-4581/a.
+ Major bug reported by rohit_kochar and fixed by rohit_kochar 
(datanode)br
+ bDataNode#checkDiskError should not be called on network errors/bbr
+ blockquote/blockquote/li
+
+li a href=https://issues.apache.org/jira/browse/HDFS-4699;HDFS-4699/a.
+ Major bug reported by cnauroth and fixed by cnauroth (test)br
+ bTestPipelinesFailover

svn commit: r1500333 - in /hadoop/common/branches/branch-1.2: CHANGES.txt build.xml ivy/libraries.properties

[mattf]

Author: mattf
Date: Sat Jul  6 22:24:16 2013
New Revision: 1500333

URL: http://svn.apache.org/r1500333
Log:
Preparing for release 1.2.1

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/build.xml
hadoop/common/branches/branch-1.2/ivy/libraries.properties

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1500333r1=1500332r2=1500333view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Sat Jul  6 22:24:16 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.1 - Unreleased 
+Release 1.2.1 - 2013.07.06
 
   INCOMPATIBLE CHANGES
 

Modified: hadoop/common/branches/branch-1.2/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/build.xml?rev=1500333r1=1500332r2=1500333view=diff
==
--- hadoop/common/branches/branch-1.2/build.xml (original)
+++ hadoop/common/branches/branch-1.2/build.xml Sat Jul  6 22:24:16 2013
@@ -28,7 +28,7 @@
  
   property name=Name value=Hadoop/
   property name=name value=hadoop/
-  property name=version value=1.2.1-SNAPSHOT/
+  property name=version value=1.2.2-SNAPSHOT/
   property name=final.name value=${name}-${version}/
   property name=test.final.name value=${name}-test-${version}/
   property name=year value=2009/

Modified: hadoop/common/branches/branch-1.2/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/ivy/libraries.properties?rev=1500333r1=1500332r2=1500333view=diff
==
--- hadoop/common/branches/branch-1.2/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.2/ivy/libraries.properties Sat Jul  6 
22:24:16 2013
@@ -14,7 +14,7 @@
 #It drives ivy and the generation of a maven POM
 
 # This is the version of hadoop we are generating
-hadoop.version=1.2.0
+hadoop.version=1.2.1
 hadoop-gpl-compression.version=0.1.0
 
 #These are the versions of our dependencies (in alphabetical order)

svn commit: r1500335 - in /hadoop/common/branches/branch-1.2/src: core/ core/org/apache/hadoop/fs/ core/org/apache/hadoop/ipc/ core/org/apache/hadoop/security/ test/org/apache/hadoop/ipc/

[mattf]

Author: mattf
Date: Sat Jul  6 22:49:05 2013
New Revision: 1500335

URL: http://svn.apache.org/r1500335
Log:
Fix up a little test failure. Contributed by atm.

Modified:
hadoop/common/branches/branch-1.2/src/core/core-default.xml

hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/ipc/Client.java

hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/SaslRpcClient.java

hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/ipc/TestSaslRPC.java

Modified: hadoop/common/branches/branch-1.2/src/core/core-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/core-default.xml?rev=1500335r1=1500334r2=1500335view=diff
==
--- hadoop/common/branches/branch-1.2/src/core/core-default.xml (original)
+++ hadoop/common/branches/branch-1.2/src/core/core-default.xml Sat Jul  6 
22:49:05 2013
@@ -616,5 +616,17 @@
   /description
 /property
 
+property
+  nameipc.client.fallback-to-simple-auth-allowed/name
+  valuefalse/value
+  description
+When a client is configured to attempt a secure connection, but attempts to
+connect to an insecure server, that server may instruct the client to
+switch to SASL SIMPLE (unsecure) authentication. This setting controls
+whether or not the client will accept this instruction from the server.
+When false (the default), the client will not allow the fallback to SIMPLE
+authentication, and will abort the connection.
+  /description
+/property
 
 /configuration

Modified: 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1500335r1=1500334r2=1500335view=diff
==
--- 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
 (original)
+++ 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
 Sat Jul  6 22:49:05 2013
@@ -87,5 +87,8 @@ public class CommonConfigurationKeys {
 hadoop.jetty.logs.serve.aliases;
   public static final boolean DEFAULT_HADOOP_JETTY_LOGS_SERVE_ALIASES =
 true;
+
+  public static final String  IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY = 
ipc.client.fallback-to-simple-auth-allowed;
+  public static final boolean 
IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT = false;
 }
 

Modified: 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/ipc/Client.java?rev=1500335r1=1500334r2=1500335view=diff
==
--- 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/ipc/Client.java 
(original)
+++ 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/ipc/Client.java 
Sat Jul  6 22:49:05 2013
@@ -47,6 +47,7 @@ import javax.net.SocketFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.Writable;
@@ -87,6 +88,8 @@ public class Client {
 
   private SocketFactory socketFactory;   // how to create sockets
   private int refCount = 1;
+
+  private final boolean fallbackAllowed;
   
   final private static String PING_INTERVAL_NAME = ipc.ping.interval;
   final static int DEFAULT_PING_INTERVAL = 6; // 1 min
@@ -396,7 +399,8 @@ public class Client {
 private synchronized boolean setupSaslConnection(final InputStream in2, 
 final OutputStream out2) 
 throws IOException {
-  saslRpcClient = new SaslRpcClient(authMethod, token, serverPrincipal);
+  saslRpcClient = new SaslRpcClient(authMethod, token, serverPrincipal,
+  fallbackAllowed);
   return saslRpcClient.saslConnect(in2, out2);
 }
 
@@ -971,6 +975,8 @@ public class Client {
 this.valueClass = valueClass;
 this.conf = conf;
 this.socketFactory = factory;
+this.fallbackAllowed = 
conf.getBoolean(CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY,
+
CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT);
   }
 
   /**

Modified: 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/SaslRpcClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/SaslRpcClient.java?rev=1500335r1=1500334r2=1500335view=diff

svn commit: r1500336 - in /hadoop/common/branches/branch-1/src: core/ core/org/apache/hadoop/fs/ core/org/apache/hadoop/ipc/ core/org/apache/hadoop/security/ test/org/apache/hadoop/ipc/

[mattf]

Author: mattf
Date: Sat Jul  6 22:50:52 2013
New Revision: 1500336

URL: http://svn.apache.org/r1500336
Log:
Fix up a little test failure. Contributed by atm.

Modified:
hadoop/common/branches/branch-1/src/core/core-default.xml

hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/ipc/Client.java

hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/SaslRpcClient.java

hadoop/common/branches/branch-1/src/test/org/apache/hadoop/ipc/TestSaslRPC.java

Modified: hadoop/common/branches/branch-1/src/core/core-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/core-default.xml?rev=1500336r1=1500335r2=1500336view=diff
==
--- hadoop/common/branches/branch-1/src/core/core-default.xml (original)
+++ hadoop/common/branches/branch-1/src/core/core-default.xml Sat Jul  6 
22:50:52 2013
@@ -616,5 +616,17 @@
   /description
 /property
 
+property
+  nameipc.client.fallback-to-simple-auth-allowed/name
+  valuefalse/value
+  description
+When a client is configured to attempt a secure connection, but attempts to
+connect to an insecure server, that server may instruct the client to
+switch to SASL SIMPLE (unsecure) authentication. This setting controls
+whether or not the client will accept this instruction from the server.
+When false (the default), the client will not allow the fallback to SIMPLE
+authentication, and will abort the connection.
+  /description
+/property
 
 /configuration

Modified: 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1500336r1=1500335r2=1500336view=diff
==
--- 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/CommonConfigurationKeys.java
 Sat Jul  6 22:50:52 2013
@@ -87,5 +87,8 @@ public class CommonConfigurationKeys {
 hadoop.jetty.logs.serve.aliases;
   public static final boolean DEFAULT_HADOOP_JETTY_LOGS_SERVE_ALIASES =
 true;
+
+  public static final String  IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY = 
ipc.client.fallback-to-simple-auth-allowed;
+  public static final boolean 
IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT = false;
 }
 

Modified: 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/ipc/Client.java?rev=1500336r1=1500335r2=1500336view=diff
==
--- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/ipc/Client.java 
(original)
+++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/ipc/Client.java 
Sat Jul  6 22:50:52 2013
@@ -47,6 +47,7 @@ import javax.net.SocketFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.Writable;
@@ -87,6 +88,8 @@ public class Client {
 
   private SocketFactory socketFactory;   // how to create sockets
   private int refCount = 1;
+
+  private final boolean fallbackAllowed;
   
   final private static String PING_INTERVAL_NAME = ipc.ping.interval;
   final static int DEFAULT_PING_INTERVAL = 6; // 1 min
@@ -396,7 +399,8 @@ public class Client {
 private synchronized boolean setupSaslConnection(final InputStream in2, 
 final OutputStream out2) 
 throws IOException {
-  saslRpcClient = new SaslRpcClient(authMethod, token, serverPrincipal);
+  saslRpcClient = new SaslRpcClient(authMethod, token, serverPrincipal,
+  fallbackAllowed);
   return saslRpcClient.saslConnect(in2, out2);
 }
 
@@ -971,6 +975,8 @@ public class Client {
 this.valueClass = valueClass;
 this.conf = conf;
 this.socketFactory = factory;
+this.fallbackAllowed = 
conf.getBoolean(CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY,
+
CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT);
   }
 
   /**

Modified: 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/SaslRpcClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/SaslRpcClient.java?rev=1500336r1=1500335r2=1500336view=diff
==
--- 
hadoop/common/branches

svn commit: r1500337 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java

[mattf]

Author: mattf
Date: Sat Jul  6 23:05:14 2013
New Revision: 1500337

URL: http://svn.apache.org/r1500337
Log:
HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo. 
Contributed by Liang Xie and Jason Lowe.

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt

hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1500337r1=1500336r2=1500337view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Sat Jul  6 23:05:14 2013
@@ -13,6 +13,9 @@ Release 1.2.1 - 2013.07.06
 
   BUG FIXES
 
+HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in 
createMBeanInfo. 
+(Liang Xie and Jason Lowe, via mattf)
+
 MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs
 multiple times in JobTracker. (acmurthy)
 

Modified: 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1500337r1=1500336r2=1500337view=diff
==
--- 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
 (original)
+++ 
hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
 Sat Jul  6 23:05:14 2013
@@ -18,9 +18,9 @@
 package org.apache.hadoop.metrics.util;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.management.Attribute;
 import javax.management.AttributeList;
@@ -70,6 +70,7 @@ public abstract class MetricsDynamicMBea
   protected MetricsDynamicMBeanBase(final MetricsRegistry mr, final String 
aMBeanDescription) {
 metricsRegistry = mr;
 mbeanDescription = aMBeanDescription;
+metricsRateAttributeMod = new ConcurrentHashMapString, MetricsBase();
 createMBeanInfo();
   }
   
@@ -79,7 +80,6 @@ public abstract class MetricsDynamicMBea
   }
   
   private void createMBeanInfo() {
-metricsRateAttributeMod = new HashMapString, MetricsBase();
 boolean needsMinMaxResetOperation = false;
 ListMBeanAttributeInfo attributesInfo = new 
ArrayListMBeanAttributeInfo();
 MBeanOperationInfo[] operationsInfo = null;

svn commit: r1500339 - in /hadoop/common/branches/branch-1: CHANGES.txt src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java

[mattf]

Author: mattf
Date: Sat Jul  6 23:07:36 2013
New Revision: 1500339

URL: http://svn.apache.org/r1500339
Log:
HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo. 
Contributed by Liang Xie and Jason Lowe.

Modified:
hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)

hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1500339r1=1500338r2=1500339view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Jul  6 23:07:36 2013
@@ -84,6 +84,9 @@ Release 1.2.1 - Unreleased 
 
   BUG FIXES
 
+HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in 
createMBeanInfo. 
+(Liang Xie and Jason Lowe, via mattf)
+
 MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs
 multiple times in JobTracker. (acmurthy)
 

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1.2/CHANGES.txt:r1500337

Modified: 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1500339r1=1500338r2=1500339view=diff
==
--- 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
 Sat Jul  6 23:07:36 2013
@@ -18,9 +18,9 @@
 package org.apache.hadoop.metrics.util;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.management.Attribute;
 import javax.management.AttributeList;
@@ -70,6 +70,7 @@ public abstract class MetricsDynamicMBea
   protected MetricsDynamicMBeanBase(final MetricsRegistry mr, final String 
aMBeanDescription) {
 metricsRegistry = mr;
 mbeanDescription = aMBeanDescription;
+metricsRateAttributeMod = new ConcurrentHashMapString, MetricsBase();
 createMBeanInfo();
   }
   
@@ -79,7 +80,6 @@ public abstract class MetricsDynamicMBea
   }
   
   private void createMBeanInfo() {
-metricsRateAttributeMod = new HashMapString, MetricsBase();
 boolean needsMinMaxResetOperation = false;
 ListMBeanAttributeInfo attributesInfo = new 
ArrayListMBeanAttributeInfo();
 MBeanOperationInfo[] operationsInfo = null;

svn commit: r1500340 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java

[mattf]

Author: mattf
Date: Sat Jul  6 23:24:01 2013
New Revision: 1500340

URL: http://svn.apache.org/r1500340
Log:
MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer. 
Contributed by Vinod Kumar Vavilapalli.

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt

hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1500340r1=1500339r2=1500340view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Sat Jul  6 23:24:01 2013
@@ -13,6 +13,9 @@ Release 1.2.1 - 2013.07.06
 
   BUG FIXES
 
+MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer.
+(Vinod Kumar Vavilapalli, via mattf)
+
 HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in 
createMBeanInfo. 
 (Liang Xie and Jason Lowe, via mattf)
 

Modified: 
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java?rev=1500340r1=1500339r2=1500340view=diff
==
--- 
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java
 Sat Jul  6 23:24:01 2013
@@ -75,7 +75,7 @@ public abstract class CombineFileInputFo
   private ArrayListMultiPathFilter pools = new  ArrayListMultiPathFilter();
 
   // mapping from a rack name to the set of Nodes in the rack 
-  private static HashMapString, SetString rackToNodes = 
+  private HashMapString, SetString rackToNodes = 
 new HashMapString, SetString();
   /**
* Specify the maximum size (in bytes) of each split. Each split is
@@ -255,7 +255,8 @@ public abstract class CombineFileInputFo
 long totLength = 0;
 for (int i = 0; i  paths.length; i++) {
   files[i] = new OneFileInfo(paths[i], job, 
- rackToBlocks, blockToNodes, nodeToBlocks);
+ rackToBlocks, blockToNodes, nodeToBlocks,
+ rackToNodes);
   totLength += files[i].getLength();
 }
 
@@ -453,7 +454,8 @@ public abstract class CombineFileInputFo
 OneFileInfo(Path path, JobConf job,
 HashMapString, ListOneBlockInfo rackToBlocks,
 HashMapOneBlockInfo, String[] blockToNodes,
-HashMapString, ListOneBlockInfo nodeToBlocks)
+HashMapString, ListOneBlockInfo nodeToBlocks,
+HashMapString, SetString rackToNodes)
 throws IOException {
   this.fileSize = 0;
 
@@ -490,7 +492,7 @@ public abstract class CombineFileInputFo
 }
 blklist.add(oneblock);
 // Add this host to rackToNodes map
-addHostToRack(oneblock.racks[j], oneblock.hosts[j]);
+addHostToRack(rackToNodes, oneblock.racks[j], oneblock.hosts[j]);
  }
 
   // add this block to the node -- block map
@@ -554,7 +556,8 @@ public abstract class CombineFileInputFo
 }
   }
 
-  private static void addHostToRack(String rack, String host) {
+  private static void addHostToRack(HashMapString, SetString rackToNodes,
+   String rack, String host) {
 SetString hosts = rackToNodes.get(rack);
 if (hosts == null) {
   hosts = new HashSetString();
@@ -563,7 +566,7 @@ public abstract class CombineFileInputFo
 hosts.add(host);
   }
   
-  private static ListString getHosts(ListString racks) {
+  private ListString getHosts(ListString racks) {
 ListString hosts = new ArrayListString();
 for (String rack : racks) {
   hosts.addAll(rackToNodes.get(rack));

svn commit: r1500342 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Sat Jul  6 23:36:20 2013
New Revision: 1500342

URL: http://svn.apache.org/r1500342
Log:
MAPREDUCE-5256 not needed in branch-1.  See r1500340 in branch-1.2

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1500342r1=1500341r2=1500342view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Jul  6 23:36:20 2013
@@ -71,7 +71,7 @@ Release 1.3.0 - unreleased
 HADOOP-9678. TestRPC#testStopsAllThreads intermittently fails on Windows.
 (Ivan Mitic via cnauroth)
 
-Release 1.2.1 - Unreleased 
+Release 1.2.1 - 2013.07.06
 
   INCOMPATIBLE CHANGES
 
@@ -84,6 +84,9 @@ Release 1.2.1 - Unreleased 
 
   BUG FIXES
 
+MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer.
+(Vinod Kumar Vavilapalli, via mattf)
+
 HADOOP-9504 MetricsDynamicMBeanBase has concurrency issues in 
createMBeanInfo. 
 (Liang Xie and Jason Lowe, via mattf)
 

svn commit: r1487626 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/bylaws.xml publish/bylaws.html publish/bylaws.pdf

[mattf]

Author: mattf
Date: Wed May 29 20:06:04 2013
New Revision: 1487626

URL: http://svn.apache.org/r1487626
Log:
Updated bylaws per vote concluding May 28, 2013

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml?rev=1487626r1=1487625r2=1487626view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml 
Wed May 29 20:06:04 2013
@@ -89,6 +89,17 @@
 review, helping out users on the mailing lists, documentation,
 testing, etc./p/li
 
+   li strongRelease Manager/strong
+
+pA Release Manager (RM) is a committer who volunteers to produce 
+   a Release Candidate according to a 
+href=https://wiki.apache.org/hadoop/HowToRelease;HowToRelease/a.
+   The RM shall publish a Release Plan on the emcommon-dev@/em 
+   list stating the branch from which they intend to make a Release 
+   Candidate, at least one week before they do so. The RM is responsible 
+   for building consensus around the content of the Release Candidate, 
+   in order to achieve a successful Product Release vote./p/li
+
li strongProject Management Committee/strong
 
 pThe Project Management Committee (PMC) for Apache Hadoop was
@@ -249,13 +260,6 @@
 the code change represents a merge from a branch, in which case
 three +1s are required./p/li
 
- li strongRelease Plan/strong
-
-pDefines the timetable and actions for a release. The plan also
-nominates a Release Manager./p
-
-pLazy majority of active committers/p/li
-
  li strongProduct Release/strong
 
 pWhen a release of one of the project's products is ready, a 

Modified: hadoop/common/site/main/publish/bylaws.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1487626r1=1487625r2=1487626view=diff
==
--- hadoop/common/site/main/publish/bylaws.html (original)
+++ hadoop/common/site/main/publish/bylaws.html Wed May 29 20:06:04 2013
@@ -330,6 +330,20 @@ document.write(Last Published:  + docu
 

 li 
+strongRelease Manager/strong
+
+
+pA Release Manager (RM) is a committer who volunteers to produce 
+   a Release Candidate according to a 
href=https://wiki.apache.org/hadoop/HowToRelease;HowToRelease/a.
+   The RM shall publish a Release Plan on the emcommon-dev@/em 
+   list stating the branch from which they intend to make a Release 
+   Candidate, at least one week before they do so. The RM is responsible 
+   for building consensus around the content of the Release Candidate, 
+   in order to achieve a successful Product Release vote./p
+/li
+
+   
+li 
 strongProject Management Committee/strong
 
 
@@ -395,7 +409,7 @@ document.write(Last Published:  + docu
 /div
 
 
-a name=N10082/aa name=Decision+Making/a
+a name=N10091/aa name=Decision+Making/a
 h2 class=h3Decision Making/h2
 div class=section
 pWithin the Hadoop project, different types of decisions require
@@ -549,18 +563,6 @@ document.write(Last Published:  + docu
 
  
 li 
-strongRelease Plan/strong
-
-
-pDefines the timetable and actions for a release. The plan also
-nominates a Release Manager./p
-
-
-pLazy majority of active committers/p
-/li
-
- 
-li 
 strongProduct Release/strong
 
 

Modified: hadoop/common/site/main/publish/bylaws.pdf
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1487626r1=1487625r2=1487626view=diff
==
Binary files - no diff available.

svn commit: r1482686 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/

[mattf]

Author: mattf
Date: Wed May 15 06:19:30 2013
New Revision: 1482686

URL: http://svn.apache.org/r1482686
Log:
Updated site for release 1.2.0.

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.html
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.html
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.html
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.html
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.html
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.html
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml?rev=1482686r1=1482685r2=1482686view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
Wed May 15 06:19:30 2013
@@ -15,8 +15,8 @@
   titleDownload/title
 
   ul
-listrong1.0.X - /strong current stable version, 1.0 release/li
-listrong1.1.X - /strong current beta version, 1.1 release/li
+listrong1.1.X - /strong current stable version, 1.1 release/li
+listrong1.2.X - /strong current beta version, 1.2 release/li
 listrong2.X.X - /strong current alpha version/li
 listrong0.23.X - /strong simmilar to 2.X.X but missing NN 
HA./li
 listrong0.22.X - /strong does not include security/li
@@ -41,6 +41,30 @@
   titleNews/title
 
   section
+title13 May, 2013: Release 1.2.0 available /title
+   p This is a beta release for version 1.2.
+   /p
+p This release delivers over 200 enhancements and bug-fixes, 
+   compared to the previous 1.1.2 release.
+   Major enhancements include:
+   ul
+ liDistCp v2 backported/li
+ liWeb services for JobTracker/li
+ liWebHDFS enhancements/li
+ liExtensions of task placement and replica placement policy 
interfaces/li
+ liOffline Image Viewer backported/li
+ liNamenode more robust in case of edit log corruption/li
+ liAdd NodeGroups level to NetworkTopology/li
+ liAdd unset to Configuration API/li
+   /ul
+/p
+p Please see the a 
+href=http://hadoop.apache.org/docs/r1.2.0/releasenotes.html;
+Hadoop 1.2.0 Release Notes/a for more details.
+/p
+  /section
+
+  section
 title25 April, 2013: Release 2.0.4-alpha available /title
 p This release delivers a number of critical bug-fixes for 
 hadoop-2.x uncovered during integration testing. 

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml?rev=1482686r1=1482685r2=1482686view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml Wed 
May 15 06:19:30 2013
@@ -34,8 +34,8 @@
   docs label=Documentation 
 current label=Current href=ext:docs/current//
 stable label=Stable href=ext:docs/stable//
-r1.0.4 label=Release 1.0.4 href=ext:docs/r1.0.4//
 r1.1.2 label=Release 1.1.2 href=ext:docs/r1.1.2//
+r1.2.0 label=Release 1.2.0 href=ext:docs/r1.2.0//
 r2.0.4-alpha label=Release 2.0.4-alpha href=ext:docs/r2.0.4-alpha//
 r0.23.7 label=Release 0.23.7 href=ext:docs/r0.23.7//
   /docs
@@ -75,8 +75,8 @@
 docs href=http://hadoop.apache.org/docs/;
   current href=current//
   stable href=stable//
-  r1.0.4 href=r1.0.4//
   r1.1.2 href=r1.1.2//
+  r1.2.0 href=r1.2.0//
   r2.0.4-alpha href=r2.0.4-alpha//
   r0.23.7 href=r0.23.7//
   r0.22.0 href=r0.22.0//

Modified: hadoop/common/site/main/publish/bylaws.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev

svn commit: r1482693 - in /hadoop/common/site/main/publish/docs/r1.2.0: ./ api/ api/org/ api/org/apache/ api/org/apache/hadoop/ api/org/apache/hadoop/class-use/ api/org/apache/hadoop/classification/ a

[mattf]

Author: mattf
Date: Wed May 15 06:41:56 2013
New Revision: 1482693

URL: http://svn.apache.org/r1482693
Log:
Publishing docs for release 1.2.0.


[This commit notification would consist of 579 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1482694 - /hadoop/common/site/main/publish/docs/stable

[mattf]

Author: mattf
Date: Wed May 15 06:45:14 2013
New Revision: 1482694

URL: http://svn.apache.org/r1482694
Log:
Updating link to stable docs.

Modified:
hadoop/common/site/main/publish/docs/stable

Modified: hadoop/common/site/main/publish/docs/stable
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/docs/stable?rev=1482694r1=1482693r2=1482694view=diff
==
--- hadoop/common/site/main/publish/docs/stable (original)
+++ hadoop/common/site/main/publish/docs/stable Wed May 15 06:45:14 2013
@@ -1 +1 @@
-link r1.0.4
\ No newline at end of file
+link r1.1.2
\ No newline at end of file

svn commit: r1482700 [1/2] - /hadoop/common/branches/branch-1.2/lib/jdiff/hadoop_1.2.0.xml

[mattf]

Author: mattf
Date: Wed May 15 07:04:06 2013
New Revision: 1482700

URL: http://svn.apache.org/r1482700
Log:
JDiff output for release 1.2.0

Added:
hadoop/common/branches/branch-1.2/lib/jdiff/hadoop_1.2.0.xml

svn commit: r1482701 - /hadoop/common/branches/branch-1.2/build.xml

[mattf]

Author: mattf
Date: Wed May 15 07:07:28 2013
New Revision: 1482701

URL: http://svn.apache.org/r1482701
Log:
update jdiff.stable version

Modified:
hadoop/common/branches/branch-1.2/build.xml

Modified: hadoop/common/branches/branch-1.2/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/build.xml?rev=1482701r1=1482700r2=1482701view=diff
==
--- hadoop/common/branches/branch-1.2/build.xml (original)
+++ hadoop/common/branches/branch-1.2/build.xml Wed May 15 07:07:28 2013
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.1.2/
+  property name=jdiff.stable value=1.2.0/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1482703 [1/2] - in /hadoop/common/branches/branch-1: build.xml lib/jdiff/hadoop_1.2.0.xml

[mattf]

Author: mattf
Date: Wed May 15 07:13:32 2013
New Revision: 1482703

URL: http://svn.apache.org/r1482703
Log:
JDiff output for release 1.2.0

Added:
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.2.0.xml
Modified:
hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1482703r1=1482702r2=1482703view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Wed May 15 07:13:32 2013
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.1.2/
+  property name=jdiff.stable value=1.2.0/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1479473 - /hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Mon May  6 06:47:20 2013
New Revision: 1479473

URL: http://svn.apache.org/r1479473
Log:
updated release notes for 1.2.0

Modified:
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/releasenotes.html?rev=1479473r1=1479472r2=1479473view=diff
==
--- hadoop/common/branches/branch-1.2/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.2/src/docs/releasenotes.html Mon May  6 
06:47:20 2013
@@ -20,14 +20,6 @@
 h3Jiras with Release Notes (describe major or incompatible changes)/h3
 ul
 
-li a 
href=https://issues.apache.org/jira/browse/HADOOP-4572;HADOOP-4572/a.
- Major improvement reported by szetszwo and fixed by szetszwo br
- bINode and its sub-classes should be package private/bbr
- blockquote  Moved 
org.apache.hadoop.hdfs.{CreateEditsLog, NNThroughputBenchmark} to 
org.apache.hadoop.hdfs.server.namenode.
-
-  
-/blockquote/li
-
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-7698;HADOOP-7698/a.
  Critical bug reported by daryn and fixed by daryn (build)br
  bjsvc target fails on x86_64/bbr
@@ -42,6 +34,14 @@
  blockquoteThis jira only allows providing paths 
using back slash as separator on Windows. The back slash on *nix system will be 
used as escape character. The support for paths using back slash as path 
separator will be removed in a href=/jira/browse/HADOOP-8139 title=Path 
does not allow metachars to be escapedHADOOP-8139/a in release 23.3.
 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8817;HADOOP-8817/a.
+ Major sub-task reported by djp and fixed by djp br
+ bBackport Network Topology Extension for Virtualization (HADOOP-8468) 
to branch-1/bbr
+ blockquote  A new 4-layer 
network topology NetworkToplogyWithNodeGroup is available to make Hadoop more 
robust and efficient in virtualized environment.
+
+  
+/blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-8971;HADOOP-8971/a.
  Major improvement reported by gopalv and fixed by gopalv (util)br
  bBackport: hadoop.util.PureJavaCrc32 cache hit-ratio is low for static 
data (HADOOP-8926)/bbr
@@ -178,6 +178,12 @@ To run secure Datanodes users must insta
   
 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4737;MAPREDUCE-4737/a.
+ Major bug reported by daijy and fixed by acmurthy br
+ b Hadoop does not close output file / does not call Mapper.cleanup if 
exception in map/bbr
+ blockquoteEnsure that mapreduce APIs are 
semantically consistent with mapred API w.r.t Mapper.cleanup and 
Reducer.cleanup; in the sense that cleanup is now called even if there is an 
error. The old mapred API already ensures that Mapper.close and Reducer.close 
are invoked during error handling. Note that it is an incompatible change, 
however end-users can override Mapper.run and Reducer.run to get the old 
(inconsistent) behaviour.
+/blockquote/li
+
 /ul
 
 
@@ -294,6 +300,11 @@ To run secure Datanodes users must insta
  bAbstractDelegationTokenIdentifier#getUser() should set token auth 
type/bbr
  blockquote{{AbstractDelegationTokenIdentifier#getUser()}} returns the 
UGI associated with a token.  The UGIapos;s auth type will either be SIMPLE 
for non-proxy tokens, or PROXY (effective user) and SIMPLE (real user).  
Instead of SIMPLE, it needs to be TOKEN./blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8711;HADOOP-8711/a.
+ Major improvement reported by brandonli and fixed by brandonli (ipc)br
+ bprovide an option for IPC server users to avoid printing stack 
information for certain exceptions/bbr
+ blockquoteCurrently itapos;s hard coded in the server that it 
doesnapos;t print the exception stack for StandbyException. brbrSimilarly, 
other components may have their own exceptions which donapos;t need to save 
the stack trace in log. One example is HDFS-3817./blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-8767;HADOOP-8767/a.
  Minor bug reported by surfercrs4 and fixed by surfercrs4 (bin)br
  bsecondary namenode on slave machines/bbr
@@ -464,6 +475,11 @@ To run secure Datanodes users must insta
  bNode with one topology layer should be handled as fault topology when 
NodeGroup layer is enabled/bbr
  blockquoteCurrently, nodes with one layer topology are allowed to join 
in the cluster that with enabling NodeGroup layer which cause some exception 
cases. brWhen NodeGroup layer is enabled, the cluster should assumes that at 
least two layer (Rack/NodeGroup) is valid topology for each nodes, so should 
throw exceptions for one layer node

svn commit: r1479474 - /hadoop/common/tags/release-1.2.0-rc1/

[mattf]

Author: mattf
Date: Mon May  6 06:53:29 2013
New Revision: 1479474

URL: http://svn.apache.org/r1479474
Log:
Hadoop 1.2.0-rc1 release candidate.

Added:
hadoop/common/tags/release-1.2.0-rc1/   (props changed)
  - copied from r1479473, hadoop/common/branches/branch-1.2/

Propchange: hadoop/common/tags/release-1.2.0-rc1/
--
--- svn:ignore (added)
+++ svn:ignore Mon May  6 06:53:29 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.2.0-rc1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May  6 06:53:29 2013
@@ -0,0 +1,10 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1455883,1461952,1470660,1471078,1471747,1477769,1478517,1478524,1478997
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/common/branches/branch-1.1:1347101,1358689,1408468,1478102
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1479475 - /hadoop/common/tags/release-1.2.0-rc0/

[mattf]

Author: mattf
Date: Mon May  6 06:56:02 2013
New Revision: 1479475

URL: http://svn.apache.org/r1479475
Log:
obsolete release candidate for 1.2.0

Removed:
hadoop/common/tags/release-1.2.0-rc0/

svn commit: r1479462 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon May  6 03:06:45 2013
New Revision: 1479462

URL: http://svn.apache.org/r1479462
Log:
corrected CHANGES.txt for MAPREDUCE-4572 incorrectly recorded as a HADOOP bug 
in 1.2.0

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1479462r1=1479461r2=1479462view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May  6 03:06:45 2013
@@ -349,7 +349,7 @@ Release 1.2.0 - unreleased
 HADOOP-8611. Allow fall-back to the shell-based implementation when
 JNI-based users-group mapping fails (Robert Parker via bobby)
 
-HADOOP-4572. Can not access user logs - Jetty is not configured by default 
+MAPREDUCE-4572. Can not access user logs - Jetty is not configured by 
default 
 to serve aliases/symlinks (ahmed via tucu)
 
 MAPREDUCE-4595. TestLostTracker failing - possibly due to a race in 

svn commit: r1479463 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon May  6 03:44:51 2013
New Revision: 1479463

URL: http://svn.apache.org/r1479463
Log:
corrected CHANGES.txt to show HDFS-2751 fixed in 1.1.0 rather than 1.2.0.

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1479463r1=1479462r2=1479463view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May  6 03:44:51 2013
@@ -331,9 +331,6 @@ Release 1.2.0 - unreleased
 HADOOP-8606. FileSystem.get may return the wrong filesystem (Daryn Sharp 
 via bobby)
 
-HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads
-even for short reads.  (Brandon Li via szetszwo)
-
 HADOOP-8613. AbstractDelegationTokenIdentifier#getUser() should set token
 auth type. (daryn)
 
@@ -999,6 +996,9 @@ Release 1.1.0 - 2012.09.28
 
   BUG FIXES
 
+HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads
+even for short reads.  (Brandon Li via szetszwo)
+
 HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations
 to get around a Java library bug causing OutOfMemoryError.  (szetszwo)
 

svn commit: r1479464 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon May  6 03:55:42 2013
New Revision: 1479464

URL: http://svn.apache.org/r1479464
Log:
corrected jira reference to HDFS-4062 from HDFS-3062 in 1.2.0

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1479464r1=1479463r2=1479464view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May  6 03:55:42 2013
@@ -192,7 +192,7 @@ Release 1.2.0 - unreleased
 from -1 to 0, i.e. enable the end of edit log check but do not tolerate
 any corruption.  (szetszwo)
 
-HDFS-3062. Print logs outside the namesystem lock invalidateWorkForOneNode
+HDFS-4062. Print logs outside the namesystem lock invalidateWorkForOneNode
 and computeReplicationWorkForBlock. (Jing Zhao via suresh)
 
 HADOOP-8968. Add a flag to completely disable the worker version check.

svn commit: r1479466 - /hadoop/common/branches/branch-1.2/CHANGES.txt

[mattf]

Author: mattf
Date: Mon May  6 05:11:36 2013
New Revision: 1479466

URL: http://svn.apache.org/r1479466
Log:
corrections in CHANGES.txt as result of comparing jira and CHANGES records 
before release of 1.2.0 rc

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1479466r1=1479465r2=1479466view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Mon May  6 05:11:36 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.0 - 2013.04.16
+Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES
 
@@ -9,6 +9,9 @@ Release 1.2.0 - 2013.04.16
 
   NEW FEATURES
 
+HADOOP-8817. Backport Network Topology Extension for Virtualization 
+(from HADOOP-8468) to branch-1
+
 MAPREDUCE-4660. Update task placement policy for network topology
 with node group. (Junping Du via llu)
 
@@ -93,9 +96,6 @@ Release 1.2.0 - 2013.04.16
 HDFS-3596. Improve FSEditLog pre-allocation in branch-1
 (Colin Patrick McCabe via mattf)
 
-HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
-(Patrick Kling and harsh via eli)
-
 HADOOP-8586. Fixup a bunch of SPNEGO misspellings. (eli)
 
 HDFS-1957. Documentation for HFTP. (Ari Rabkin via eli)
@@ -126,6 +126,9 @@ Release 1.2.0 - 2013.04.16
 HADOOP-8832. Port generic service plugin mechanism from HADOOP-5257
 to branch-1. (backported by Brandon Li via suresh) 
 
+HDFS-3963. Backport namenode/datanode serviceplugin from HADOOP-5257
+to branch-1. (backported by Brandon Li via suresh)
+
 MAPREDUCE-2770. Improve hadoop.job.history.location doc in
 mapred-default.xml. (Sandy Ryza via tomwhite)
 
@@ -149,7 +152,7 @@ Release 1.2.0 - 2013.04.16
 from -1 to 0, i.e. enable the end of edit log check but do not tolerate
 any corruption.  (szetszwo)
 
-HDFS-3062. Print logs outside the namesystem lock invalidateWorkForOneNode
+HDFS-4062. Print logs outside the namesystem lock invalidateWorkForOneNode
 and computeReplicationWorkForBlock. (Jing Zhao via suresh)
 
 HADOOP-8968. Add a flag to completely disable the worker version check.
@@ -226,9 +229,6 @@ Release 1.2.0 - 2013.04.16
 MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct.
 (Junping Du via llu)
 
-MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
-race conditions.  (Sam Liu via eyang)
-
 HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
 HADOOP_SECURE_DN_PID_DIR (bobby)
 
@@ -288,9 +288,6 @@ Release 1.2.0 - 2013.04.16
 HADOOP-8606. FileSystem.get may return the wrong filesystem (Daryn Sharp 
 via bobby)
 
-HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads
-even for short reads.  (Brandon Li via szetszwo)
-
 HADOOP-8613. AbstractDelegationTokenIdentifier#getUser() should set token
 auth type. (daryn)
 
@@ -306,7 +303,7 @@ Release 1.2.0 - 2013.04.16
 HADOOP-8611. Allow fall-back to the shell-based implementation when
 JNI-based users-group mapping fails (Robert Parker via bobby)
 
-HADOOP-4572. Can not access user logs - Jetty is not configured by default 
+MAPREDUCE-4572. Can not access user logs - Jetty is not configured by 
default 
 to serve aliases/symlinks (ahmed via tucu)
 
 MAPREDUCE-4595. TestLostTracker failing - possibly due to a race in 
@@ -926,6 +923,9 @@ Release 1.1.0 - 2012.09.28
 HDFS-3814. Make the replication monitor multipliers configurable in 1.x.
 (Jing Zhao via suresh)
 
+HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
+(Patrick Kling and harsh via eli)
+
 MAPREDUCE-3289. Make use of fadvise in the NM's shuffle handler.
 (Todd Lipcon and Brandon Li via sseth)
 
@@ -956,6 +956,9 @@ Release 1.1.0 - 2012.09.28
 
   BUG FIXES
 
+HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads
+even for short reads.  (Brandon Li via szetszwo)
+
 HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations
 to get around a Java library bug causing OutOfMemoryError.  (szetszwo)
 

svn commit: r1479467 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon May  6 05:16:56 2013
New Revision: 1479467

URL: http://svn.apache.org/r1479467
Log:
corrections in CHANGES.txt as result of comparing jira and CHANGES records 
before release of 1.2.0 rc

Modified:
hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1479467r1=1479466r2=1479467view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May  6 05:16:56 2013
@@ -43,7 +43,7 @@ Release 1.3.0 - unreleased
 HDFS-4699. Additional conditions for avoiding unnecessary 
 DataNode.checkDiskError calls. (Chris Nauroth via kihwal)
 
-Release 1.2.0 - unreleased
+Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES
 
@@ -52,6 +52,9 @@ Release 1.2.0 - unreleased
 
   NEW FEATURES
 
+HADOOP-8817. Backport Network Topology Extension for Virtualization 
+(from HADOOP-8468) to branch-1
+
 MAPREDUCE-4660. Update task placement policy for network topology
 with node group. (Junping Du via llu)
 
@@ -136,9 +139,6 @@ Release 1.2.0 - unreleased
 HDFS-3596. Improve FSEditLog pre-allocation in branch-1
 (Colin Patrick McCabe via mattf)
 
-HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
-(Patrick Kling and harsh via eli)
-
 HADOOP-8586. Fixup a bunch of SPNEGO misspellings. (eli)
 
 HDFS-1957. Documentation for HFTP. (Ari Rabkin via eli)
@@ -169,6 +169,9 @@ Release 1.2.0 - unreleased
 HADOOP-8832. Port generic service plugin mechanism from HADOOP-5257
 to branch-1. (backported by Brandon Li via suresh) 
 
+HDFS-3963. Backport namenode/datanode serviceplugin from HADOOP-5257
+to branch-1. (backported by Brandon Li via suresh)
+
 MAPREDUCE-2770. Improve hadoop.job.history.location doc in
 mapred-default.xml. (Sandy Ryza via tomwhite)
 
@@ -269,9 +272,6 @@ Release 1.2.0 - unreleased
 MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct.
 (Junping Du via llu)
 
-MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
-race conditions.  (Sam Liu via eyang)
-
 HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
 HADOOP_SECURE_DN_PID_DIR (bobby)
 
@@ -966,6 +966,9 @@ Release 1.1.0 - 2012.09.28
 HDFS-3814. Make the replication monitor multipliers configurable in 1.x.
 (Jing Zhao via suresh)
 
+HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
+(Patrick Kling and harsh via eli)
+
 MAPREDUCE-3289. Make use of fadvise in the NM's shuffle handler.
 (Todd Lipcon and Brandon Li via sseth)
 

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1.2/CHANGES.txt:r1479466

svn commit: r1468336 - /hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Tue Apr 16 09:35:51 2013
New Revision: 1468336

URL: http://svn.apache.org/r1468336
Log:
Release notes for 1.2.0

Modified:
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/releasenotes.html?rev=1468336r1=1468335r2=1468336view=diff
==
--- hadoop/common/branches/branch-1.2/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.2/src/docs/releasenotes.html Tue Apr 16 
09:35:51 2013
@@ -194,6 +194,11 @@ To run secure Datanodes users must insta
  bAllow setting of end-of-record delimiter for TextInputFormat/bbr
  blockquoteThe patch for 
https://issues.apache.org/jira/browse/MAPREDUCE-2254 required minor changes to 
the LineReader class to allow extensions (see attached 2.patch). Description 
copied below:brbrIt will be useful to allow setting the end-of-record 
delimiter for TextInputFormat. The current implementation hardcodes 
apos;\napos;, apos;\rapos; or apos;\r\napos; as the only possible record 
delimiters. This is a problem if users have embedded newlines in their data 
fields (which is pretty common). This is also a problem for other 
.../blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-7101;HADOOP-7101/a.
+ Blocker bug reported by tlipcon and fixed by tlipcon (security)br
+ bUserGroupInformation.getCurrentUser() fails when called from 
non-Hadoop JAAS context/bbr
+ blockquoteIf a Hadoop client is run from inside a container like 
Tomcat, and the current AccessControlContext has a Subject associated with it 
that is not created by Hadoop, then UserGroupInformation.getCurrentUser() will 
throw NoSuchElementException, since it assumes that any Subject will have a 
hadoop User principal./blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-7688;HADOOP-7688/a.
  Major improvement reported by szetszwo and fixed by umamaheswararao br
  bWhen a servlet filter throws an exception in init(..), the Jetty 
server failed silently. /bbr
@@ -369,6 +374,11 @@ To run secure Datanodes users must insta
  bTestSinkQueue.testConcurrentConsumers fails intermittently (Backports 
HADOOP-7292)/bbr
  
blockquoteorg.apache.hadoop.metrics2.impl.TestSinkQueue.testConcurrentConsumersbr
 brbrError Messagebrbrshouldapos;ve 
thrownbrStacktracebrbrjunit.framework.AssertionFailedError: 
shouldapos;ve thrownbr at 
org.apache.hadoop.metrics2.impl.TestSinkQueue.shouldThrowCME(TestSinkQueue.java:229)br
 at 
org.apache.hadoop.metrics2.impl.TestSinkQueue.testConcurrentConsumers(TestSinkQueue.java:195)brStandard
 Outputbrbr2012-10-03 16:51:31,694 INFO  impl.TestSinkQueue 
(TestSinkQueue.java:consume(243)) - sleepingbr/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9071;HADOOP-9071/a.
+ Major improvement reported by gkesavan and fixed by gkesavan (build)br
+ bconfigure ivy log levels for resolve/retrieve/bbr
+ blockquote/blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-9090;HADOOP-9090/a.
  Minor new feature reported by mostafae and fixed by mostafae (metrics)br
  bSupport on-demand publish of metrics/bbr
@@ -439,6 +449,31 @@ To run secure Datanodes users must insta
  bPort HADOOP-7290 to branch-1 to fix TestUserGroupInformation 
failure/bbr
  blockquoteUnit test failure in 
TestUserGroupInformation.testGetServerSideGroups. port HADOOP-7290 to 
branch-1.1 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9379;HADOOP-9379/a.
+ Trivial improvement reported by arpitgupta and fixed by arpitgupta br
+ bcapture the ulimit info after printing the log to the console/bbr
+ blockquoteBased on the discussions in HADOOP-9253 people prefer if we 
dont print the ulimit info to the console but still have it in the 
logs.brbrJust need to move the head statement to before the capture of 
ulimit code./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9434;HADOOP-9434/a.
+ Minor improvement reported by carp84 and fixed by carp84 (bin)br
+ bBackport HADOOP-9267 to branch-1/bbr
+ blockquoteCurrently in hadoop 1.1.2, if user issue quot;bin/hadoop 
helpquot; in command line, it will throw below exception. We can improve this 
to print the usage 
message.br===brException in 
thread quot;mainquot; java.lang.NoClassDefFoundError: 
helpbr===brbrThis issue is 
already resolved in HADOOP-9267 in trunk, so we only need to backport it into 
branch-1/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9451;HADOOP-9451/a.
+ Major bug reported by djp and fixed by djp (net)br
+ bNode with one topology layer should be handled as fault topology when

svn commit: r1468337 - /hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Tue Apr 16 09:38:21 2013
New Revision: 1468337

URL: http://svn.apache.org/r1468337
Log:
Release notes for 1.2.0, tweak

Modified:
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.2/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/releasenotes.html?rev=1468337r1=1468336r2=1468337view=diff
==
--- hadoop/common/branches/branch-1.2/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.2/src/docs/releasenotes.html Tue Apr 16 
09:38:21 2013
@@ -10,7 +10,7 @@
/STYLE
 /head
 body
-h1Hadoop 1.2.0 Release Notes - Preliminary/h1
+h1Hadoop 1.2.0 Release Notes/h1
These release notes include new developer and user-facing 
incompatibilities, features, and major improvements. 
 
 a name=changes/

svn commit: r1468339 - /hadoop/common/branches/branch-1.2/CHANGES.txt

[mattf]

Author: mattf
Date: Tue Apr 16 09:39:48 2013
New Revision: 1468339

URL: http://svn.apache.org/r1468339
Log:
prepare for 1.2.0 release build

Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1468339r1=1468338r2=1468339view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Tue Apr 16 09:39:48 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.0 - unreleased
+Release 1.2.0 - 2013.04.16
 
   INCOMPATIBLE CHANGES
 

svn commit: r1468342 - /hadoop/common/tags/release-1.2.0-rc0/

[mattf]

Author: mattf
Date: Tue Apr 16 09:44:16 2013
New Revision: 1468342

URL: http://svn.apache.org/r1468342
Log:
Hadoop 1.2.0-rc0 release candidate.

Added:
hadoop/common/tags/release-1.2.0-rc0/   (props changed)
  - copied from r1468341, hadoop/common/branches/branch-1.2/

Propchange: hadoop/common/tags/release-1.2.0-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Tue Apr 16 09:44:16 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.2.0-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 16 09:44:16 2013
@@ -0,0 +1,10 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1455883,1461952
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/common/branches/branch-1.1:1347101,1358689,1408468
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1454891 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Sun Mar 10 18:31:47 2013
New Revision: 1454891

URL: http://svn.apache.org/r1454891
Log:
correct locations of some items in CHANGES.txt from 1.2.0 to 1.1.2

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1454891r1=1454890r2=1454891view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Mar 10 18:31:47 2013
@@ -12,9 +12,6 @@ Release 1.2.0 - unreleased
 MAPREDUCE-4660. Update task placement policy for network topology
 with node group. (Junping Du via llu)
 
-HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child
-hadoop client processes. (Yu Gao via llu)
-
 HADOOP-8023. Add unset() method to Configuration (tucu)
 
 MAPREDUCE-4355. Add RunningJob.getJobStatus() (kkambatl via tucu)
@@ -137,9 +134,6 @@ Release 1.2.0 - unreleased
 HDFS-3062. Print logs outside the namesystem lock invalidateWorkForOneNode
 and computeReplicationWorkForBlock. (Jing Zhao via suresh)
 
-HADOOP-8567. Port conf servlet to dump running configuration to branch 1.x.
-(Jing Zhao via suresh)
-
 HADOOP-8968. Add a flag to completely disable the worker version check.
 (tucu via eli)
 
@@ -183,8 +177,6 @@ Release 1.2.0 - unreleased
 HDFS-4551. When copying bytes in DatanodeWebHdfsMethods OPEN, use 4096
 buffer size to improve performance.  (Mark Wagner via szetszwo)
 
-  OPTIMIZATIONS
-
 HDFS-2533. Backport: Remove needless synchronization on some FSDataSet
 methods.  (Brandon Li via szetszwo)
 
@@ -193,25 +185,12 @@ Release 1.2.0 - unreleased
 
   BUG FIXES
 
-HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
-
 MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct.
 (Junping Du via llu)
 
-MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant.
-(Yu Gao via llu)
-
-HADOOP-9051 Fix ant clean/test with circular symlinks in build dir. (llu)
-
-MAPREDUCE-4396. Port support private distributed cache to 
-LocalJobRunner from branch-1-win. (Yu Gao via eyang)
-
 MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
 race conditions.  (Sam Liu via eyang)
 
-HADOOP-8418. Update UGI Principal classes name for running with
-IBM JDK on 64 bits Windows.  (Yu Gao via eyang)
-
 HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
 HADOOP_SECURE_DN_PID_DIR (bobby)
 
@@ -545,16 +524,35 @@ Release 1.1.2 - 2013.01.30
 
   NEW FEATURES
 
-  IMPROVEMENTS
-
 MAPREDUCE-4397. Introduce HADOOP_SECURITY_CONF_DIR for task-controller.
 (Yu Gao via llu)
 
+HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child
+hadoop client processes. (Yu Gao via llu)
+
+  IMPROVEMENTS
+
 HDFS-4252. Improve confusing log message that prints exception when 
editlog 
 read is completed. (Jing Zhao via suresh)
 
+HADOOP-8567. Port conf servlet to dump running configuration to branch 1.x.
+(Jing Zhao via suresh)
+
   BUG FIXES
 
+HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
+
+MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant.
+(Yu Gao via llu)
+
+HADOOP-9051 Fix ant clean/test with circular symlinks in build dir. (llu)
+
+MAPREDUCE-4396. Port support private distributed cache to
+LocalJobRunner from branch-1-win. (Yu Gao via eyang)
+
+HADOOP-8418. Update UGI Principal classes name for running with
+IBM JDK on 64 bits Windows.  (Yu Gao via eyang)
+
 MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
 race conditions.  (Sam Liu via eyang)
 

svn commit: r1454892 - /hadoop/common/branches/branch-1.2/

[mattf]

Author: mattf
Date: Sun Mar 10 18:36:00 2013
New Revision: 1454892

URL: http://svn.apache.org/r1454892
Log:
Branching for 1.2 releases

Added:
hadoop/common/branches/branch-1.2/   (props changed)
  - copied from r1454891, hadoop/common/branches/branch-1/

Propchange: hadoop/common/branches/branch-1.2/
--
--- svn:ignore (added)
+++ svn:ignore Sun Mar 10 18:36:00 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/branches/branch-1.2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Mar 10 18:36:00 2013
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/common/branches/branch-1.1:1347101,1358689,1408468
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1454900 - /hadoop/common/branches/branch-1.1/ivy/libraries.properties

[mattf]

Author: mattf
Date: Sun Mar 10 19:26:36 2013
New Revision: 1454900

URL: http://svn.apache.org/r1454900
Log:
fixed hadoop.version default value to match current version 1.1.3

Modified:
hadoop/common/branches/branch-1.1/ivy/libraries.properties

Modified: hadoop/common/branches/branch-1.1/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/ivy/libraries.properties?rev=1454900r1=1454899r2=1454900view=diff
==
--- hadoop/common/branches/branch-1.1/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.1/ivy/libraries.properties Sun Mar 10 
19:26:36 2013
@@ -14,7 +14,7 @@
 #It drives ivy and the generation of a maven POM
 
 # This is the version of hadoop we are generating
-hadoop.version=1.1.0
+hadoop.version=1.1.3
 hadoop-gpl-compression.version=0.1.0
 
 #These are the versions of our dependencies (in alphabetical order)

svn commit: r1454902 - in /hadoop/common/branches/branch-1: CHANGES.txt build.xml ivy/libraries.properties

[mattf]

Author: mattf
Date: Sun Mar 10 19:37:00 2013
New Revision: 1454902

URL: http://svn.apache.org/r1454902
Log:
Preparing for 1.3.0 development on branch-1

Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/build.xml
hadoop/common/branches/branch-1/ivy/libraries.properties

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1454902r1=1454901r2=1454902view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Mar 10 19:37:00 2013
@@ -1,5 +1,16 @@
 Hadoop Change Log
 
+Release 1.3.0 - unreleased
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  BUG FIXES
+
+
 Release 1.2.0 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1454902r1=1454901r2=1454902view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Sun Mar 10 19:37:00 2013
@@ -28,7 +28,7 @@
  
   property name=Name value=Hadoop/
   property name=name value=hadoop/
-  property name=version value=1.2.0-SNAPSHOT/
+  property name=version value=1.3.0-SNAPSHOT/
   property name=final.name value=${name}-${version}/
   property name=test.final.name value=${name}-test-${version}/
   property name=year value=2009/

Modified: hadoop/common/branches/branch-1/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/libraries.properties?rev=1454902r1=1454901r2=1454902view=diff
==
--- hadoop/common/branches/branch-1/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1/ivy/libraries.properties Sun Mar 10 
19:37:00 2013
@@ -14,7 +14,7 @@
 #It drives ivy and the generation of a maven POM
 
 # This is the version of hadoop we are generating
-hadoop.version=1.2.0
+hadoop.version=1.3.0
 hadoop-gpl-compression.version=0.1.0
 
 #These are the versions of our dependencies (in alphabetical order)

svn commit: r1454931 [1/2] - /hadoop/common/branches/branch-1/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Sun Mar 10 22:16:14 2013
New Revision: 1454931

URL: http://svn.apache.org/r1454931
Log:
update release notes on branch-1 to match latest 1.1.2 release

Modified:
hadoop/common/branches/branch-1/src/docs/releasenotes.html

svn commit: r1454934 [1/2] - in /hadoop/common/branches/branch-1.2: build.xml src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Sun Mar 10 22:26:14 2013
New Revision: 1454934

URL: http://svn.apache.org/r1454934
Log:
Preparing for release 1.2.0

Modified:
hadoop/common/branches/branch-1.2/build.xml
hadoop/common/branches/branch-1.2/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.2/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/build.xml?rev=1454934r1=1454933r2=1454934view=diff
==
--- hadoop/common/branches/branch-1.2/build.xml (original)
+++ hadoop/common/branches/branch-1.2/build.xml Sun Mar 10 22:26:14 2013
@@ -28,7 +28,7 @@
  
   property name=Name value=Hadoop/
   property name=name value=hadoop/
-  property name=version value=1.2.0-SNAPSHOT/
+  property name=version value=1.2.1-SNAPSHOT/
   property name=final.name value=${name}-${version}/
   property name=test.final.name value=${name}-test-${version}/
   property name=year value=2009/

svn commit: r1453195 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/

[mattf]

Author: mattf
Date: Wed Mar  6 08:12:17 2013
New Revision: 1453195

URL: http://svn.apache.org/r1453195
Log:
Updated docs site for release 1.1.2

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.html
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.html
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.html
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.html
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.html
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.html
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml?rev=1453195r1=1453194r2=1453195view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
Wed Mar  6 08:12:17 2013
@@ -41,6 +41,14 @@
   titleNews/title
 
   section
+title15 February, 2013: Release 1.1.2 available /title
+p Point release for the 1.1.X line. Bug fixes and improvements, 
as documented in the a 
+href=http://hadoop.apache.org/docs/r1.1.2/releasenotes.html;
+Hadoop 1.1.2 Release Notes/a. 
+/p
+  /section
+
+  section
 title14 February, 2013: Release 2.0.3-alpha available /title
 p This is the latest (alpha) version in the hadoop-2.x series.
 /p

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml?rev=1453195r1=1453194r2=1453195view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml Wed 
Mar  6 08:12:17 2013
@@ -35,7 +35,7 @@
 current label=Current href=ext:docs/current//
 stable label=Stable href=ext:docs/stable//
 r1.0.4 label=Release 1.0.4 href=ext:docs/r1.0.4//
-r1.1.1 label=Release 1.1.1 href=ext:docs/r1.1.1//
+r1.1.2 label=Release 1.1.2 href=ext:docs/r1.1.2//
 r2.0.3-alpha label=Release 2.0.3-alpha href=ext:docs/r2.0.3-alpha//
 r0.23.6 label=Release 0.23.6 href=ext:docs/r0.23.6//
   /docs
@@ -76,7 +76,7 @@
   current href=current//
   stable href=stable//
   r1.0.4 href=r1.0.4//
-  r1.1.1 href=r1.1.1//
+  r1.1.2 href=r1.1.2//
   r2.0.3-alpha href=r2.0.3-alpha//
   r0.23.6 href=r0.23.6//
   r0.22.0 href=r0.22.0//

Modified: hadoop/common/site/main/publish/bylaws.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1453195r1=1453194r2=1453195view=diff
==
--- hadoop/common/site/main/publish/bylaws.html (original)
+++ hadoop/common/site/main/publish/bylaws.html Wed Mar  6 08:12:17 2013
@@ -161,7 +161,7 @@ document.write(Last Published:  + docu
 a href=http://hadoop.apache.org/docs/r1.0.4/;Release 1.0.4/a
 /div
 div class=menuitem
-a href=http://hadoop.apache.org/docs/r1.1.1/;Release 1.1.1/a
+a href=http://hadoop.apache.org/docs/r1.1.2/;Release 1.1.2/a
 /div
 div class=menuitem
 a href=http://hadoop.apache.org/docs/r2.0.3-alpha/;Release 2.0.3-alpha/a

Modified: hadoop/common/site/main/publish/bylaws.pdf
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1453195r1=1453194r2=1453195view=diff
==
Binary files - no diff available.

Modified: hadoop/common/site/main/publish/index.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.html?rev=1453195r1=1453194r2=1453195view=diff
==
--- hadoop/common/site/main/publish/index.html (original)
+++ hadoop/common/site/main/publish/index.html Wed Mar  6 08:12:17 2013
@@ -161,7 +161,7 @@ document.write(Last Published:  + docu
 a href=http

svn commit: r1453210 - in /hadoop/common/site/main/publish/docs/r1.1.2: ./ api/ api/org/ api/org/apache/ api/org/apache/hadoop/ api/org/apache/hadoop/class-use/ api/org/apache/hadoop/classification/ a

[mattf]

Author: mattf
Date: Wed Mar  6 08:41:57 2013
New Revision: 1453210

URL: http://svn.apache.org/r1453210
Log:
Publishing docs for release 1.1.2


[This commit notification would consist of 569 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1453231 [1/2] - /hadoop/common/branches/branch-1.1/lib/jdiff/hadoop_1.1.2.xml

[mattf]

Author: mattf
Date: Wed Mar  6 09:15:14 2013
New Revision: 1453231

URL: http://svn.apache.org/r1453231
Log:
JDiff output for release 1.1.2

Added:
hadoop/common/branches/branch-1.1/lib/jdiff/hadoop_1.1.2.xml

svn commit: r1453232 [1/2] - in /hadoop/common/branches/branch-1: build.xml lib/jdiff/hadoop_1.1.2.xml

[mattf]

Author: mattf
Date: Wed Mar  6 09:22:25 2013
New Revision: 1453232

URL: http://svn.apache.org/r1453232
Log:
JDiff output for release 1.1.2

Added:
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.1.2.xml
Modified:
hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1453232r1=1453231r2=1453232view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Wed Mar  6 09:22:25 2013
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.1.1/
+  property name=jdiff.stable value=1.1.2/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1453174 - in /hadoop/common/tags: release-1.1.2-rc5/ release-1.1.2/

[mattf]

Author: mattf
Date: Wed Mar  6 07:08:12 2013
New Revision: 1453174

URL: http://svn.apache.org/r1453174
Log:
Hadoop 1.1.2 release.

Added:
hadoop/common/tags/release-1.1.2/   (props changed)
  - copied from r1453173, hadoop/common/tags/release-1.1.2-rc5/
Removed:
hadoop/common/tags/release-1.1.2-rc5/

Propchange: hadoop/common/tags/release-1.1.2/
--
--- svn:ignore (added)
+++ svn:ignore Wed Mar  6 07:08:12 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar  6 07:08:12 2013
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238,1440259
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1441242 - /hadoop/common/tags/release-1.1.2-rc0/

[mattf]

Author: mattf
Date: Thu Jan 31 22:50:01 2013
New Revision: 1441242

URL: http://svn.apache.org/viewvc?rev=1441242view=rev
Log:
cleanup after posting 1.1.2-rc5

Removed:
hadoop/common/tags/release-1.1.2-rc0/

svn commit: r1441243 - /hadoop/common/tags/release-1.1.2-rc1/

[mattf]

Author: mattf
Date: Thu Jan 31 22:50:20 2013
New Revision: 1441243

URL: http://svn.apache.org/viewvc?rev=1441243view=rev
Log:
cleanup after posting 1.1.2-rc5

Removed:
hadoop/common/tags/release-1.1.2-rc1/

svn commit: r1440782 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Thu Jan 31 01:42:55 2013
New Revision: 1440782

URL: http://svn.apache.org/viewvc?rev=1440782view=rev
Log:
update release notes and release date for 1.1.2-rc5

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1440782r1=1440781r2=1440782view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Thu Jan 31 01:42:55 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.1.2 - 2013.01.27
+Release 1.1.2 - 2013.01.30
 
   INCOMPATIBLE CHANGES
 

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1440782r1=1440781r2=1440782view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Thu Jan 31 
01:42:55 2013
@@ -99,6 +99,11 @@
  bImprove confusing log message that prints exception when editlog read 
is completed/bbr
  blockquoteNamenode prints a log with an exception to indicate 
successful completion of reading of logs. This causes misunderstanding where 
people have interpreted it as failure to load editlog. The log message could be 
better./blockquote/li
 
+li a href=https://issues.apache.org/jira/browse/HDFS-4423;HDFS-4423/a.
+ Blocker bug reported by chenfolin and fixed by cnauroth (namenode)br
+ bCheckpoint exception causes fatal damage to fsimage./bbr
+ blockquoteThe impact of class is 
org.apache.hadoop.hdfs.server.namenode.FSImage.javabr{code}brboolean 
loadFSImage(MetaRecoveryContext recovery) throws IOException 
{br...brlatestNameSD.read();brneedToSave |= 
loadFSImage(getImageFile(latestNameSD, NameNodeFile.IMAGE));br
LOG.info(quot;Image file of size quot; + imageSize + quot; loaded in quot; 
br+ (FSNamesystem.now() - startTime)/1000 + quot; 
seconds.quot;);brbr// Load latest editsbrif 
(latestNameCheckpointTime gt; latestEditsCheckpointTime)br  // the image 
i.../blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-2374;MAPREDUCE-2374/a.
  Major bug reported by tlipcon and fixed by adi2 br
  bquot;Text File Busyquot; errors launching MR tasks/bbr

svn commit: r1440786 - /hadoop/common/tags/release-1.1.2-rc5/

[mattf]

Author: mattf
Date: Thu Jan 31 01:56:19 2013
New Revision: 1440786

URL: http://svn.apache.org/viewvc?rev=1440786view=rev
Log:
Hadoop 1.1.2-rc5 release.

Added:
hadoop/common/tags/release-1.1.2-rc5/   (props changed)
  - copied from r1440785, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.2-rc5/
--
--- svn:ignore (added)
+++ svn:ignore Thu Jan 31 01:56:19 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2-rc5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 31 01:56:19 2013
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238,1440259
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1439293 - /hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Mon Jan 28 08:07:15 2013
New Revision: 1439293

URL: http://svn.apache.org/viewvc?rev=1439293view=rev
Log:
Hadoop 1.1.2-rc3 release candidate, with corrected release notes

Modified:
hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html

Modified: hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html?rev=1439293r1=1439292r2=1439293view=diff
==
--- hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html (original)
+++ hadoop/common/tags/release-1.1.2-rc3/src/docs/releasenotes.html Mon Jan 28 
08:07:15 2013
@@ -54,11 +54,26 @@
 h3Other Jiras (describe bug fixes and minor changes)/h3
 ul
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8418;HADOOP-8418/a.
+ Major bug reported by vicaya and fixed by crystal_gaoyu (security)br
+ bFix UGI for IBM JDK running on Windows/bbr
+ blockquoteThe login module and user principal classes are different for 
32 and 64-bit Windows in IBM J9 JDK 6 SR10. Hadoop 1.0.3 does not run on either 
because it uses the 32 bit login module and the 64-bit user principal 
class./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8561;HADOOP-8561/a.
+ Major improvement reported by vicaya and fixed by crystal_gaoyu 
(security)br
+ bIntroduce HADOOP_PROXY_USER for secure impersonation in child hadoop 
client processes/bbr
+ blockquoteTo solve the problem for an authenticated user to type hadoop 
shell commands in a web console, we can introduce an HADOOP_PROXY_USER 
environment variable to allow proper impersonation in the child hadoop client 
processes./blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-8880;HADOOP-8880/a.
  Major bug reported by gkesavan and fixed by gkesavan br
  bMissing jersey jars as dependency in the pom causes hive tests to 
fail/bbr
  blockquoteivy.xml has the dependency included where as the same 
dependency is not updated in the pom template./blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9051;HADOOP-9051/a.
+ Minor test reported by mg...@vmware.com and fixed by vicaya (test)br
+ bÒant testÓ will build failed for  trying to delete a file/bbr
+ blockquoteRun quot;ant testquot; on branch-1 of 
hadoop-common.brWhen the test process reach 
quot;test-core-excluding-commit-and-smokequot;brbrIt will invoke the 
quot;macro-test-runnerquot; to clear and rebuild the test 
environment.brThen the ant task command  lt;delete 
dir=quot;@{test.dir}/logsquot; /gt;brfailed for trying to delete an 
non-existent file.brbrfollowing is the test result 
logs:brtest-core-excluding-commit-and-smoke:br   [delete] Deleting: 
/home/jdu/bdc/hadoop-topology-branch1-new/hadoop-common/build/test/testsfailedbr
   [delete] Dele.../blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-9111;HADOOP-9111/a.
  Minor improvement reported by jingzhao and fixed by jingzhao (test)br
  bFix failed testcases with @ignore annotation In branch-1/bbr
@@ -84,6 +99,21 @@
  bquot;Text File Busyquot; errors launching MR tasks/bbr
  blockquoteSome very small percentage of tasks fail with a quot;Text 
file busyquot; error.brbrThe following was the original 
diagnosis:br{quote}brOur use of PrintWriter in TaskController.writeCommand 
is unsafe, since that class swallows all IO exceptions. Weapos;re not 
currently checking for errors, which Iapos;m seeing result in occasional task 
failures with the message quot;Text file busyquot; - assumedly because the 
close() call is failing silently for some reason.br{quote}br.. but turned 
out to be another issue as well (see below)/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4272;MAPREDUCE-4272/a.
+ Major bug reported by vicaya and fixed by crystal_gaoyu (task)br
+ bSortedRanges.Range#compareTo is not spec compliant/bbr
+ blockquoteSortedRanges.Range#compareTo does not satisfy the requirement 
of Comparable#compareTo, where quot;the implementor must ensure 
{noformat}sgn(x.compareTo(y)) == -sgn(y.compareTo(x)){noformat} for all x and 
y.quot;brbrThis is manifested as TestStreamingBadRecords failures in 
alternative JDKs./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4396;MAPREDUCE-4396/a.
+ Minor bug reported by vicaya and fixed by crystal_gaoyu (client)br
+ bMake LocalJobRunner work with private distributed cache/bbr
+ blockquoteSome LocalJobRunner related unit tests fails if user 
directory permission and/or umask is too restrictive./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4397;MAPREDUCE-4397/a.
+ Major improvement reported by vicaya and fixed by crystal_gaoyu 
(task-controller)br
+ bIntroduce HADOOP_SECURITY_CONF_DIR for task-controller/bbr
+ blockquoteThe

svn commit: r1439481 - /hadoop/common/branches/branch-1.1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon Jan 28 16:33:19 2013
New Revision: 1439481

URL: http://svn.apache.org/viewvc?rev=1439481view=rev
Log:
update release date in CHANGES.txt for release candidate 1.1.2-rc4

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1439481r1=1439480r2=1439481view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Jan 28 16:33:19 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.1.2 - 2012.12.07
+Release 1.1.2 - 2013.01.27
 
   INCOMPATIBLE CHANGES
 

svn commit: r1439605 - /hadoop/common/tags/release-1.1.2-rc4/

[mattf]

Author: mattf
Date: Mon Jan 28 20:06:54 2013
New Revision: 1439605

URL: http://svn.apache.org/viewvc?rev=1439605view=rev
Log:
Hadoop 1.1.2-rc4 release candidate.

Added:
hadoop/common/tags/release-1.1.2-rc4/   (props changed)
  - copied from r1439604, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.2-rc4/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jan 28 20:06:54 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2-rc4/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 28 20:06:54 2013
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1439266 - /hadoop/common/branches/branch-1.1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon Jan 28 06:15:08 2013
New Revision: 1439266

URL: http://svn.apache.org/viewvc?rev=1439266view=rev
Log:
corrected spelling in CHANGES.txt for MAPREDUCE-4397 entry.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1439266r1=1439265r2=1439266view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Jan 28 06:15:08 2013
@@ -6,7 +6,7 @@ Release 1.1.2 - 2012.12.07
 
   NEW FEATURES
 
-MAPREUDCE-4397. Introduce HADOOP_SECURITY_CONF_DIR for task-controller.
+MAPREDUCE-4397. Introduce HADOOP_SECURITY_CONF_DIR for task-controller.
 (Yu Gao via llu)
 
 HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child

svn commit: r1439267 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon Jan 28 06:17:09 2013
New Revision: 1439267

URL: http://svn.apache.org/viewvc?rev=1439267view=rev
Log:
corrected spelling in CHANGES.txt for MAPREDUCE-4397 entry and moved it from 
1.2.0 to 1.1.2.

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1439267r1=1439266r2=1439267view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Jan 28 06:17:09 2013
@@ -6,9 +6,6 @@ Release 1.2.0 - unreleased
 
   NEW FEATURES
 
-MAPREUDCE-4397. Introduce HADOOP_SECURITY_CONF_DIR for task-controller.
-(Yu Gao via llu)
-
 MAPREDUCE-4660. Update task placement policy for network topology
 with node group. (Junping Du via llu)
 
@@ -465,6 +462,9 @@ Release 1.1.2 - Unreleased
 
   IMPROVEMENTS
 
+MAPREDUCE-4397. Introduce HADOOP_SECURITY_CONF_DIR for task-controller.
+(Yu Gao via llu)
+
 HDFS-4252. Improve confusing log message that prints exception when 
editlog 
 read is completed. (Jing Zhao via suresh)
 

svn commit: r1439271 - /hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java

[mattf]

Author: mattf
Date: Mon Jan 28 06:27:05 2013
New Revision: 1439271

URL: http://svn.apache.org/viewvc?rev=1439271view=rev
Log:
finish submission for MAPREDUCE-4396.  Include unit test from HADOOP-8734.

Modified:

hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java?rev=1439271r1=1439270r2=1439271view=diff
==
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
 Mon Jan 28 06:27:05 2013
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
@@ -133,6 +134,10 @@ public class TestMRWithDistributedCache 
 makeJar(new Path(TEST_ROOT_DIR, distributed.third.jar), 3);
 Path fourth =
 makeJar(new Path(TEST_ROOT_DIR, distributed.fourth.jar), 4);
+// Change permissions on one file to be private (others cannot read
+// the file) to make sure private distributed cache works fine with
+// the LocalJobRunner.
+FileUtil.chmod(fourth.toUri().getPath(), 700);
 
 // Creates the Job Configuration
 DistributedCache.addCacheFile(

svn commit: r1439273 - /hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java

[mattf]

Author: mattf
Date: Mon Jan 28 06:28:17 2013
New Revision: 1439273

URL: http://svn.apache.org/viewvc?rev=1439273view=rev
Log:
finish submission for MAPREDUCE-4396.  Include unit test from HADOOP-8734.

Modified:

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java

Modified: 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java?rev=1439273r1=1439272r2=1439273view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java
 Mon Jan 28 06:28:17 2013
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
@@ -133,6 +134,10 @@ public class TestMRWithDistributedCache 
 makeJar(new Path(TEST_ROOT_DIR, distributed.third.jar), 3);
 Path fourth =
 makeJar(new Path(TEST_ROOT_DIR, distributed.fourth.jar), 4);
+// Change permissions on one file to be private (others cannot read
+// the file) to make sure private distributed cache works fine with
+// the LocalJobRunner.
+FileUtil.chmod(fourth.toUri().getPath(), 700);
 
 // Creates the Job Configuration
 DistributedCache.addCacheFile(

svn commit: r1439283 - /hadoop/common/tags/release-1.1.2-rc3/

[mattf]

Author: mattf
Date: Mon Jan 28 07:42:30 2013
New Revision: 1439283

URL: http://svn.apache.org/viewvc?rev=1439283view=rev
Log:
Hadoop 1.1.2-rc3 release candidate

Added:
hadoop/common/tags/release-1.1.2-rc3/   (props changed)
  - copied from r1425193, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.2-rc3/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jan 28 07:42:30 2013
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2-rc3/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 28 07:42:30 2013
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1439288 - /hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Mon Jan 28 07:51:58 2013
New Revision: 1439288

URL: http://svn.apache.org/viewvc?rev=1439288view=rev
Log:
release notes for Hadoop 1.1.2-rc4 release candidate

Modified:
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1439288r1=1439287r2=1439288view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Mon Jan 28 
07:51:58 2013
@@ -54,11 +54,31 @@
 h3Other Jiras (describe bug fixes and minor changes)/h3
 ul
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8418;HADOOP-8418/a.
+ Major bug reported by vicaya and fixed by crystal_gaoyu (security)br
+ bFix UGI for IBM JDK running on Windows/bbr
+ blockquoteThe login module and user principal classes are different for 
32 and 64-bit Windows in IBM J9 JDK 6 SR10. Hadoop 1.0.3 does not run on either 
because it uses the 32 bit login module and the 64-bit user principal 
class./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8419;HADOOP-8419/a.
+ Major bug reported by vicaya and fixed by carp84 (io)br
+ bGzipCodec NPE upon reset with IBM JDK/bbr
+ blockquoteThe GzipCodec will NPE upon reset after finish when the 
native zlib codec is not loaded. When the native zlib is loaded the codec 
creates a CompressorOutputStream that doesnapos;t have the problem, otherwise, 
the GZipCodec uses GZIPOutputStream which is extended to provide the resetState 
method. Since IBM JDK 6 SR9 FP2 including the current JDK 6 SR10, 
GZIPOutputStream#finish will release the underlying deflater, which causes NPE 
upon reset. This seems to be an IBM JDK quirk as Sun JDK and 
OpenJD.../blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8561;HADOOP-8561/a.
+ Major improvement reported by vicaya and fixed by crystal_gaoyu 
(security)br
+ bIntroduce HADOOP_PROXY_USER for secure impersonation in child hadoop 
client processes/bbr
+ blockquoteTo solve the problem for an authenticated user to type hadoop 
shell commands in a web console, we can introduce an HADOOP_PROXY_USER 
environment variable to allow proper impersonation in the child hadoop client 
processes./blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-8880;HADOOP-8880/a.
  Major bug reported by gkesavan and fixed by gkesavan br
  bMissing jersey jars as dependency in the pom causes hive tests to 
fail/bbr
  blockquoteivy.xml has the dependency included where as the same 
dependency is not updated in the pom template./blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9051;HADOOP-9051/a.
+ Minor test reported by mg...@vmware.com and fixed by vicaya (test)br
+ bÒant testÓ will build failed for  trying to delete a file/bbr
+ blockquoteRun quot;ant testquot; on branch-1 of 
hadoop-common.brWhen the test process reach 
quot;test-core-excluding-commit-and-smokequot;brbrIt will invoke the 
quot;macro-test-runnerquot; to clear and rebuild the test 
environment.brThen the ant task command  lt;delete 
dir=quot;@{test.dir}/logsquot; /gt;brfailed for trying to delete an 
non-existent file.brbrfollowing is the test result 
logs:brtest-core-excluding-commit-and-smoke:br   [delete] Deleting: 
/home/jdu/bdc/hadoop-topology-branch1-new/hadoop-common/build/test/testsfailedbr
   [delete] Dele.../blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-9111;HADOOP-9111/a.
  Minor improvement reported by jingzhao and fixed by jingzhao (test)br
  bFix failed testcases with @ignore annotation In branch-1/bbr
@@ -84,6 +104,21 @@
  bquot;Text File Busyquot; errors launching MR tasks/bbr
  blockquoteSome very small percentage of tasks fail with a quot;Text 
file busyquot; error.brbrThe following was the original 
diagnosis:br{quote}brOur use of PrintWriter in TaskController.writeCommand 
is unsafe, since that class swallows all IO exceptions. Weapos;re not 
currently checking for errors, which Iapos;m seeing result in occasional task 
failures with the message quot;Text file busyquot; - assumedly because the 
close() call is failing silently for some reason.br{quote}br.. but turned 
out to be another issue as well (see below)/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4272;MAPREDUCE-4272/a.
+ Major bug reported by vicaya and fixed by crystal_gaoyu (task)br
+ bSortedRanges.Range#compareTo is not spec compliant/bbr
+ blockquoteSortedRanges.Range#compareTo does not satisfy the requirement 
of Comparable#compareTo, where quot;the implementor must ensure 
{noformat}sgn(x.compareTo(y)) == -sgn(y.compareTo(x)){noformat} for all x and 
y.quot;brbrThis

svn commit: r1418509 - /hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Fri Dec  7 22:18:36 2012
New Revision: 1418509

URL: http://svn.apache.org/viewvc?rev=1418509view=rev
Log:
release notes for 1.1.2 candidate

Modified:
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1418509r1=1418508r2=1418509view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Fri Dec  7 
22:18:36 2012
@@ -104,6 +104,16 @@
  bTestJobHistoryServer fails some times with 
apos;java.lang.AssertionError: Address already in useapos;/bbr
  blockquoteUT Failure in IHC 1.0.3: 
org.apache.hadoop.mapred.TestJobHistoryServer. This UT fails 
sometimes.brbrThe error message is:brapos;Testcase: 
testHistoryServerStandalone took 5.376 secbr   Caused an ERRORbrAddress 
already in usebrjava.lang.AssertionError: Address already in usebr   at 
org.apache.hadoop.mapred.TestJobHistoryServer.testHistoryServerStandalone(TestJobHistoryServer.java:113)apos;/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4858;MAPREDUCE-4858/a.
+ Major bug reported by acmurthy and fixed by acmurthy br
+ bTestWebUIAuthorization fails on branch-1/bbr
+ blockquoteTestWebUIAuthorization fails on branch-1/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4859;MAPREDUCE-4859/a.
+ Major bug reported by acmurthy and fixed by acmurthy br
+ bTestRecoveryManager fails on branch-1/bbr
+ blockquoteLooks like the tests are extremely flaky and just 
hang./blockquote/li
+
 
 /ul
 

svn commit: r1418189 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Fri Dec  7 05:22:16 2012
New Revision: 1418189

URL: http://svn.apache.org/viewvc?rev=1418189view=rev
Log:
prepare for Hadoop release-1.1.2-rc1

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1418189r1=1418188r2=1418189view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Fri Dec  7 05:22:16 2012
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.1.2 - 2012.12.05
+Release 1.1.2 - 2012.12.07
 
   INCOMPATIBLE CHANGES
 

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1418189r1=1418188r2=1418189view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Fri Dec  7 
05:22:16 2012
@@ -84,6 +84,21 @@
  bquot;Text File Busyquot; errors launching MR tasks/bbr
  blockquoteSome very small percentage of tasks fail with a quot;Text 
file busyquot; error.brbrThe following was the original 
diagnosis:br{quote}brOur use of PrintWriter in TaskController.writeCommand 
is unsafe, since that class swallows all IO exceptions. Weapos;re not 
currently checking for errors, which Iapos;m seeing result in occasional task 
failures with the message quot;Text file busyquot; - assumedly because the 
close() call is failing silently for some reason.br{quote}br.. but turned 
out to be another issue as well (see below)/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4696;MAPREDUCE-4696/a.
+ Minor bug reported by gopalv and fixed by gopalv br
+ bTestMRServerPorts throws NullReferenceException/bbr
+ blockquoteTestMRServerPorts throws 
brbr{code}brjava.lang.NullPointerExceptionbrat 
org.apache.hadoop.mapred.TestMRServerPorts.canStartJobTracker(TestMRServerPorts.java:99)br
at 
org.apache.hadoop.mapred.TestMRServerPorts.testJobTrackerPorts(TestMRServerPorts.java:152)br{code}brbrUse
 the JobTracker.startTracker(string, string, boolean initialize) factory method 
to get a pre-initialized JobTracker for the test.br/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4697;MAPREDUCE-4697/a.
+ Minor bug reported by gopalv and fixed by gopalv br
+ bTestMapredHeartbeat fails assertion on HeartbeatInterval/bbr
+ blockquoteTestMapredHeartbeat fails test on heart beat 
intervalbrbr{code}brFAILEDbrexpected:lt;300gt; but 
was:lt;500gt;brjunit.framework.AssertionFailedError: expected:lt;300gt; 
but was:lt;500gt;brat 
org.apache.hadoop.mapred.TestMapredHeartbeat.testJobDirCleanup(TestMapredHeartbeat.java:68)br{code}brbrReplicate
 math for getNextHeartbeatInterval() in the test-case to ensure MRConstants 
changes do not break test-case./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4699;MAPREDUCE-4699/a.
+ Minor bug reported by gopalv and fixed by gopalv br
+ bTestFairScheduler amp; TestCapacityScheduler fails due to JobHistory 
exception/bbr
+ blockquoteTestFairScheduler fails due to exception from 
mapred.JobHistorybrbr{code}brnullbrjava.lang.NullPointerExceptionbr   
at 
org.apache.hadoop.mapred.JobHistory$JobInfo.logJobPriority(JobHistory.java:1975)br
 at 
org.apache.hadoop.mapred.JobInProgress.setPriority(JobInProgress.java:895)br  
 at 
org.apache.hadoop.mapred.TestFairScheduler.testFifoPool(TestFairScheduler.java:2617)br{code}brbrTestCapacityScheduler
 fails due tobrbr{code}brjava.lang.NullPointerExceptionbrat 
org.apache.hadoop.mapred.JobHistory$JobInfo.log.../blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4798;MAPREDUCE-4798/a.
  Minor bug reported by sam liu and fixed by  (jobhistoryserver, test)br
  bTestJobHistoryServer fails some times with 
apos;java.lang.AssertionError: Address already in useapos;/bbr
@@ -92,7 +107,6 @@
 
 /ul
 
-
 h2Changes since Hadoop 1.1.0/h2
 
 h3Jiras with Release Notes (describe major or incompatible changes)/h3

svn commit: r1418191 - /hadoop/common/tags/release-1.1.2-rc1/

[mattf]

Author: mattf
Date: Fri Dec  7 05:24:00 2012
New Revision: 1418191

URL: http://svn.apache.org/viewvc?rev=1418191view=rev
Log:
Hadoop release-1.1.2-rc1

Added:
hadoop/common/tags/release-1.1.2-rc1/   (props changed)
  - copied from r1418189, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.2-rc1/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec  7 05:24:00 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2-rc1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  7 05:24:00 2012
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1417308 - in /hadoop/common/branches/branch-1.1: CHANGES.txt build.xml src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Wed Dec  5 08:25:24 2012
New Revision: 1417308

URL: http://svn.apache.org/viewvc?rev=1417308view=rev
Log:
preparing for release 1.1.2

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/build.xml
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1417308r1=1417307r2=1417308view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Dec  5 08:25:24 2012
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.1.2 - Unreleased
+Release 1.1.2 - 2012.12.05
 
   INCOMPATIBLE CHANGES
 

Modified: hadoop/common/branches/branch-1.1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/build.xml?rev=1417308r1=1417307r2=1417308view=diff
==
--- hadoop/common/branches/branch-1.1/build.xml (original)
+++ hadoop/common/branches/branch-1.1/build.xml Wed Dec  5 08:25:24 2012
@@ -28,7 +28,7 @@
  
   property name=Name value=Hadoop/
   property name=name value=hadoop/
-  property name=version value=1.1.2-SNAPSHOT/
+  property name=version value=1.1.3-SNAPSHOT/
   property name=final.name value=${name}-${version}/
   property name=test.final.name value=${name}-test-${version}/
   property name=year value=2009/

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1417308r1=1417307r2=1417308view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Wed Dec  5 
08:25:24 2012
@@ -2,7 +2,7 @@
 html
 head
 META http-equiv=Content-Type content=text/html; charset=UTF-8
-titleHadoop 1.1.1 Release Notes/title
+titleHadoop 1.1.2 Release Notes/title
 STYLE type=text/css
H1 {font-family: sans-serif}
H2 {font-family: sans-serif; margin-left: 7mm}
@@ -10,11 +10,89 @@
/STYLE
 /head
 body
-h1Hadoop 1.1.1 Release Notes/h1
+h1Hadoop 1.1.2 Release Notes/h1
These release notes include new developer and user-facing 
incompatibilities, features, and major improvements. 
 
 a name=changes/
 
+h2Changes since Hadoop 1.1.1/h2
+
+h3Jiras with Release Notes (describe major or incompatible changes)/h3
+ul
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8567;HADOOP-8567/a.
+ Major new feature reported by djp and fixed by jingzhao (conf)br
+ bPort conf servlet to dump running configuration  to branch 1.x/bbr
+ blockquoteUsers can use the conf servlet to get the 
server-side configuration. Users can
br/
+
+
br/
+
+1) connect to http_server_url/conf or http_server_url/conf?format=xml and get 
XML-based configuration description;
br/
+
+2) connect to http_server_url/conf?format=json and get JSON-based 
configuration description.
+/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9115;HADOOP-9115/a.
+ Blocker bug reported by arpitgupta and fixed by jingzhao br
+ bDeadlock in configuration when writing configuration to hdfs/bbr
+ blockquote  This fixes a bug 
where Hive could trigger a deadlock condition in the Hadoop configuration 
management code.
+
+  
+/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4478;MAPREDUCE-4478/a.
+ Major bug reported by liangly and fixed by liangly br
+ bTaskTrackerapos;s heartbeat is out of control/bbr
+ blockquote  Fixed a bug in 
TaskTracker#39;s heartbeat to keep it under control.
+
+  
+/blockquote/li
+
+/ul
+
+
+h3Other Jiras (describe bug fixes and minor changes)/h3
+ul
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8880;HADOOP-8880/a.
+ Major bug reported by gkesavan and fixed by gkesavan br
+ bMissing jersey jars as dependency in the pom causes hive tests to 
fail/bbr
+ blockquoteivy.xml has the dependency included where as the same 
dependency is not updated in the pom template./blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-9111;HADOOP-9111/a.
+ Minor improvement reported by jingzhao and fixed by jingzhao (test)br
+ bFix failed testcases with @ignore annotation In branch-1/bbr
+ blockquoteCurrently in branch-1, several failed testcases have @ignore 
annotation which does not take effect because these testcases are still using 
JUnit3. This jira plans to change these testcases to JUnit4 to let @ignore 
work./blockquote/li
+
+li a href=https://issues.apache.org/jira

svn commit: r1417312 - /hadoop/common/tags/release-1.1.2-rc0/

[mattf]

Author: mattf
Date: Wed Dec  5 08:33:00 2012
New Revision: 1417312

URL: http://svn.apache.org/viewvc?rev=1417312view=rev
Log:
Hadoop 1.1.2-rc0 release candidate.

Added:
hadoop/common/tags/release-1.1.2-rc0/   (props changed)
  - copied from r1417311, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.2-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Wed Dec  5 08:33:00 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.2-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec  5 08:33:00 2012
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1402728,1407625,1408450,1417238
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1417566 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/

[mattf]

Author: mattf
Date: Wed Dec  5 18:22:46 2012
New Revision: 1417566

URL: http://svn.apache.org/viewvc?rev=1417566view=rev
Log:
revert 'stable' references in docset to 1.0.4 from 1.1.1

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.html
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.html
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.html
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.html
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.html
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.html
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml?rev=1417566r1=1417565r2=1417566view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
Wed Dec  5 18:22:46 2012
@@ -15,7 +15,8 @@
   titleDownload/title
 
   ul
-listrong1.1.X - /strong current stable version, 1.1 release/li
+listrong1.0.X - /strong current stable version, 1.0 release/li
+listrong1.1.X - /strong current beta version, 1.1 release/li
 listrong2.X.X - /strong current alpha version/li
 listrong0.23.X - /strong simmilar to 2.X.X but missing NN 
HA./li
 listrong0.22.X - /strong does not include security/li
@@ -41,7 +42,7 @@
 
   section
 title1 December, 2012: Release 1.1.1 available /title
-p Stable point release for the 1.1.X line. Bug fixes and 
improvements, as documented in the a 
+p Point release for the 1.1.X line. Bug fixes and improvements, 
as documented in the a 
 href=http://hadoop.apache.org/docs/r1.1.1/releasenotes.html;
 Hadoop 1.1.1 Release Notes/a. 
 /p

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml?rev=1417566r1=1417565r2=1417566view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml Wed 
Dec  5 18:22:46 2012
@@ -34,6 +34,7 @@
   docs label=Documentation 
 current label=Current href=ext:docs/current//
 stable label=Stable href=ext:docs/stable//
+r1.0.4 label=Release 1.0.4 href=ext:docs/r1.0.4//
 r1.1.1 label=Release 1.1.1 href=ext:docs/r1.1.1//
 r2.0.2-alpha label=Release 2.0.2-alpha href=ext:docs/r2.0.2-alpha//
 r0.23.5 label=Release 0.23.5 href=ext:docs/r0.23.5//
@@ -75,6 +76,7 @@
 docs href=http://hadoop.apache.org/docs/;
   current href=current//
   stable href=stable//
+  r1.0.4 href=r1.0.4//
   r1.1.1 href=r1.1.1//
   r2.0.2-alpha href=r2.0.2-alpha//
   r0.23.5 href=r0.23.5//

Modified: hadoop/common/site/main/publish/bylaws.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1417566r1=1417565r2=1417566view=diff
==
--- hadoop/common/site/main/publish/bylaws.html (original)
+++ hadoop/common/site/main/publish/bylaws.html Wed Dec  5 18:22:46 2012
@@ -158,6 +158,9 @@ document.write(Last Published:  + docu
 a href=http://hadoop.apache.org/docs/stable/;Stable/a
 /div
 div class=menuitem
+a href=http://hadoop.apache.org/docs/r1.0.4/;Release 1.0.4/a
+/div
+div class=menuitem
 a href=http://hadoop.apache.org/docs/r1.1.1/;Release 1.1.1/a
 /div
 div class=menuitem

Modified: hadoop/common/site/main/publish/bylaws.pdf
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1417566r1=1417565r2=1417566view=diff
==
Binary files - no diff available.

Modified: hadoop/common/site/main/publish/index.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.html?rev=1417566r1=1417565r2=1417566view=diff

svn commit: r1417295 - in /hadoop/common/branches/branch-1.1: CHANGES.txt ivy/hadoop-core-pom-template.xml

[mattf]

Author: mattf
Date: Wed Dec  5 07:40:05 2012
New Revision: 1417295

URL: http://svn.apache.org/viewvc?rev=1417295view=rev
Log:
HADOOP-8880. Missing jersey jars as dependency in the pom causes hive tests to 
fail. Contributed by Giridharan Kesavan.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1417295r1=1417294r2=1417295view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Dec  5 07:40:05 2012
@@ -35,6 +35,9 @@ Release 1.1.2 - Unreleased
 should not hold lock while outputting and add a test for a deadlock writing
 Configuration to HDFS.  (Jing Zhao via szetszwo)
 
+HADOOP-8880. Missing jersey jars as dependency in the pom causes hive 
tests 
+to fail.  (gkesavan via mattf)
+
 Release 1.1.1 - 2012.11.18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml?rev=1417295r1=1417294r2=1417295view=diff
==
--- hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml 
(original)
+++ hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml Wed Dec  
5 07:40:05 2012
@@ -34,6 +34,21 @@
   version0.52/version
 /dependency
 dependency
+   groupIdcom.sun.jersey/groupId
+   artifactIdjersey-core/artifactId
+  version1.8/version
+/dependency
+ dependency
+   groupIdcom.sun.jersey/groupId
+   artifactIdjersey-json/artifactId
+  version1.8/version
+/dependency
+dependency
+   groupIdcom.sun.jersey/groupId
+   artifactIdjersey-server/artifactId
+  version1.8/version
+/dependency
+dependency
   groupIdcommons-io/groupId
   artifactIdcommons-io/artifactId
   version2.1/version

svn commit: r1417297 - /hadoop/common/branches/branch-1.1/CHANGES.txt

[mattf]

Author: mattf
Date: Wed Dec  5 07:52:33 2012
New Revision: 1417297

URL: http://svn.apache.org/viewvc?rev=1417297view=rev
Log:
correction in CHANGES.txt: moved MAPREDUCE-4478 from 1.1.1 to 1.1.2

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1417297r1=1417296r2=1417297view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Dec  5 07:52:33 2012
@@ -38,6 +38,9 @@ Release 1.1.2 - Unreleased
 HADOOP-8880. Missing jersey jars as dependency in the pom causes hive 
tests 
 to fail.  (gkesavan via mattf)
 
+MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
+control. (Liyin Liang via vinodkv)
+
 Release 1.1.1 - 2012.11.18
 
   INCOMPATIBLE CHANGES
@@ -107,9 +110,6 @@ Release 1.1.1 - 2012.11.18
 HADOOP-8745. Incorrect version numbers in hadoop-core POM.
 (Matthias Friedrich via eli)
 
-MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
-control. (Liyin Liang via vinodkv)
-
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

svn commit: r1417300 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Wed Dec  5 07:54:13 2012
New Revision: 1417300

URL: http://svn.apache.org/viewvc?rev=1417300view=rev
Log:
correction in CHANGES.txt: moved MAPREDUCE-4478 from 1.1.1 to 1.1.2

Modified:
hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1417300r1=1417299r2=1417300view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Dec  5 07:54:13 2012
@@ -351,6 +351,9 @@ Release 1.1.2 - Unreleased
 HADOOP-8880. Missing jersey jars as dependency in the pom causes hive 
tests 
 to fail.  (gkesavan via mattf)
 
+MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
+control. (Liyin Liang via vinodkv)
+
 Release 1.1.1 - 2012.11.18
 
   INCOMPATIBLE CHANGES
@@ -420,9 +423,6 @@ Release 1.1.1 - 2012.11.18
 HADOOP-8745. Incorrect version numbers in hadoop-core POM.
 (Matthias Friedrich via eli)
 
-MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
-control. (Liyin Liang via vinodkv)
-
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1.1/CHANGES.txt:r1417297

svn commit: r1416335 - in /hadoop/common/tags: release-1.1.1-rc0/ release-1.1.1/

[mattf]

Author: mattf
Date: Mon Dec  3 02:16:13 2012
New Revision: 1416335

URL: http://svn.apache.org/viewvc?rev=1416335view=rev
Log:
Hadoop 1.1.1 release.

Added:
hadoop/common/tags/release-1.1.1/   (props changed)
  - copied from r1416334, hadoop/common/tags/release-1.1.1-rc0/
Removed:
hadoop/common/tags/release-1.1.1-rc0/

Propchange: hadoop/common/tags/release-1.1.1/
--
--- svn:ignore (added)
+++ svn:ignore Mon Dec  3 02:16:13 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec  3 02:16:13 2012
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1407625,1408450
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1416362 [1/2] - /hadoop/common/branches/branch-1.1/lib/jdiff/hadoop_1.1.1.xml

[mattf]

Author: mattf
Date: Mon Dec  3 07:26:51 2012
New Revision: 1416362

URL: http://svn.apache.org/viewvc?rev=1416362view=rev
Log:
JDiff output for release 1.1.1

Added:
hadoop/common/branches/branch-1.1/lib/jdiff/hadoop_1.1.1.xml

svn commit: r1416363 [1/2] - /hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.1.1.xml

[mattf]

Author: mattf
Date: Mon Dec  3 07:28:36 2012
New Revision: 1416363

URL: http://svn.apache.org/viewvc?rev=1416363view=rev
Log:
JDiff output for release 1.1.1

Added:
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.1.1.xml

svn commit: r1416365 - /hadoop/common/branches/branch-1/build.xml

[mattf]

Author: mattf
Date: Mon Dec  3 07:30:36 2012
New Revision: 1416365

URL: http://svn.apache.org/viewvc?rev=1416365view=rev
Log:
JDiff output for release 1.1.1

Modified:
hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1416365r1=1416364r2=1416365view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Mon Dec  3 07:30:36 2012
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.0.4/
+  property name=jdiff.stable value=1.1.1/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1411102 - /hadoop/common/branches/branch-1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon Nov 19 08:54:03 2012
New Revision: 1411102

URL: http://svn.apache.org/viewvc?rev=1411102view=rev
Log:
fixed CHANGES.txt to correctly show five patches applied in release 1.1.1 
instead of release 1.2.0.

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1411102r1=1411101r2=1411102view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Nov 19 08:54:03 2012
@@ -13,9 +13,6 @@ Release 1.2.0 - unreleased
 MAPREDUCE-987. Exposing MiniDFS and MiniMR clusters as a single process 
 command-line (philip and ahmed via tucu)
 
-HDFS-528. Backport: Add ability for safemode to wait for a minimum number
-of live datanodes.  (szetszwo)
-
 HDFS-385. Backport: Add support for an experimental API that allows a
 module external to HDFS to specify how HDFS blocks should be placed.
 (Sumadhur Reddy Bolli via szetszwo)
@@ -86,8 +83,6 @@ Release 1.2.0 - unreleased
 MAPREDUCE-4499. Looking for speculative tasks is very expensive in 1.x
 (Koji Noguchi via tgraves)
 
-HDFS-1108 Log newly allocated blocks (hdfs-1108-hadoop-1-v5.patch) 
(sanjay) 
-
 HADOOP-8832. Port generic service plugin mechanism from HADOOP-5257
 to branch-1. (backported by Brandon Li via suresh) 
 
@@ -213,16 +208,12 @@ Release 1.2.0 - unreleased
 
 HDFS-3754. BlockSender doesn't shutdown ReadaheadPool threads. (eli)
 
-HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
-
 HADOOP-8611. Allow fall-back to the shell-based implementation when
 JNI-based users-group mapping fails (Robert Parker via bobby)
 
 MAPREDUCE-2374. Text File Busy errors launching MR tasks. (Andy Isaacson
 via atm)
 
-HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
-
 HADOOP-4572. Can not access user logs - Jetty is not configured by default 
 to serve aliases/symlinks (ahmed via tucu)
 
@@ -234,9 +225,6 @@ Release 1.2.0 - unreleased
 
 MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
 
-HADOOP-8745. Incorrect version numbers in hadoop-core POM.
-(Matthias Friedrich via eli)
-
 HDFS-2757. Cannot read a local block that's being written to when
 using the local read short circuit. (Jean-Daniel Cryans via eli)
 
@@ -324,8 +312,13 @@ Release 1.1.1 - Unreleased
 
   NEW FEATURES
 
+HDFS-528. Backport: Add ability for safemode to wait for a minimum number
+of live datanodes.  (szetszwo)
+
   IMPROVEMENTS
 
+HDFS-1108 Log newly allocated blocks (hdfs-1108-hadoop-1-v5.patch) 
(sanjay) 
+
 HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
 
 HADOOP-8995. Remove unnecessary bogus exception from Configuration.java.
@@ -338,7 +331,7 @@ Release 1.1.1 - Unreleased
 HDFS-1539. A config option for the datanode to fsycn a block file
 when block is completely written. (dhruba via szetszwo)
 
-HDFS-4174. Add abilit to list the corrupted files in WebUI (backport of
+HDFS-4174. Add ability to list the corrupted files in WebUI (backport of
 HDFS-1031). (Jing Zhao via suresh)
 
   BUG FIXES
@@ -375,6 +368,13 @@ Release 1.1.1 - Unreleased
 MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails 
 with ant-1.8.4. (Amir Sanjar via mattf)
 
+HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
+
+HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
+
+HADOOP-8745. Incorrect version numbers in hadoop-core POM.
+(Matthias Friedrich via eli)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

svn commit: r1411109 - /hadoop/common/tags/release-1.1.1-rc0/

[mattf]

Author: mattf
Date: Mon Nov 19 09:21:20 2012
New Revision: 1411109

URL: http://svn.apache.org/viewvc?rev=1411109view=rev
Log:
Hadoop 1.1.1-rc0 release.

Added:
hadoop/common/tags/release-1.1.1-rc0/   (props changed)
  - copied from r1411108, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.1-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Mon Nov 19 09:21:20 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.1-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 19 09:21:20 2012
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637,1399786,1407625,1408450
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1411072 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

[mattf]

Author: mattf
Date: Mon Nov 19 05:58:25 2012
New Revision: 1411072

URL: http://svn.apache.org/viewvc?rev=1411072view=rev
Log:
MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails with 
ant-1.8.4. Contributed by Amir Sanjar.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411072r1=1411071r2=1411072view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 05:58:25 2012
@@ -51,6 +51,9 @@ Release 1.1.1 - Unreleased
 HDFS-4105. the SPNEGO user for secondary namenode should use the web 
 keytab. (Arpit Gupta via jitendra)
 
+MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails 
+with ant-1.8.4. (Amir Sanjar via mattf)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java?rev=1411072r1=1411071r2=1411072view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
 Mon Nov 19 05:58:25 2012
@@ -17,21 +17,24 @@
  */
 package org.apache.hadoop.mapred;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.mapred.TestJobTrackerRestart;
+import org.junit.Test;
+
 
-import junit.framework.TestCase;
 import java.io.*;
-import org.junit.*;
+
 
 /** 
  * This test checks if the jobtracker can detect and recover a tracker that was
  * lost while the jobtracker was down.
  */
 
-public class TestJobTrackerRestartWithLostTracker extends TestCase {
+public class TestJobTrackerRestartWithLostTracker {
   final Path testDir = new Path(/jt-restart-lost-tt-testing);
   final Path inDir = new Path(testDir, input);
   final Path shareDir = new Path(testDir, share);
@@ -114,7 +117,7 @@ public class TestJobTrackerRestartWithLo
 
 assertTrue(Job should be successful, rJob.isSuccessful());
   }
-  
+  @Test
   public void testRestartWithLostTracker() throws IOException {
 String namenode = null;
 MiniDFSCluster dfs = null;

svn commit: r1411073 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

[mattf]

Author: mattf
Date: Mon Nov 19 06:05:44 2012
New Revision: 1411073

URL: http://svn.apache.org/viewvc?rev=1411073view=rev
Log:
MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails with 
ant-1.8.4. Contributed by Amir Sanjar.

Modified:
hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)

hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1411073r1=1411072r2=1411073view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Nov 19 06:05:44 2012
@@ -315,9 +315,6 @@ Release 1.2.0 - unreleased
 
 HDFS-4180. Update TestFileCreation for HDFS-4122.  (Jing Zhao via szetszwo)
 
-HDFS-4105. the SPNEGO user for secondary namenode should use the web 
-keytab. (Arpit Gupta via jitendra)
-
 HADOOP-9036. Fix racy test case TestSinkQueue (Backport HADOOP-7292).
 (Luke Lu backport by suresh)
 
@@ -372,6 +369,11 @@ Release 1.1.1 - Unreleased
 HADOOP-9017. Fix hadoop-client-pom-template.xml and
 hadoop-client-pom-template.xml for version token ( gkesavan )
 
+HDFS-4105. the SPNEGO user for secondary namenode should use the web 
+keytab. (Arpit Gupta via jitendra)
+
+MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails 
+with ant-1.8.4. (Amir Sanjar via mattf)
 
 Release 1.1.0 - 2012.09.28
 

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1.1/CHANGES.txt:r1411072

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java?rev=1411073r1=1411072r2=1411073view=diff
==
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
 Mon Nov 19 06:05:44 2012
@@ -17,21 +17,24 @@
  */
 package org.apache.hadoop.mapred;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.mapred.TestJobTrackerRestart;
+import org.junit.Test;
+
 
-import junit.framework.TestCase;
 import java.io.*;
-import org.junit.*;
+
 
 /** 
  * This test checks if the jobtracker can detect and recover a tracker that was
  * lost while the jobtracker was down.
  */
 
-public class TestJobTrackerRestartWithLostTracker extends TestCase {
+public class TestJobTrackerRestartWithLostTracker {
   final Path testDir = new Path(/jt-restart-lost-tt-testing);
   final Path inDir = new Path(testDir, input);
   final Path shareDir = new Path(testDir, share);
@@ -114,7 +117,7 @@ public class TestJobTrackerRestartWithLo
 
 assertTrue(Job should be successful, rJob.isSuccessful());
   }
-  
+  @Test
   public void testRestartWithLostTracker() throws IOException {
 String namenode = null;
 MiniDFSCluster dfs = null;

svn commit: r1411081 - in /hadoop/common/branches/branch-1.1: ./ src/hdfs/ src/hdfs/org/apache/hadoop/hdfs/ src/hdfs/org/apache/hadoop/hdfs/server/namenode/ src/test/org/apache/hadoop/hdfs/

[mattf]

Author: mattf
Date: Mon Nov 19 06:52:24 2012
New Revision: 1411081

URL: http://svn.apache.org/viewvc?rev=1411081view=rev
Log:
merged r1368353 from branch-1. HDFS-528. Backport: Add ability for safemode to 
wait for a minimum number of live datanodes.  Contributed by Tsz Wo Sze.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt   (contents, props changed)
hadoop/common/branches/branch-1.1/src/hdfs/hdfs-default.xml

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/TestSafeMode.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411081r1=1411080r2=1411081view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 06:52:24 2012
@@ -6,6 +6,9 @@ Release 1.1.1 - Unreleased
 
   NEW FEATURES
 
+HDFS-528. Backport: Add ability for safemode to wait for a minimum number
+of live datanodes.  (szetszwo)
+
   IMPROVEMENTS
 
 HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)

Propchange: hadoop/common/branches/branch-1.1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1368353

Modified: hadoop/common/branches/branch-1.1/src/hdfs/hdfs-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/hdfs-default.xml?rev=1411081r1=1411080r2=1411081view=diff
==
--- hadoop/common/branches/branch-1.1/src/hdfs/hdfs-default.xml (original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/hdfs-default.xml Mon Nov 19 
06:52:24 2012
@@ -304,9 +304,24 @@ creations/deletions), or all./descrip
   description
 Specifies the percentage of blocks that should satisfy 
 the minimal replication requirement defined by dfs.replication.min.
-Values less than or equal to 0 mean not to start in safe mode.
+Values less than or equal to 0 mean not to wait for any particular
+percentage of blocks before exiting safemode.
 Values greater than 1 will make safe mode permanent.
   /description
+ /property
+ 
+property
+  namedfs.namenode.safemode.min.datanodes/name
+  value0/value
+  description
+Specifies the number of datanodes that must be considered alive
+before the name node exits safemode.
+Values less than or equal to 0 mean not to take the number of live
+datanodes into account when deciding whether to remain in safe mode
+during startup.
+Values greater than the number of datanodes in the cluster
+will make safe mode permanent.
+  /description
 /property
 
 property

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java?rev=1411081r1=1411080r2=1411081view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
 Mon Nov 19 06:52:24 2012
@@ -72,6 +72,8 @@ public class DFSConfigKeys extends Commo
   public static final int DFS_NAMENODE_SAFEMODE_EXTENSION_DEFAULT = 3;
   public static final String  DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_KEY = 
dfs.namenode.safemode.threshold-pct;
   public static final float   DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_DEFAULT = 
0.999f;
+  public static final String  DFS_NAMENODE_SAFEMODE_MIN_DATANODES_KEY = 
dfs.namenode.safemode.min.datanodes;
+  public static final int DFS_NAMENODE_SAFEMODE_MIN_DATANODES_DEFAULT = 0;
   public static final String  DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY = 
dfs.namenode.secondary.http-address;
   public static final String  DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_DEFAULT = 
0.0.0.0:50090;
   public static final String  DFS_NAMENODE_CHECKPOINT_PERIOD_KEY = 
dfs.namenode.checkpoint.period;

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1411081r1=1411080r2=1411081view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode

svn commit: r1411085 - in /hadoop/common/branches/branch-1.1: ./ src/hdfs/org/apache/hadoop/hdfs/ src/hdfs/org/apache/hadoop/hdfs/server/namenode/ src/test/org/apache/hadoop/hdfs/

[mattf]

Author: mattf
Date: Mon Nov 19 07:05:02 2012
New Revision: 1411085

URL: http://svn.apache.org/viewvc?rev=1411085view=rev
Log:
merged 1362313 from branch-1.  HDFS-1108 Log newly allocated blocks 
(hdfs-1108-hadoop-1-v5.patch). Contributed by Sanjay Radia.

Added:

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/TestPersistBlocks.java
  - copied unchanged from r1362313, 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/TestPersistBlocks.java

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/hadoop-1.0-multiblock-file.tgz
  - copied unchanged from r1362313, 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/hadoop-1.0-multiblock-file.tgz
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/build.xml

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411085r1=1411084r2=1411085view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:05:02 2012
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.1.1 - Unreleased
+Release 1.1.1 - 2012.11.18
 
   INCOMPATIBLE CHANGES
 
@@ -11,6 +11,8 @@ Release 1.1.1 - Unreleased
 
   IMPROVEMENTS
 
+HDFS-1108 Log newly allocated blocks (hdfs-1108-hadoop-1-v5.patch) 
(sanjay) 
+
 HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
 
 HADOOP-8995. Remove unnecessary bogus exception from Configuration.java.

Modified: hadoop/common/branches/branch-1.1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/build.xml?rev=1411085r1=1411084r2=1411085view=diff
==
--- hadoop/common/branches/branch-1.1/build.xml (original)
+++ hadoop/common/branches/branch-1.1/build.xml Mon Nov 19 07:05:02 2012
@@ -922,6 +922,7 @@
 copy file=${test.src.dir}/org/apache/hadoop/mapred/test.tgz 
todir=${test.cache.data}/
 copy file=${test.src.dir}/org/apache/hadoop/mapred/test.tar.gz 
todir=${test.cache.data}/
 copy file=${test.src.dir}/org/apache/hadoop/hdfs/hadoop-14-dfs-dir.tgz 
todir=${test.cache.data}/
+copy 
file=${test.src.dir}/org/apache/hadoop/hdfs/hadoop-1.0-multiblock-file.tgz 
todir=${test.cache.data}/
 copy file=${test.src.dir}/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt 
todir=${test.cache.data}/
 copy file=${test.src.dir}/org/apache/hadoop/cli/testConf.xml 
todir=${test.cache.data}/
 copy 
file=${test.src.dir}/org/apache/hadoop/cli/clitest_data/data15bytes 
todir=${test.cache.data}/

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java?rev=1411085r1=1411084r2=1411085view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java
 Mon Nov 19 07:05:02 2012
@@ -104,6 +104,8 @@ public class DFSConfigKeys extends Commo
   public static final boolean DFS_WEBHDFS_ENABLED_DEFAULT = false;
   public static final String  DFS_PERMISSIONS_ENABLED_KEY = 
dfs.permissions.enabled;
   public static final boolean DFS_PERMISSIONS_ENABLED_DEFAULT = true;
+  public static final String  DFS_PERSIST_BLOCKS_KEY = dfs.persist.blocks;
+  public static final boolean DFS_PERSIST_BLOCKS_DEFAULT = false;
   public static final String  DFS_PERMISSIONS_SUPERUSERGROUP_KEY = 
dfs.permissions.superusergroup;
   public static final String  DFS_ADMIN = dfs.cluster.administrators;
   public static final String  DFS_PERMISSIONS_SUPERUSERGROUP_DEFAULT = 
supergroup;

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1411085r1=1411084r2=1411085view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Mon Nov 19 07:05:02 2012
@@ -17,6 +17,9 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_PERSIST_BLOCKS_DEFAULT;
+import static

svn commit: r1411087 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java src/test

[mattf]

Author: mattf
Date: Mon Nov 19 07:19:46 2012
New Revision: 1411087

URL: http://svn.apache.org/viewvc?rev=1411087view=rev
Log:
merged r1372708 from branch-1: HDFS-3658. Fix bugs in TestDFSClientRetries and 
add more tests. Contributed by Tsz Wo Sze.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java

hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411087r1=1411086r2=1411087view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:19:46 2012
@@ -59,6 +59,8 @@ Release 1.1.1 - 2012.11.18
 MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails 
 with ant-1.8.4. (Amir Sanjar via mattf)
 
+HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1411087r1=1411086r2=1411087view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Mon Nov 19 07:19:46 2012
@@ -1610,6 +1610,9 @@ public class FSNamesystem implements FSC
   +src+ for +clientName);
 
 synchronized (this) {
+  if (isInSafeMode()) {//check safemode first for failing-fast
+throw new SafeModeException(Cannot add block to  + src, safeMode);
+  }
   // have we exceeded the configured limit of fs objects.
   checkFsObjectLimit();
 
@@ -1627,7 +1630,7 @@ public class FSNamesystem implements FSC
   replication = (int)pendingFile.getReplication();
 }
 
-// choose targets for the new block tobe allocated.
+// choose targets for the new block to be allocated.
 DatanodeDescriptor targets[] = replicator.chooseTarget(replication,
clientNode,
excludedNodes,
@@ -1640,7 +1643,7 @@ public class FSNamesystem implements FSC
 
 // Allocate a new block and record it in the INode. 
 synchronized (this) {
-  if (isInSafeMode()) {
+  if (isInSafeMode()) { //make sure it is not in safemode again.
 throw new SafeModeException(Cannot add block to  + src, safeMode);
   }
   INode[] pathINodes = dir.getExistingPathINodes(src);
@@ -4879,6 +4882,10 @@ public class FSNamesystem implements FSC
   this.safeReplication = conf.getInt(dfs.replication.min, 1);
   this.blockTotal = 0; 
   this.blockSafe = 0;
+
+  LOG.info(dfs.safemode.threshold.pct  =  + threshold);
+  LOG.info(dfs.namenode.safemode.min.datanodes =  + datanodeThreshold);
+  LOG.info(dfs.safemode.extension  =  + extension);
 }
 
 /**

Modified: 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1411087r1=1411086r2=1411087view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
 Mon Nov 19 07:19:46 2012
@@ -252,7 +252,8 @@ public class MiniDFSCluster {
 
 int replication = conf.getInt(dfs.replication, 3);
 conf.setInt(dfs.replication, Math.min(replication, numDataNodes));
-conf.setInt(dfs.safemode.extension, 0);
+int safemodeExtension = conf.getInt(dfs.safemode.extension.testing, 0);
+conf.setInt(dfs.safemode.extension, safemodeExtension);
 conf.setInt(dfs.namenode.decommission.interval, 3); // 3 second
 
 // Set a small delay on blockReceived in the minicluster to approximate

Modified: 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java?rev=1411087r1=1411086r2=1411087view=diff

svn commit: r1411088 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

[mattf]

Author: mattf
Date: Mon Nov 19 07:26:07 2012
New Revision: 1411088

URL: http://svn.apache.org/viewvc?rev=1411088view=rev
Log:
merged r1376739 from branch-1: HDFS-3846. Namenode deadlock in branch-1. 
Contributed by Brandon Li.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411088r1=1411087r2=1411088view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:26:07 2012
@@ -61,6 +61,8 @@ Release 1.1.1 - 2012.11.18
 
 HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
 
+HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1411088r1=1411087r2=1411088view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Mon Nov 19 07:26:07 2012
@@ -4308,10 +4308,6 @@ public class FSNamesystem implements FSC
 }
   }
 
-  int getNumLiveDataNodes() {
-return getNumberOfDatanodes(DatanodeReportType.LIVE);
-  }
-
   int getNumberOfDatanodes(DatanodeReportType type) {
 return getDatanodeListForReport(type).size(); 
   }
@@ -4998,7 +4994,7 @@ public class FSNamesystem implements FSC
  */
 boolean needEnter() {
   return getSafeBlockRatio()  threshold ||
-  getNumLiveDataNodes()  datanodeThreshold;
+  numLiveDataNodes()  datanodeThreshold;
 }
   
 /**
@@ -5096,7 +5092,7 @@ public class FSNamesystem implements FSC
   if(blockTotal  0)
 return leaveMsg + .;
 
-  int numLive = getNumLiveDataNodes();
+  int numLive = numLiveDataNodes();
   String msg = ;
   if (reached == 0) {
 if (getSafeBlockRatio()  threshold) {

svn commit: r1411089 - in /hadoop/common/branches/branch-1.1: CHANGES.txt ivy/hadoop-core-pom-template.xml

[mattf]

Author: mattf
Date: Mon Nov 19 07:30:03 2012
New Revision: 1411089

URL: http://svn.apache.org/viewvc?rev=1411089view=rev
Log:
merged r1382134 from branch-1: HADOOP-8745. Incorrect version numbers in 
hadoop-core POM. Contributed by Matthias Friedrich.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411089r1=1411088r2=1411089view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:30:03 2012
@@ -63,6 +63,9 @@ Release 1.1.1 - 2012.11.18
 
 HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
 
+HADOOP-8745. Incorrect version numbers in hadoop-core POM.
+(Matthias Friedrich via eli)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml?rev=1411089r1=1411088r2=1411089view=diff
==
--- hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml 
(original)
+++ hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml Mon Nov 
19 07:30:03 2012
@@ -101,17 +101,7 @@
 dependency
   groupIdnet.java.dev.jets3t/groupId
   artifactIdjets3t/artifactId
-  version0.7.1/version
-/dependency
-dependency
-  groupIdcommons-net/groupId
-  artifactIdcommons-net/artifactId
-  version1.4.1/version
-/dependency
-dependency
-  groupIdnet.sf.kosmosfs/groupId
-  artifactIdkfs/artifactId
-  version0.3/version
+  version0.6.1/version
 /dependency
 dependency
   groupIdhsqldb/groupId
@@ -131,7 +121,7 @@
 dependency
   groupIdorg.codehaus.jackson/groupId
   artifactIdjackson-mapper-asl/artifactId
-  version1.0.1/version
+  version1.8.8/version
 /dependency
   /dependencies
 /project

svn commit: r1411092 - /hadoop/common/branches/branch-1.1/CHANGES.txt

[mattf]

Author: mattf
Date: Mon Nov 19 07:41:06 2012
New Revision: 1411092

URL: http://svn.apache.org/viewvc?rev=1411092view=rev
Log:
fixed CHANGES.txt to show inclusion of HDFS-4174, which was committed in 
r1409481 but didn't show in CHANGES.txt

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411092r1=1411091r2=1411092view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:41:06 2012
@@ -25,6 +25,9 @@ Release 1.1.1 - 2012.11.18
 HDFS-1539. A config option for the datanode to fsycn a block file
 when block is completely written. (dhruba via szetszwo)
 
+HDFS-4174. Add ability to list the corrupted files in WebUI (backport of
+HDFS-1031). (Jing Zhao via suresh)
+
   BUG FIXES
 
 HADOOP-8878. Uppercase namenode hostname causes hadoop dfs calls with

svn commit: r1399154 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/

[mattf]

Author: mattf
Date: Wed Oct 17 08:52:15 2012
New Revision: 1399154

URL: http://svn.apache.org/viewvc?rev=1399154view=rev
Log:
Updated site for releases 1.0.4 and 1.1.0

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.html
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.html
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.html
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.html
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.html
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.html
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml?rev=1399154r1=1399153r2=1399154view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
Wed Oct 17 08:52:15 2012
@@ -41,6 +41,45 @@
   titleNews/title
 
   section
+title13 October, 2012: Release 1.1.0 available /title
+p This is a beta release for version 1.1.
+/p
+p This release has approximately 135 enhancements and bug fixes 
compared to Hadoop-1.0.4, including:
+ul
+  liMany performance improvements in HDFS, backported from 
trunk /li
+  liImprovements in Security to use SPNEGO instead of 
Kerberized SSL for HTTP transactions /li
+  liLower default minimum heartbeat for task trackers from 3 
sec to 300msec to increase job throughput on small clusters /li
+  liPort of Gridmix v3 /li
+  liSet MALLOC_ARENA_MAX in hadoop-config.sh to resolve 
problems with glibc in RHEL-6 /li
+  liSplittable bzip2 files /li
+  liOf course it also has the same security fix as release 
1.0.4. /li
+/ul
+/p
+p Please see the a 
+href=http://hadoop.apache.org/docs/r1.1.0/releasenotes.html;
+Hadoop 1.1.0 Release Notes/a for details.  
+/p
+  /section
+
+  section
+title12 October, 2012: Release 1.0.4 available /title
+p This is a Security Patch release for version 1.0.
+/p
+p There are four bug fixes and feature enhancements in this 
minor release:
+ul
+  liSecurity issue CVE-2012-4449: Hadoop tokens use a 20-bit 
secret /li
+  liHADOOP-7154 - set MALLOC_ARENA_MAX in hadoop-config.sh 
to resolve problems with glibc in RHEL-6 /li
+  liHDFS-3652 - FSEditLog failure removes the wrong edit 
stream when storage dirs have same name /li
+  liMAPREDUCE-4399 - Fix (up to 3x) performance regression 
in shuffle /li
+/ul
+/p
+p Please see the a 
+href=http://hadoop.apache.org/docs/r1.0.4/releasenotes.html;
+Hadoop 1.0.4 Release Notes/a for details.  
+/p
+  /section
+
+  section
 title9 October, 2012: Release 2.0.2-alpha available /title
 p This is the second (alpha) version in the hadoop-2.x series.
 /p

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml?rev=1399154r1=1399153r2=1399154view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/site.xml Wed 
Oct 17 08:52:15 2012
@@ -33,12 +33,14 @@
 
   docs label=Documentation 
 current label=Current href=ext:docs/current//
-r1.0.3 label=Release 1.0.3 href=ext:docs/r1.0.3//
-r0.20.2   label=Release 0.20.2 href=ext:docs/r0.20.2//
-r0.20.203.0 label=Release 0.20.203.0 href=ext:docs/r0.20.203.0//
-r0.22.0 label=Release 0.22.0 href=ext:docs/r0.22.0//
-r0.23.3 label=Release 0.23.3 href=ext:docs/r0.23.3//
+stable label=Stable href

svn commit: r1399432 [1/2] - /hadoop/common/branches/branch-1.0/lib/jdiff/hadoop_1.0.4.xml

[mattf]

Author: mattf
Date: Wed Oct 17 21:09:05 2012
New Revision: 1399432

URL: http://svn.apache.org/viewvc?rev=1399432view=rev
Log:
JDiff output for release 1.0.4

Added:
hadoop/common/branches/branch-1.0/lib/jdiff/hadoop_1.0.4.xml

svn commit: r1399436 [1/3] - in /hadoop/common/branches/branch-1/lib/jdiff: hadoop_1.0.4.xml hadoop_1.1.0.xml

[mattf]

Author: mattf
Date: Wed Oct 17 21:16:51 2012
New Revision: 1399436

URL: http://svn.apache.org/viewvc?rev=1399436view=rev
Log:
JDiff output for releases 1.0.4 and 1.1.0

Added:
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.0.4.xml
hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.1.0.xml

svn commit: r1399447 - /hadoop/common/branches/branch-1.1/build.xml

[mattf]

Author: mattf
Date: Wed Oct 17 21:44:15 2012
New Revision: 1399447

URL: http://svn.apache.org/viewvc?rev=1399447view=rev
Log:
adjust jdiff.stable value to 1.0.4

Modified:
hadoop/common/branches/branch-1.1/build.xml

Modified: hadoop/common/branches/branch-1.1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/build.xml?rev=1399447r1=1399446r2=1399447view=diff
==
--- hadoop/common/branches/branch-1.1/build.xml (original)
+++ hadoop/common/branches/branch-1.1/build.xml Wed Oct 17 21:44:15 2012
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.0.3/
+  property name=jdiff.stable value=1.0.4/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1399448 - /hadoop/common/branches/branch-1/build.xml

[mattf]

Author: mattf
Date: Wed Oct 17 21:45:58 2012
New Revision: 1399448

URL: http://svn.apache.org/viewvc?rev=1399448view=rev
Log:
adjust jdiff.stable value to 1.0.4

Modified:
hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1399448r1=1399447r2=1399448view=diff
==
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Wed Oct 17 21:45:58 2012
@@ -160,7 +160,7 @@
 
   property name=jdiff.build.dir value=${build.docs}/jdiff/
   property name=jdiff.xml.dir value=${lib.dir}/jdiff/
-  property name=jdiff.stable value=1.0.3/
+  property name=jdiff.stable value=1.0.4/
   property name=jdiff.stable.javadoc 
 value=http://hadoop.apache.org/core/docs/r${jdiff.stable}/api//
 

svn commit: r1398178 - in /hadoop/common/tags: release-1.1.0-rc3/ release-1.1.0-rc4/

[mattf]

Author: mattf
Date: Mon Oct 15 02:46:40 2012
New Revision: 1398178

URL: http://svn.apache.org/viewvc?rev=1398178view=rev
Log:
Remove old RC's upon release of final 1.1.0

Removed:
hadoop/common/tags/release-1.1.0-rc3/
hadoop/common/tags/release-1.1.0-rc4/

svn commit: r1394244 - /hadoop/common/tags/release-1.0.4-rc0/

[mattf]

Author: mattf
Date: Thu Oct  4 20:19:05 2012
New Revision: 1394244

URL: http://svn.apache.org/viewvc?rev=1394244view=rev
Log:
Hadoop 1.0.4-rc0 maintenance release.

Added:
hadoop/common/tags/release-1.0.4-rc0/   (props changed)
  - copied from r1394243, hadoop/common/branches/branch-1.0/

Propchange: hadoop/common/tags/release-1.0.4-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  4 20:19:05 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.0.4-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct  4 20:19:05 2012
@@ -0,0 +1,8 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,932042,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720,1177907,1179036,1179171,1179519,1179857,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-1:1207579,1208143,1235107,1293012,1293490,1293716,1301291,1301804,1302058,1302720,1303017,1303027,1304158,1310039,1325636,1331064,1333564
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1394289 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Thu Oct  4 21:56:04 2012
New Revision: 1394289

URL: http://svn.apache.org/viewvc?rev=1394289view=rev
Log:
Add two fixes to release notes for 1.1.0-rc5.  Move three fixes in CHANGES.txt 
from 1.1.0 to 1.0.4 in anticipation of 1.0.4 release.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1394289r1=1394288r2=1394289view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Thu Oct  4 21:56:04 2012
@@ -155,12 +155,6 @@ Release 1.1.0 - 2012.09.28
 HDFS-2465. Add HDFS support for fadvise readahead and drop-behind.
 (todd via suresh)
 
-HADOOP-7154. Should set MALLOC_ARENA_MAX in hadoop-env.sh
-(todd via mattf)
-
-MAPREDUCE-4399. Change the Jetty response buffer size to improve 
-shuffle performance. (Luke Lu via suresh)
-
 MAPREDUCE-4400. Avoid task finish sleep to improve small job/workflow
 latency. (llu)
 
@@ -410,12 +404,18 @@ Release 1.1.0 - 2012.09.28
 MAPREDUCE-4698. Fix failing unit test - TestJobHistoryConfig. Optionally
 initialize the jobtracker on a JobTracker.startTracker. (Gopal V via sseth)
 
-Release 1.0.4 - Unreleased
+Release 1.0.4 - 2012.10.02
 
   NEW FEATURES
 
   IMPROVEMENTS
 
+HADOOP-7154. Should set MALLOC_ARENA_MAX in hadoop-env.sh
+(todd via mattf)
+
+MAPREDUCE-4399. Change the Jetty response buffer size to improve 
+shuffle performance. (Luke Lu via suresh)
+
   BUG FIXES
 
 HDFS-3652. FSEditLog failure removes the wrong edit stream when storage

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1394289r1=1394288r2=1394289view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Thu Oct  4 
21:56:04 2012
@@ -204,6 +204,14 @@ Please see hdfs-default.xml for detailed
   
 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4698;MAPREDUCE-4698/a.
+ Minor bug reported by gopalv and fixed by gopalv br
+ bTestJobHistoryConfig throws Exception in testJobHistoryLogging/bbr
+ blockquote  Optionally call 
initialize/initializeFileSystem in JobTracker::startTracker() to allow for 
proper initialization when offerService is not being called.
+
+  
+/blockquote/li
+
 /ul
 
 
@@ -530,6 +538,12 @@ Please see hdfs-default.xml for detailed
  bHDFS does not use ClientProtocol in a backward-compatible way/bbr
  blockquoteHDFS-617 was brought into branch-0.20-security/branch-1 to 
support non-recursive create, along with HADOOP-6840 and HADOOP-6886. However, 
the changes in HDFS was done in an incompatible way, making the client unusable 
against older clusters, even when plain old create() is called. This is because 
DFS now internally calls create() through the newly introduced method. By 
simply changing how the methods are wired internally, we can remove this 
limitation. We may eventually switch back to the app.../blockquote/li
 
+li a href=https://issues.apache.org/jira/browse/HDFS-3461;HDFS-3461/a.
+ Major bug reported by owen.omalley and fixed by owen.omalley br
+ bHFTP should use the same port amp; protocol for getting the 
delegation token/bbr
+ blockquoteCurrently, hftp uses http to the Namenodeapos;s https port, 
which doesnapos;t work./blockquote/li
+
+
 li a href=https://issues.apache.org/jira/browse/HDFS-3466;HDFS-3466/a.
  Major bug reported by owen.omalley and fixed by owen.omalley (name-node, 
security)br
  bThe SPNEGO filter for the NameNode should come out of the web keytab 
file/bbr

svn commit: r1394299 - /hadoop/common/tags/release-1.1.0-rc5/

[mattf]

Author: mattf
Date: Thu Oct  4 22:23:26 2012
New Revision: 1394299

URL: http://svn.apache.org/viewvc?rev=1394299view=rev
Log:
Hadoop-1.1.0-rc5 release candidate.

Added:
hadoop/common/tags/release-1.1.0-rc5/   (props changed)
  - copied from r1394298, hadoop/common/branches/branch-1.1/

Propchange: hadoop/common/tags/release-1.1.0-rc5/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  4 22:23:26 2012
@@ -0,0 +1,9 @@
+build
+build.properties
+logs
+.classpath
+.git
+.project
+.settings
+.launches
+.externalToolBuilders

Propchange: hadoop/common/tags/release-1.1.0-rc5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct  4 22:23:26 2012
@@ -0,0 +1,9 @@
+/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
+/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
+/hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378
+/hadoop/common/branches/branch-1:1343738,1343992,1346167,1353893,1353928,1354390,1354773,1354798,1357994,1360011,1360940,1360944,1366295,1374605,1379653,1384742,1392637
+/hadoop/common/branches/branch-1.0:1214410,1291091,1330040,1334877
+/hadoop/core/branches/branch-0.19:713112
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

svn commit: r1392179 - /hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

[mattf]

Author: mattf
Date: Mon Oct  1 03:14:27 2012
New Revision: 1392179

URL: http://svn.apache.org/viewvc?rev=1392179view=rev
Log:
minor tweak to patch for MAPREDUCE-4511 (Add IFile readahead) to avoid use of 
interface HasFileDescriptor, which doesn't exist until 1.2

Modified:

hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

Modified: 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java?rev=1392179r1=1392178r2=1392179view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 Mon Oct  1 03:14:27 2012
@@ -101,9 +101,7 @@ class IFileInputStream extends InputStre
   private static FileDescriptor getFileDescriptorIfAvail(InputStream in) {
 FileDescriptor fd = null;
 try {
-  if (in instanceof HasFileDescriptor) {
-fd = ((HasFileDescriptor)in).getFileDescriptor();
-  } else if (in instanceof FileInputStream) {
+  if (in instanceof FileInputStream) {
 fd = ((FileInputStream)in).getFD();
   }
 } catch (IOException e) {

svn commit: r1392180 - /hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

[mattf]

Author: mattf
Date: Mon Oct  1 03:21:26 2012
New Revision: 1392180

URL: http://svn.apache.org/viewvc?rev=1392180view=rev
Log:
reverting -r1392179, missed a needed line in the changelist

Modified:

hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

Modified: 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java?rev=1392180r1=1392179r2=1392180view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 Mon Oct  1 03:21:26 2012
@@ -101,7 +101,9 @@ class IFileInputStream extends InputStre
   private static FileDescriptor getFileDescriptorIfAvail(InputStream in) {
 FileDescriptor fd = null;
 try {
-  if (in instanceof FileInputStream) {
+  if (in instanceof HasFileDescriptor) {
+fd = ((HasFileDescriptor)in).getFileDescriptor();
+  } else if (in instanceof FileInputStream) {
 fd = ((FileInputStream)in).getFD();
   }
 } catch (IOException e) {

svn commit: r1392182 - /hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

[mattf]

Author: mattf
Date: Mon Oct  1 03:23:06 2012
New Revision: 1392182

URL: http://svn.apache.org/viewvc?rev=1392182view=rev
Log:
minor tweak to patch for MAPREDUCE-4511 (Add IFile readahead) to avoid use of 
interface HasFileDescriptor, which doesn't exist until 1.2

Modified:

hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java

Modified: 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java?rev=1392182r1=1392181r2=1392182view=diff
==
--- 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java
 Mon Oct  1 03:23:06 2012
@@ -29,7 +29,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.ChecksumException;
 import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.HasFileDescriptor;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.ReadaheadPool;
 import org.apache.hadoop.io.ReadaheadPool.ReadaheadRequest;
@@ -101,9 +100,7 @@ class IFileInputStream extends InputStre
   private static FileDescriptor getFileDescriptorIfAvail(InputStream in) {
 FileDescriptor fd = null;
 try {
-  if (in instanceof HasFileDescriptor) {
-fd = ((HasFileDescriptor)in).getFileDescriptor();
-  } else if (in instanceof FileInputStream) {
+  if (in instanceof FileInputStream) {
 fd = ((FileInputStream)in).getFD();
   }
 } catch (IOException e) {

svn commit: r1391844 - /hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

[mattf]

Author: mattf
Date: Sat Sep 29 17:20:01 2012
New Revision: 1391844

URL: http://svn.apache.org/viewvc?rev=1391844view=rev
Log:
release notes for Hadoop-1.1.0-rc5.

Modified:
hadoop/common/branches/branch-1.1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.1/src/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/docs/releasenotes.html?rev=1391844r1=1391843r2=1391844view=diff
==
--- hadoop/common/branches/branch-1.1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.1/src/docs/releasenotes.html Sat Sep 29 
17:20:01 2012
@@ -140,6 +140,14 @@ This feature is by default turned * off 
 Please see hdfs-default.xml for detailed description.
 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-1906;MAPREDUCE-1906/a.
+ Major improvement reported by scott_carey and fixed by tlipcon 
(jobtracker, performance, tasktracker)br
+ bLower default minimum heartbeat interval for tasktracker gt; 
Jobtracker/bbr
+ blockquote  The default minimum 
heartbeat interval has been dropped from 3 seconds to 300ms to increase 
scheduling throughput on small clusters. Users may tune 
mapreduce.jobtracker.heartbeats.in.second to adjust this value.
+
+  
+/blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-2517;MAPREDUCE-2517/a.
  Major task reported by vinaythota and fixed by vinaythota 
(contrib/gridmix)br
  bPorting Gridmix v3 system tests into trunk branch./bbr
@@ -180,6 +188,22 @@ Please see hdfs-default.xml for detailed
   
 /blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4673;MAPREDUCE-4673/a.
+ Major bug reported by arpitgupta and fixed by arpitgupta (test)br
+ bmake TestRawHistoryFile and TestJobHistoryServer more robust/bbr
+ blockquote  Fixed 
TestRawHistoryFile and TestJobHistoryServer to not write to /tmp.
+
+  
+/blockquote/li
+
+li a 
href=https://issues.apache.org/jira/browse/MAPREDUCE-4675;MAPREDUCE-4675/a.
+ Major bug reported by arpitgupta and fixed by bikassaha (test)br
+ bTestKillSubProcesses fails as the process is still alive after the job 
is done/bbr
+ blockquote  Fixed a race 
condition caused in TestKillSubProcesses caused due to a recent commit.
+
+  
+/blockquote/li
+
 /ul
 
 
@@ -361,11 +385,26 @@ Please see hdfs-default.xml for detailed
  bConflict: Same security.log.file for multiple users. /bbr
  blockquoteIn log4j.properties, hadoop.security.log.file is set to 
SecurityAuth.audit. In the presence of multiple users, this can lead to a 
potential conflict.brbrAdding username to the log file would avoid this 
scenario./blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8617;HADOOP-8617/a.
+ Major bug reported by brandonli and fixed by brandonli (performance)br
+ bbackport pure Java CRC32 calculator changes to branch-1/bbr
+ blockquoteMultiple efforts have been made gradually to improve the CRC 
performance in Hadoop. This JIRA is to back port these changes to branch-1, 
which include HADOOP-6166, HADOOP-6148, HADOOP-7333.brbrThe related HDFS 
and MAPREDUCE patches are uploaded to their original JIRAs HDFS-496 and 
MAPREDUCE-782./blockquote/li
+
 li a 
href=https://issues.apache.org/jira/browse/HADOOP-8656;HADOOP-8656/a.
  Minor improvement reported by ste...@apache.org and fixed by rvs (bin)br
  bbackport forced daemon shutdown of HADOOP-8353 into branch-1/bbr
  blockquotethe init.d service shutdown code doesnapos;t work if the 
daemon is hung -backporting the portion of HADOOP-8353 that edits 
bin/hadoop-daemon.sh corrects this/blockquote/li
 
+li a 
href=https://issues.apache.org/jira/browse/HADOOP-8748;HADOOP-8748/a.
+ Minor improvement reported by acmurthy and fixed by acmurthy (io)br
+ bMove dfsclient retry to a util class/bbr
+ blockquoteHDFS-3504 introduced mechanisms to retry RPCs. I want to move 
that to common to allow MAPREDUCE-4603 to share it too. Should be a trivial 
patch./blockquote/li
+
+li a href=https://issues.apache.org/jira/browse/HDFS-496;HDFS-496/a.
+ Minor improvement reported by tlipcon and fixed by tlipcon (data-node, 
hdfs client, performance)br
+ bUse PureJavaCrc32 in HDFS/bbr
+ blockquoteCommon now has a pure java CRC32 implementation which is more 
efficient than java.util.zip.CRC32. This issue is to make use of 
it./blockquote/li
+
 li a href=https://issues.apache.org/jira/browse/HDFS-1378;HDFS-1378/a.
  Major improvement reported by tlipcon and fixed by cmccabe (name-node)br
  bEdit log replay should track and report file offsets in case of 
errors/bbr
@@ -421,6 +460,11 @@ Please see hdfs-default.xml for detailed
  bRemove dfsadmin -printTopology from branch-1 docs