svn commit: r1511823 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java src/main/java/org/apache/hadoop/security/SaslRpcClient.j
Author: kihwal
Date: Thu Aug 8 15:03:12 2013
New Revision: 1511823
URL: http://svn.apache.org/r1511823
Log:
HADOOP-9850. RPC kerberos errors don't trigger relogin. Contributed by Daryn
Sharp.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511823r1=1511822r2=1511823view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug
8 15:03:12 2013
@@ -699,6 +699,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9816. RPC Sasl QOP is broken (daryn)
+HADOOP-9850. RPC kerberos errors don't trigger relogin. (daryn via kihwal)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1511823r1=1511822r2=1511823view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 15:03:12 2013
@@ -713,6 +713,7 @@ public class Client {
}
});
} catch (Exception ex) {
+ authMethod = saslRpcClient.getAuthMethod();
if (rand == null) {
rand = new Random();
}
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java?rev=1511823r1=1511822r2=1511823view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Thu Aug 8 15:03:12 2013
@@ -83,6 +83,7 @@ public class SaslRpcClient {
private final Configuration conf;
private SaslClient saslClient;
+ private AuthMethod authMethod;
private static final RpcRequestHeaderProto saslHeader = ProtoUtil
.makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER,
@@ -113,6 +114,18 @@ public class SaslRpcClient {
return (saslClient != null) ? saslClient.getNegotiatedProperty(key) : null;
}
+
+ // the RPC Client has an inelegant way of handling expiration of TGTs
+ // acquired via a keytab. any connection failure causes a relogin, so
+ // the Client needs to know what authMethod was being attempted if an
+ // exception occurs. the SASL prep for a kerberos connection should
+ // ideally relogin if necessary instead of exposing this detail to the
+ // Client
+ @InterfaceAudience.Private
+ public AuthMethod getAuthMethod() {
+return authMethod;
+ }
+
/**
* Instantiate a sasl client for the first supported auth type in the
* given list. The auth type must be defined, enabled, and the user
@@ -319,8 +332,9 @@ public class SaslRpcClient {
DataOutputStream outStream = new DataOutputStream(new BufferedOutputStream(
outS));
-// redefined if/when a SASL negotiation completes
-AuthMethod authMethod = AuthMethod.SIMPLE;
+// redefined if/when a SASL negotiation starts, can be queried if the
+// negotiation fails
+authMethod = AuthMethod.SIMPLE;
sendSaslMessage(outStream, negotiateRequest);
@@ -357,6 +371,7 @@ public class SaslRpcClient {
case NEGOTIATE: {
// create a compatible SASL client, throws if no supported auths
SaslAuth saslAuthType = selectSaslClient(saslMessage.getAuthsList());
+ // define auth being attempted, caller can query if connect fails
authMethod = AuthMethod.valueOf(saslAuthType.getMethod());
byte[] responseToken = null;
svn commit: r1511824 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java src/main/java/org/apache/hadoop/security/Sas
Author: kihwal
Date: Thu Aug 8 15:05:20 2013
New Revision: 1511824
URL: http://svn.apache.org/r1511824
Log:
svn merge -c 1511823 from trunk to branch-2 to FIX HADOOP-9850. RPC kerberos
errors don't trigger relogin.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511824r1=1511823r2=1511824view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 8 15:05:20 2013
@@ -432,6 +432,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9816. RPC Sasl QOP is broken (daryn)
+HADOOP-9850. RPC kerberos errors don't trigger relogin. (daryn via kihwal)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1511824r1=1511823r2=1511824view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 15:05:20 2013
@@ -713,6 +713,7 @@ public class Client {
}
});
} catch (Exception ex) {
+ authMethod = saslRpcClient.getAuthMethod();
if (rand == null) {
rand = new Random();
}
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java?rev=1511824r1=1511823r2=1511824view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Thu Aug 8 15:05:20 2013
@@ -83,6 +83,7 @@ public class SaslRpcClient {
private final Configuration conf;
private SaslClient saslClient;
+ private AuthMethod authMethod;
private static final RpcRequestHeaderProto saslHeader = ProtoUtil
.makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER,
@@ -113,6 +114,18 @@ public class SaslRpcClient {
return (saslClient != null) ? saslClient.getNegotiatedProperty(key) : null;
}
+
+ // the RPC Client has an inelegant way of handling expiration of TGTs
+ // acquired via a keytab. any connection failure causes a relogin, so
+ // the Client needs to know what authMethod was being attempted if an
+ // exception occurs. the SASL prep for a kerberos connection should
+ // ideally relogin if necessary instead of exposing this detail to the
+ // Client
+ @InterfaceAudience.Private
+ public AuthMethod getAuthMethod() {
+return authMethod;
+ }
+
/**
* Instantiate a sasl client for the first supported auth type in the
* given list. The auth type must be defined, enabled, and the user
@@ -319,8 +332,9 @@ public class SaslRpcClient {
DataOutputStream outStream = new DataOutputStream(new BufferedOutputStream(
outS));
-// redefined if/when a SASL negotiation completes
-AuthMethod authMethod = AuthMethod.SIMPLE;
+// redefined if/when a SASL negotiation starts, can be queried if the
+// negotiation fails
+authMethod = AuthMethod.SIMPLE;
sendSaslMessage(outStream, negotiateRequest);
@@ -357,6 +371,7 @@ public class SaslRpcClient {
case NEGOTIATE: {
// create a compatible SASL client, throws if no supported auths
SaslAuth saslAuthType = selectSaslClient(saslMessage.getAuthsList());
+ // define auth being attempted, caller can query if connect fails
authMethod =
svn commit: r1511827 - in /hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java src/main/java/org/apache/hadoop/sec
Author: kihwal
Date: Thu Aug 8 15:07:43 2013
New Revision: 1511827
URL: http://svn.apache.org/r1511827
Log:
svn merge -c 1511823 from trunk to branch-2.1.0-beta to FIX HADOOP-9850. RPC
kerberos errors don't trigger relogin.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511827r1=1511826r2=1511827view=diff
==
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 8 15:07:43 2013
@@ -367,6 +367,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9816. RPC Sasl QOP is broken (daryn)
+HADOOP-9850. RPC kerberos errors don't trigger relogin. (daryn via kihwal)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1511827r1=1511826r2=1511827view=diff
==
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 15:07:43 2013
@@ -660,6 +660,7 @@ public class Client {
}
});
} catch (Exception ex) {
+ authMethod = saslRpcClient.getAuthMethod();
if (rand == null) {
rand = new Random();
}
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java?rev=1511827r1=1511826r2=1511827view=diff
==
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Thu Aug 8 15:07:43 2013
@@ -83,6 +83,7 @@ public class SaslRpcClient {
private final Configuration conf;
private SaslClient saslClient;
+ private AuthMethod authMethod;
private static final RpcRequestHeaderProto saslHeader = ProtoUtil
.makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER,
@@ -113,6 +114,18 @@ public class SaslRpcClient {
return (saslClient != null) ? saslClient.getNegotiatedProperty(key) : null;
}
+
+ // the RPC Client has an inelegant way of handling expiration of TGTs
+ // acquired via a keytab. any connection failure causes a relogin, so
+ // the Client needs to know what authMethod was being attempted if an
+ // exception occurs. the SASL prep for a kerberos connection should
+ // ideally relogin if necessary instead of exposing this detail to the
+ // Client
+ @InterfaceAudience.Private
+ public AuthMethod getAuthMethod() {
+return authMethod;
+ }
+
/**
* Instantiate a sasl client for the first supported auth type in the
* given list. The auth type must be defined, enabled, and the user
@@ -319,8 +332,9 @@ public class SaslRpcClient {
DataOutputStream outStream = new DataOutputStream(new BufferedOutputStream(
outS));
-// redefined if/when a SASL negotiation completes
-AuthMethod authMethod = AuthMethod.SIMPLE;
+// redefined if/when a SASL negotiation starts, can be queried if the
+// negotiation fails
+authMethod = AuthMethod.SIMPLE;
sendSaslMessage(outStream, negotiateRequest);
@@ -357,6 +371,7 @@ public class SaslRpcClient {
case NEGOTIATE: {
// create a compatible SASL client, throws if no supported auths
SaslAuth saslAuthType =
svn commit: r1511826 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java src/main/java/org/apache/hadoop/secur
Author: kihwal
Date: Thu Aug 8 15:06:36 2013
New Revision: 1511826
URL: http://svn.apache.org/r1511826
Log:
svn merge -c 1511823 from trunk to branch-2.1-beta to FIX HADOOP-9850. RPC
kerberos errors don't trigger relogin.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511826r1=1511825r2=1511826view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 8 15:06:36 2013
@@ -400,6 +400,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9816. RPC Sasl QOP is broken (daryn)
+HADOOP-9850. RPC kerberos errors don't trigger relogin. (daryn via kihwal)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1511826r1=1511825r2=1511826view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 15:06:36 2013
@@ -660,6 +660,7 @@ public class Client {
}
});
} catch (Exception ex) {
+ authMethod = saslRpcClient.getAuthMethod();
if (rand == null) {
rand = new Random();
}
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java?rev=1511826r1=1511825r2=1511826view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
Thu Aug 8 15:06:36 2013
@@ -83,6 +83,7 @@ public class SaslRpcClient {
private final Configuration conf;
private SaslClient saslClient;
+ private AuthMethod authMethod;
private static final RpcRequestHeaderProto saslHeader = ProtoUtil
.makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER,
@@ -113,6 +114,18 @@ public class SaslRpcClient {
return (saslClient != null) ? saslClient.getNegotiatedProperty(key) : null;
}
+
+ // the RPC Client has an inelegant way of handling expiration of TGTs
+ // acquired via a keytab. any connection failure causes a relogin, so
+ // the Client needs to know what authMethod was being attempted if an
+ // exception occurs. the SASL prep for a kerberos connection should
+ // ideally relogin if necessary instead of exposing this detail to the
+ // Client
+ @InterfaceAudience.Private
+ public AuthMethod getAuthMethod() {
+return authMethod;
+ }
+
/**
* Instantiate a sasl client for the first supported auth type in the
* given list. The auth type must be defined, enabled, and the user
@@ -319,8 +332,9 @@ public class SaslRpcClient {
DataOutputStream outStream = new DataOutputStream(new BufferedOutputStream(
outS));
-// redefined if/when a SASL negotiation completes
-AuthMethod authMethod = AuthMethod.SIMPLE;
+// redefined if/when a SASL negotiation starts, can be queried if the
+// negotiation fails
+authMethod = AuthMethod.SIMPLE;
sendSaslMessage(outStream, negotiateRequest);
@@ -357,6 +371,7 @@ public class SaslRpcClient {
case NEGOTIATE: {
// create a compatible SASL client, throws if no supported auths
SaslAuth saslAuthType = selectSaslClient(saslMessage.getAuthsList());
+ // define auth
svn commit: r1511919 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cmccabe Date: Thu Aug 8 18:26:18 2013 New Revision: 1511919 URL: http://svn.apache.org/r1511919 Log: move HADOOP-9435 to branch-2.1.1-beta Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511919r1=1511918r2=1511919view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 18:26:18 2013 @@ -23,9 +23,6 @@ Release 2.3.0 - UNRELEASED HADOOP-9618. Add thread which detects GC pauses. (Todd Lipcon via Colin Patrick McCabe) -HADOOP-9435. Support building the JNI code against the IBM JVM. -(Tian Hong Wang via Colin Patrick McCabe) - HADOOP-9758. Provide configuration option for FileSystem/FileContext symlink resolution. (Andrew Wang via Colin Patrick McCabe) @@ -61,6 +58,9 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9821. ClientId should have getMsb/getLsb methods. (Tsuyoshi OZAWA via jing9) +HADOOP-9435. Support building the JNI code against the IBM JVM. +(Tian Hong Wang via Colin Patrick McCabe) + OPTIMIZATIONS BUG FIXES
svn commit: r1511935 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/JNIFlags.cmake
Author: cmccabe
Date: Thu Aug 8 18:44:06 2013
New Revision: 1511935
URL: http://svn.apache.org/r1511935
Log:
HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong
Wang via Colin Patrick McCabe)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511935r1=1511934r2=1511935view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 8 18:44:06 2013
@@ -11,6 +11,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9787. ShutdownHelper util to shutdown threads and threadpools.
(Karthik Kambatla via Sandy Ryza)
+HADOOP-9435. Support building the JNI code against the IBM JVM.
+(Tian Hong Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake?rev=1511935r1=1511934r2=1511935view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
Thu Aug 8 18:44:06 2013
@@ -95,8 +95,9 @@ IF(${CMAKE_SYSTEM} MATCHES Linux)
NAMES jni.h
PATHS ${_JDK_DIRS}
NO_DEFAULT_PATH)
+#In IBM java, it's jniport.h instead of jni_md.h
FIND_PATH(JAVA_INCLUDE_PATH2
-NAMES jni_md.h
+NAMES jni_md.h jniport.h
PATHS ${_JDK_DIRS}
NO_DEFAULT_PATH)
SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
svn commit: r1511944 - /hadoop/common/branches/branch-1/CHANGES.txt
Author: acmurthy Date: Thu Aug 8 18:51:14 2013 New Revision: 1511944 URL: http://svn.apache.org/r1511944 Log: MAPREDUCE-5450. Merged to 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=1511944r1=1511943r2=1511944view=diff == --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Thu Aug 8 18:51:14 2013 @@ -123,6 +123,18 @@ Release 1.3.0 - unreleased MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) +Release 1.2.2 - unreleased + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + MAPREDUCE-5450. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton and Ted Yu via Sandy Ryza)
svn commit: r1512026 - /hadoop/common/trunk/hadoop-project/pom.xml
Author: stevel Date: Thu Aug 8 20:54:17 2013 New Revision: 1512026 URL: http://svn.apache.org/r1512026 Log: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/trunk/hadoop-project/pom.xml Modified: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1512026r1=1512025r2=1512026view=diff == --- hadoop/common/trunk/hadoop-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-project/pom.xml Thu Aug 8 20:54:17 2013 @@ -548,12 +548,12 @@ dependency groupIdorg.slf4j/groupId artifactIdslf4j-api/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.slf4j/groupId artifactIdslf4j-log4j12/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.eclipse.jdt/groupId
svn commit: r1512026 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: stevel Date: Thu Aug 8 20:54:17 2013 New Revision: 1512026 URL: http://svn.apache.org/r1512026 Log: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512026r1=1512025r2=1512026view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 20:54:17 2013 @@ -106,6 +106,8 @@ Trunk (Unreleased) HADOOP-9186. test-patch.sh should report build failure to JIRA. (Binglin Chang via Colin Patrick McCabe) +HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled.
svn commit: r1512042 - /hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml
Author: stevel Date: Thu Aug 8 21:26:28 2013 New Revision: 1512042 URL: http://svn.apache.org/r1512042 Log: merge r1512026: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml (contents, props changed) Modified: hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml?rev=1512042r1=1512041r2=1512042view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml Thu Aug 8 21:26:28 2013 @@ -547,12 +547,12 @@ dependency groupIdorg.slf4j/groupId artifactIdslf4j-api/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.slf4j/groupId artifactIdslf4j-log4j12/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.eclipse.jdt/groupId Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Aug 8 21:26:28 2013 @@ -0,0 +1,2 @@ +/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml:1227776-1294021 +/hadoop/common/trunk/hadoop-project/pom.xml:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1 301308,1301312,1301820,1301871,1302624,1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1333557,1334216,1342112,1348207,1349616,1351445,1351818,1361813,1373683,1374696,1375829,1430682,1430688,1440245,1476395,1477849,1480838,1480840,1487093,1512026
svn commit: r1512042 - /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Author: stevel Date: Thu Aug 8 21:26:28 2013 New Revision: 1512042 URL: http://svn.apache.org/r1512042 Log: merge r1512026: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512042r1=1512041r2=1512042view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 21:26:28 2013 @@ -17,6 +17,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9355. Abstract symlink tests to use either FileContext or FileSystem. (Andrew Wang via Colin Patrick McCabe) +HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel) + OPTIMIZATIONS BUG FIXES
svn commit: r1512048 - /hadoop/common/branches/branch-2/hadoop-project/pom.xml
Author: stevel Date: Thu Aug 8 21:32:01 2013 New Revision: 1512048 URL: http://svn.apache.org/r1512048 Log: merge r1512026: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml (contents, props changed) Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1512048r1=1512047r2=1512048view=diff == --- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu Aug 8 21:32:01 2013 @@ -547,12 +547,12 @@ dependency groupIdorg.slf4j/groupId artifactIdslf4j-api/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.slf4j/groupId artifactIdslf4j-log4j12/artifactId -version1.6.1/version +version1.7.5/version /dependency dependency groupIdorg.eclipse.jdt/groupId Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Aug 8 21:32:01 2013 @@ -0,0 +1,2 @@ +/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml:1227776-1294021 +/hadoop/common/trunk/hadoop-project/pom.xml:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1 301308,1301312,1301820,1301871,1302624,1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1333557,1334216,1342112,1348207,1349616,1351445,1351818,1361813,1373683,1374696,1375829,1430682,1430688,1440245,1476395,1477849,1480838,1480840,1487093,1512026
svn commit: r1512048 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: stevel Date: Thu Aug 8 21:32:01 2013 New Revision: 1512048 URL: http://svn.apache.org/r1512048 Log: merge r1512026: HADOOP-9833 move slf4j to version 1.7.5 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512048r1=1512047r2=1512048view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 21:32:01 2013 @@ -61,6 +61,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe) +HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel) + OPTIMIZATIONS BUG FIXES
svn commit: r1512081 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Author: acmurthy
Date: Thu Aug 8 22:54:31 2013
New Revision: 1512081
URL: http://svn.apache.org/r1512081
Log:
YARN-1043. Push all metrics consistently. Contributed by Jian He.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1512081r1=1512080r2=1512081view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Thu Aug 8 22:54:31 2013
@@ -381,7 +381,7 @@ public class MetricsSystemImpl extends M
private void snapshotMetrics(MetricsSourceAdapter sa,
MetricsBufferBuilder bufferBuilder) {
long startTime = Time.now();
-bufferBuilder.add(sa.name(), sa.getMetrics(collector, false));
+bufferBuilder.add(sa.name(), sa.getMetrics(collector, true));
collector.clear();
snapshotStat.add(Time.now() - startTime);
LOG.debug(Snapshotted source + sa.name());
svn commit: r1512082 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Author: acmurthy
Date: Thu Aug 8 22:55:33 2013
New Revision: 1512082
URL: http://svn.apache.org/r1512082
Log:
Merge -c 1512081 from trunk to branch-2 to fix YARN-1043. Push all metrics
consistently. Contributed by Jian He.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1512082r1=1512081r2=1512082view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Thu Aug 8 22:55:33 2013
@@ -384,7 +384,7 @@ public class MetricsSystemImpl extends M
private void snapshotMetrics(MetricsSourceAdapter sa,
MetricsBufferBuilder bufferBuilder) {
long startTime = Time.now();
-bufferBuilder.add(sa.name(), sa.getMetrics(collector, false));
+bufferBuilder.add(sa.name(), sa.getMetrics(collector, true));
collector.clear();
snapshotStat.add(Time.now() - startTime);
LOG.debug(Snapshotted source + sa.name());
svn commit: r1512083 - /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Author: acmurthy
Date: Thu Aug 8 22:55:48 2013
New Revision: 1512083
URL: http://svn.apache.org/r1512083
Log:
Merge -c 1512081 from trunk to branch-2.1-beta to fix YARN-1043. Push all
metrics consistently. Contributed by Jian He.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1512083r1=1512082r2=1512083view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Thu Aug 8 22:55:48 2013
@@ -384,7 +384,7 @@ public class MetricsSystemImpl extends M
private void snapshotMetrics(MetricsSourceAdapter sa,
MetricsBufferBuilder bufferBuilder) {
long startTime = Time.now();
-bufferBuilder.add(sa.name(), sa.getMetrics(collector, false));
+bufferBuilder.add(sa.name(), sa.getMetrics(collector, true));
collector.clear();
snapshotStat.add(Time.now() - startTime);
LOG.debug(Snapshotted source + sa.name());
svn commit: r1512085 - /hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Author: acmurthy
Date: Thu Aug 8 22:55:58 2013
New Revision: 1512085
URL: http://svn.apache.org/r1512085
Log:
Merge -c 1512081 from trunk to branch-2.1.0-beta to fix YARN-1043. Push all
metrics consistently. Contributed by Jian He.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1512085r1=1512084r2=1512085view=diff
==
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Thu Aug 8 22:55:58 2013
@@ -384,7 +384,7 @@ public class MetricsSystemImpl extends M
private void snapshotMetrics(MetricsSourceAdapter sa,
MetricsBufferBuilder bufferBuilder) {
long startTime = Time.now();
-bufferBuilder.add(sa.name(), sa.getMetrics(collector, false));
+bufferBuilder.add(sa.name(), sa.getMetrics(collector, true));
collector.clear();
snapshotStat.add(Time.now() - startTime);
LOG.debug(Snapshotted source + sa.name());
svn commit: r1512091 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/hadoop/security/ src/main/proto/
Author: jitendra
Date: Thu Aug 8 23:02:20 2013
New Revision: 1512091
URL: http://svn.apache.org/r1512091
Log:
HADOOP-9820. RPCv9 wire protocol is insufficient to support multiplexing.
Contributed by Daryn Sharp.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512091r1=1512090r2=1512091view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug
8 23:02:20 2013
@@ -383,6 +383,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9832. [RPC v9] Add RPC header to client ping (daryn)
+HADOOP-9820. [RPC v9] Wire protocol is insufficient to support
multiplexing. (daryn via jitendra)
+
NEW FEATURES
HADOOP-9283. Add support for running the Hadoop client on AIX. (atm)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1512091r1=1512090r2=1512091view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 23:02:20 2013
@@ -737,12 +737,16 @@ public class Client {
}
if (doPing) {
-this.in = new DataInputStream(new BufferedInputStream(
-new PingInputStream(inStream)));
- } else {
-this.in = new DataInputStream(new BufferedInputStream(inStream));
+inStream = new PingInputStream(inStream);
+ }
+ this.in = new DataInputStream(new BufferedInputStream(inStream));
+
+ // SASL may have already buffered the stream
+ if (!(outStream instanceof BufferedOutputStream)) {
+outStream = new BufferedOutputStream(outStream);
}
- this.out = new DataOutputStream(new BufferedOutputStream(outStream));
+ this.out = new DataOutputStream(outStream);
+
writeConnectionContext(remoteId, authMethod);
// update last activity time
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1512091r1=1512090r2=1512091view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Thu Aug 8 23:02:20 2013
@@ -73,6 +73,8 @@ import org.apache.hadoop.io.DataOutputBu
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableUtils;
import static org.apache.hadoop.ipc.RpcConstants.*;
+
+import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseMessageWrapper;
import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseWrapper;
import org.apache.hadoop.ipc.RPC.RpcInvoker;
import org.apache.hadoop.ipc.RPC.VersionMismatch;
@@ -1274,7 +1276,27 @@ public abstract class Server {
}
private void saslReadAndProcess(DataInputStream dis) throws
-WrappedRpcServerException, IOException, InterruptedException {
+WrappedRpcServerException, IOException, InterruptedException {
+ final RpcSaslProto saslMessage =
+ decodeProtobufFromStream(RpcSaslProto.newBuilder(), dis);
+ switch (saslMessage.getState()) {
+case WRAP: {
+ if (!saslContextEstablished || !useWrap) {
+throw new WrappedRpcServerException(
+RpcErrorCodeProto.FATAL_INVALID_RPC_HEADER,
+new SaslException(Server is not wrapping data));
+ }
+ // loops over decoded data and calls processOneRpc
+ unwrapPacketAndProcessRpcs(saslMessage.getToken().toByteArray());
+ break;
+}
+default:
svn commit: r1512094 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/hadoop/security/ src/main/proto/
Author: jitendra
Date: Thu Aug 8 23:11:10 2013
New Revision: 1512094
URL: http://svn.apache.org/r1512094
Log:
Merge -c 1512091 from trunk for HADOOP-9820. RPCv9 wire protocol is
insufficient to support multiplexing. Contributed by Daryn Sharp.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512094r1=1512093r2=1512094view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 8 23:11:10 2013
@@ -110,6 +110,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9832. [RPC v9] Add RPC header to client ping (daryn)
+HADOOP-9820. [RPC v9] Wire protocol is insufficient to support
multiplexing. (daryn via jitendra)
+
NEW FEATURES
HADOOP-9283. Add support for running the Hadoop client on AIX. (atm)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1512094r1=1512093r2=1512094view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Aug 8 23:11:10 2013
@@ -737,12 +737,16 @@ public class Client {
}
if (doPing) {
-this.in = new DataInputStream(new BufferedInputStream(
-new PingInputStream(inStream)));
- } else {
-this.in = new DataInputStream(new BufferedInputStream(inStream));
+inStream = new PingInputStream(inStream);
+ }
+ this.in = new DataInputStream(new BufferedInputStream(inStream));
+
+ // SASL may have already buffered the stream
+ if (!(outStream instanceof BufferedOutputStream)) {
+outStream = new BufferedOutputStream(outStream);
}
- this.out = new DataOutputStream(new BufferedOutputStream(outStream));
+ this.out = new DataOutputStream(outStream);
+
writeConnectionContext(remoteId, authMethod);
// update last activity time
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1512094r1=1512093r2=1512094view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Thu Aug 8 23:11:10 2013
@@ -72,6 +72,8 @@ import org.apache.hadoop.io.DataOutputBu
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableUtils;
import static org.apache.hadoop.ipc.RpcConstants.*;
+
+import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseMessageWrapper;
import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseWrapper;
import org.apache.hadoop.ipc.RPC.RpcInvoker;
import org.apache.hadoop.ipc.RPC.VersionMismatch;
@@ -1271,7 +1273,27 @@ public abstract class Server {
}
private void saslReadAndProcess(DataInputStream dis) throws
-WrappedRpcServerException, IOException, InterruptedException {
+WrappedRpcServerException, IOException, InterruptedException {
+ final RpcSaslProto saslMessage =
+ decodeProtobufFromStream(RpcSaslProto.newBuilder(), dis);
+ switch (saslMessage.getState()) {
+case WRAP: {
+ if (!saslContextEstablished || !useWrap) {
+throw new WrappedRpcServerException(
+RpcErrorCodeProto.FATAL_INVALID_RPC_HEADER,
+new
svn commit: r1512096 - /hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml
Author: cnauroth Date: Thu Aug 8 23:20:01 2013 New Revision: 1512096 URL: http://svn.apache.org/r1512096 Log: HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. Contributed by Dennis Y. Modified: hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml?rev=1512096r1=1512095r2=1512096view=diff == --- hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml Thu Aug 8 23:20:01 2013 @@ -71,6 +71,17 @@ /execution /executions /plugin + !-- + Skip Clover instrumentation for this module to prevent error finding Clover + classes during plugin execution when running a build with Clover enabled. + -- + plugin +groupIdcom.atlassian.maven.plugins/groupId +artifactIdmaven-clover2-plugin/artifactId +configuration + skiptrue/skip +/configuration + /plugin /plugins /build /project
svn commit: r1512096 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cnauroth Date: Thu Aug 8 23:20:01 2013 New Revision: 1512096 URL: http://svn.apache.org/r1512096 Log: HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. Contributed by Dennis Y. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512096r1=1512095r2=1512096view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 23:20:01 2013 @@ -79,6 +79,9 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9527. Add symlink support to LocalFileSystem on Windows. (Arpit Agarwal via cnauroth) +HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to +fix build failures. (Dennis Y via cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES
svn commit: r1512098 - /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cnauroth Date: Thu Aug 8 23:35:06 2013 New Revision: 1512098 URL: http://svn.apache.org/r1512098 Log: HADOOP-9315. Merging change r1512096 from branch-2 to branch-2.1-beta. Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512098r1=1512097r2=1512098view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 23:35:06 2013 @@ -53,6 +53,9 @@ Release 2.1.0-beta - 2013-08-06 HADOOP-9768. chown and chgrp reject users and groups with spaces on platforms where spaces are otherwise acceptable. (cnauroth) +HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to +fix build failures. (Dennis Y via cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES
svn commit: r1512098 - /hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml
Author: cnauroth Date: Thu Aug 8 23:35:06 2013 New Revision: 1512098 URL: http://svn.apache.org/r1512098 Log: HADOOP-9315. Merging change r1512096 from branch-2 to branch-2.1-beta. Modified: hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml Modified: hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml?rev=1512098r1=1512097r2=1512098view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-maven-plugins/pom.xml Thu Aug 8 23:35:06 2013 @@ -71,6 +71,17 @@ /execution /executions /plugin + !-- + Skip Clover instrumentation for this module to prevent error finding Clover + classes during plugin execution when running a build with Clover enabled. + -- + plugin +groupIdcom.atlassian.maven.plugins/groupId +artifactIdmaven-clover2-plugin/artifactId +configuration + skiptrue/skip +/configuration + /plugin /plugins /build /project
svn commit: r1512101 - /hadoop/common/trunk/.gitattributes
Author: cnauroth Date: Thu Aug 8 23:49:11 2013 New Revision: 1512101 URL: http://svn.apache.org/r1512101 Log: HADOOP-9831. Make checknative shell command accessible on Windows. Contributed by Chris Nauroth. Modified: hadoop/common/trunk/.gitattributes Modified: hadoop/common/trunk/.gitattributes URL: http://svn.apache.org/viewvc/hadoop/common/trunk/.gitattributes?rev=1512101r1=1512100r2=1512101view=diff == --- hadoop/common/trunk/.gitattributes (original) +++ hadoop/common/trunk/.gitattributes Thu Aug 8 23:49:11 2013 @@ -14,5 +14,6 @@ *.sh text eol=lf *.battext eol=crlf +*.cmdtext eol=crlf *.csproj text merge=union eol=crlf *.slntext merge=union eol=crlf
svn commit: r1512101 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Thu Aug 8 23:49:11 2013 New Revision: 1512101 URL: http://svn.apache.org/r1512101 Log: HADOOP-9831. Make checknative shell command accessible on Windows. Contributed by Chris Nauroth. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512101r1=1512100r2=1512101view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 23:49:11 2013 @@ -352,6 +352,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9527. Add symlink support to LocalFileSystem on Windows. (Arpit Agarwal via cnauroth) +HADOOP-9831. Make checknative shell command accessible on Windows. (cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1512101r1=1512100r2=1512101view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Thu Aug 8 23:49:11 2013 @@ -119,7 +119,7 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof ) - set corecommands=fs version jar distcp daemonlog archive + set corecommands=fs version jar checknative distcp daemonlog archive for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -157,6 +157,10 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.RunJar goto :eof +:checknative + set CLASS=org.apache.hadoop.util.NativeLibraryChecker + goto :eof + :distcp set CLASS=org.apache.hadoop.tools.DistCp set CLASSPATH=%CLASSPATH%;%TOOL_PATH% @@ -222,6 +226,7 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^jar^run a jar file + @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^srcurl^ ^desturl^ copy file or directories recursively @echo archive -archiveName NAME -p ^parent path^ ^src^* ^dest^ create a hadoop archive @echo classpathprints the class path needed to get the
svn commit: r1512105 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Thu Aug 8 23:55:56 2013 New Revision: 1512105 URL: http://svn.apache.org/r1512105 Log: HADOOP-9831. Merging change r1512101 from trunk to branch-2. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512105r1=1512104r2=1512105view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 23:55:56 2013 @@ -82,6 +82,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. (Dennis Y via cnauroth) +HADOOP-9831. Make checknative shell command accessible on Windows. (cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1512105r1=1512104r2=1512105view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Thu Aug 8 23:55:56 2013 @@ -119,7 +119,7 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof ) - set corecommands=fs version jar distcp daemonlog archive + set corecommands=fs version jar checknative distcp daemonlog archive for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -157,6 +157,10 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.RunJar goto :eof +:checknative + set CLASS=org.apache.hadoop.util.NativeLibraryChecker + goto :eof + :distcp set CLASS=org.apache.hadoop.tools.DistCp set CLASSPATH=%CLASSPATH%;%TOOL_PATH% @@ -222,6 +226,7 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^jar^run a jar file + @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^srcurl^ ^desturl^ copy file or directories recursively @echo archive -archiveName NAME -p ^parent path^ ^src^* ^dest^ create a hadoop archive @echo classpathprints the class path needed to get the
svn commit: r1512105 - /hadoop/common/branches/branch-2/.gitattributes
Author: cnauroth Date: Thu Aug 8 23:55:56 2013 New Revision: 1512105 URL: http://svn.apache.org/r1512105 Log: HADOOP-9831. Merging change r1512101 from trunk to branch-2. Modified: hadoop/common/branches/branch-2/.gitattributes Modified: hadoop/common/branches/branch-2/.gitattributes URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/.gitattributes?rev=1512105r1=1512104r2=1512105view=diff == --- hadoop/common/branches/branch-2/.gitattributes (original) +++ hadoop/common/branches/branch-2/.gitattributes Thu Aug 8 23:55:56 2013 @@ -14,5 +14,6 @@ *.sh text eol=lf *.battext eol=crlf +*.cmdtext eol=crlf *.csproj text merge=union eol=crlf *.slntext merge=union eol=crlf
svn commit: r1512106 - /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cnauroth Date: Fri Aug 9 00:00:51 2013 New Revision: 1512106 URL: http://svn.apache.org/r1512106 Log: HADOOP-9315. Correct attribution in CHANGES.txt to 2.1.1-beta. Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512106r1=1512105r2=1512106view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 9 00:00:51 2013 @@ -32,6 +32,9 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9806 PortmapInterface should check if the procedure is out-of-range (brandonli) +HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to +fix build failures. (Dennis Y via cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES @@ -53,9 +56,6 @@ Release 2.1.0-beta - 2013-08-06 HADOOP-9768. chown and chgrp reject users and groups with spaces on platforms where spaces are otherwise acceptable. (cnauroth) -HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to -fix build failures. (Dennis Y via cnauroth) - Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES
svn commit: r1512108 - /hadoop/common/branches/branch-2.1-beta/.gitattributes
Author: cnauroth Date: Fri Aug 9 00:11:34 2013 New Revision: 1512108 URL: http://svn.apache.org/r1512108 Log: HADOOP-9831. Merging change r1512105 from branch-2 to branch-2.1-beta. Modified: hadoop/common/branches/branch-2.1-beta/.gitattributes Modified: hadoop/common/branches/branch-2.1-beta/.gitattributes URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/.gitattributes?rev=1512108r1=1512107r2=1512108view=diff == --- hadoop/common/branches/branch-2.1-beta/.gitattributes (original) +++ hadoop/common/branches/branch-2.1-beta/.gitattributes Fri Aug 9 00:11:34 2013 @@ -14,5 +14,6 @@ *.sh text eol=lf *.battext eol=crlf +*.cmdtext eol=crlf *.csproj text merge=union eol=crlf *.slntext merge=union eol=crlf
svn commit: r1512108 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Fri Aug 9 00:11:34 2013 New Revision: 1512108 URL: http://svn.apache.org/r1512108 Log: HADOOP-9831. Merging change r1512105 from branch-2 to branch-2.1-beta. Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512108r1=1512107r2=1512108view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 9 00:11:34 2013 @@ -35,6 +35,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. (Dennis Y via cnauroth) +HADOOP-9831. Make checknative shell command accessible on Windows. (cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1512108r1=1512107r2=1512108view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Fri Aug 9 00:11:34 2013 @@ -119,7 +119,7 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof ) - set corecommands=fs version jar distcp daemonlog archive + set corecommands=fs version jar checknative distcp daemonlog archive for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -157,6 +157,10 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.RunJar goto :eof +:checknative + set CLASS=org.apache.hadoop.util.NativeLibraryChecker + goto :eof + :distcp set CLASS=org.apache.hadoop.tools.DistCp set CLASSPATH=%CLASSPATH%;%TOOL_PATH% @@ -222,6 +226,7 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^jar^run a jar file + @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^srcurl^ ^desturl^ copy file or directories recursively @echo archive -archiveName NAME -p ^parent path^ ^src^* ^dest^ create a hadoop archive @echo classpathprints the class path needed to get the
svn commit: r1512121 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/hadoop/security/ src/main/proto/
Author: jitendra
Date: Fri Aug 9 01:18:06 2013
New Revision: 1512121
URL: http://svn.apache.org/r1512121
Log:
svn merge -c 1512091 from trunk for HADOOP-9820. RPCv9 wire protocol is
insufficient to support multiplexing. Contributed by Daryn Sharp.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512121r1=1512120r2=1512121view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Aug 9 01:18:06 2013
@@ -89,6 +89,8 @@ Release 2.1.0-beta - 2013-08-06
HADOOP-9832. [RPC v9] Add RPC header to client ping (daryn)
+HADOOP-9820. [RPC v9] Wire protocol is insufficient to support
multiplexing. (daryn via jitendra)
+
NEW FEATURES
HADOOP-9283. Add support for running the Hadoop client on AIX. (atm)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1512121r1=1512120r2=1512121view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Fri Aug 9 01:18:06 2013
@@ -684,12 +684,16 @@ public class Client {
}
if (doPing) {
-this.in = new DataInputStream(new BufferedInputStream(
-new PingInputStream(inStream)));
- } else {
-this.in = new DataInputStream(new BufferedInputStream(inStream));
+inStream = new PingInputStream(inStream);
+ }
+ this.in = new DataInputStream(new BufferedInputStream(inStream));
+
+ // SASL may have already buffered the stream
+ if (!(outStream instanceof BufferedOutputStream)) {
+outStream = new BufferedOutputStream(outStream);
}
- this.out = new DataOutputStream(new BufferedOutputStream(outStream));
+ this.out = new DataOutputStream(outStream);
+
writeConnectionContext(remoteId, authMethod);
// update last activity time
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1512121r1=1512120r2=1512121view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Fri Aug 9 01:18:06 2013
@@ -72,6 +72,8 @@ import org.apache.hadoop.io.DataOutputBu
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableUtils;
import static org.apache.hadoop.ipc.RpcConstants.*;
+
+import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseMessageWrapper;
import org.apache.hadoop.ipc.ProtobufRpcEngine.RpcResponseWrapper;
import org.apache.hadoop.ipc.RPC.RpcInvoker;
import org.apache.hadoop.ipc.RPC.VersionMismatch;
@@ -1271,7 +1273,27 @@ public abstract class Server {
}
private void saslReadAndProcess(DataInputStream dis) throws
-WrappedRpcServerException, IOException, InterruptedException {
+WrappedRpcServerException, IOException, InterruptedException {
+ final RpcSaslProto saslMessage =
+ decodeProtobufFromStream(RpcSaslProto.newBuilder(), dis);
+ switch (saslMessage.getState()) {
+case WRAP: {
+ if (!saslContextEstablished || !useWrap) {
+
