svn commit: r1596000 - in /hadoop/common/branches/HDFS-2006/hadoop-common-project: hadoop-common/ hadoop-common/src/main/docs/ hadoop-common/src/main/java/ hadoop-common/src/main/java/org/apache/hadoo
Author: wang Date: Mon May 19 19:29:30 2014 New Revision: 1596000 URL: http://svn.apache.org/r1596000 Log: Merge trunk r1595999 to branch. Added: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java - copied unchanged from r1595999, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/ScopedAclEntries.java - copied unchanged from r1595999, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/ScopedAclEntries.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/resources/ - copied from r1595999, hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/resources/ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties - copied unchanged from r1595999, hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestIdUserGroup.java hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1596000r1=1595999r2=1596000view=diff == --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 19 19:29:30 2014 @@ -328,6 +328,8 @@ Trunk (Unreleased) HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other fixups. (clamb via tucu) +HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via tucu) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) @@ -388,6 +390,11 @@ Release 2.5.0 - UNRELEASED HADOOP-10572. Example NFS mount command must pass noacl as it isn't supported by the server yet. (Harsh J via brandonli) +HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha) + +HADOOP-10614. CBZip2InputStream is not threadsafe (Xiangrui Meng via +Sandy Ryza) + OPTIMIZATIONS BUG FIXES Propchange: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1594887-1595999 Propchange: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1588992-1595999 Propchange: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1594887-1595999 Modified:
svn commit: r1596020 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/UserGroupInformation.java src/test/java/org/apache/hadoop/secur
Author: atm
Date: Mon May 19 19:56:29 2014
New Revision: 1596020
URL: http://svn.apache.org/r1596020
Log:
HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation#addToken
can lead to ConcurrentModificationException. Contributed by Robert Kanter.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.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=1596020r1=1596019r2=1596020view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon May
19 19:56:29 2014
@@ -486,6 +486,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10401. ShellBasedUnixGroupsMapping#getGroups does not always return
primary group first (Akira AJISAKA via Colin Patrick McCabe)
+HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation
+#addToken can lead to ConcurrentModificationException (Robert Kanter via
atm)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1596020r1=1596019r2=1596020view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Mon May 19 19:56:29 2014
@@ -1392,7 +1392,7 @@ public class UserGroupInformation {
* @param token Token to be added
* @return true on successful add of new token
*/
- public synchronized boolean addToken(Token? extends TokenIdentifier token)
{
+ public boolean addToken(Token? extends TokenIdentifier token) {
return (token != null) ? addToken(token.getService(), token) : false;
}
@@ -1403,10 +1403,11 @@ public class UserGroupInformation {
* @param token Token to be added
* @return true on successful add of new token
*/
- public synchronized boolean addToken(Text alias,
- Token? extends TokenIdentifier token)
{
-getCredentialsInternal().addToken(alias, token);
-return true;
+ public boolean addToken(Text alias, Token? extends TokenIdentifier token) {
+synchronized (subject) {
+ getCredentialsInternal().addToken(alias, token);
+ return true;
+}
}
/**
@@ -1414,10 +1415,11 @@ public class UserGroupInformation {
*
* @return an unmodifiable collection of tokens associated with user
*/
- public synchronized
- CollectionToken? extends TokenIdentifier getTokens() {
-return Collections.unmodifiableCollection(
-new ArrayListToken?(getCredentialsInternal().getAllTokens()));
+ public CollectionToken? extends TokenIdentifier getTokens() {
+synchronized (subject) {
+ return Collections.unmodifiableCollection(
+ new ArrayListToken?(getCredentialsInternal().getAllTokens()));
+}
}
/**
@@ -1425,23 +1427,27 @@ public class UserGroupInformation {
*
* @return Credentials of tokens associated with this user
*/
- public synchronized Credentials getCredentials() {
-Credentials creds = new Credentials(getCredentialsInternal());
-IteratorToken? iter = creds.getAllTokens().iterator();
-while (iter.hasNext()) {
- if (iter.next() instanceof Token.PrivateToken) {
-iter.remove();
+ public Credentials getCredentials() {
+synchronized (subject) {
+ Credentials creds = new Credentials(getCredentialsInternal());
+ IteratorToken? iter = creds.getAllTokens().iterator();
+ while (iter.hasNext()) {
+if (iter.next() instanceof Token.PrivateToken) {
+ iter.remove();
+}
}
+ return creds;
}
-return creds;
}
/**
* Add the given Credentials to this user.
* @param credentials of tokens and secrets
*/
- public synchronized void addCredentials(Credentials credentials) {
-getCredentialsInternal().addAll(credentials);
+ public void addCredentials(Credentials credentials) {
+synchronized (subject) {
+ getCredentialsInternal().addAll(credentials);
+}
}
private synchronized Credentials
svn commit: r1596027 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/UserGroupInformation.java src/test/java/org/apache/
Author: atm
Date: Mon May 19 19:59:08 2014
New Revision: 1596027
URL: http://svn.apache.org/r1596027
Log:
HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation#addToken
can lead to ConcurrentModificationException. Contributed by Robert Kanter.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.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=1596027r1=1596026r2=1596027view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon May 19 19:59:08 2014
@@ -151,6 +151,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10401. ShellBasedUnixGroupsMapping#getGroups does not always return
primary group first (Akira AJISAKA via Colin Patrick McCabe)
+HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation
+#addToken can lead to ConcurrentModificationException (Robert Kanter via
atm)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1596027r1=1596026r2=1596027view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Mon May 19 19:59:08 2014
@@ -1343,7 +1343,7 @@ public class UserGroupInformation {
* @param token Token to be added
* @return true on successful add of new token
*/
- public synchronized boolean addToken(Token? extends TokenIdentifier token)
{
+ public boolean addToken(Token? extends TokenIdentifier token) {
return (token != null) ? addToken(token.getService(), token) : false;
}
@@ -1354,10 +1354,11 @@ public class UserGroupInformation {
* @param token Token to be added
* @return true on successful add of new token
*/
- public synchronized boolean addToken(Text alias,
- Token? extends TokenIdentifier token)
{
-getCredentialsInternal().addToken(alias, token);
-return true;
+ public boolean addToken(Text alias, Token? extends TokenIdentifier token) {
+synchronized (subject) {
+ getCredentialsInternal().addToken(alias, token);
+ return true;
+}
}
/**
@@ -1365,10 +1366,11 @@ public class UserGroupInformation {
*
* @return an unmodifiable collection of tokens associated with user
*/
- public synchronized
- CollectionToken? extends TokenIdentifier getTokens() {
-return Collections.unmodifiableCollection(
-new ArrayListToken?(getCredentialsInternal().getAllTokens()));
+ public CollectionToken? extends TokenIdentifier getTokens() {
+synchronized (subject) {
+ return Collections.unmodifiableCollection(
+ new ArrayListToken?(getCredentialsInternal().getAllTokens()));
+}
}
/**
@@ -1376,23 +1378,27 @@ public class UserGroupInformation {
*
* @return Credentials of tokens associated with this user
*/
- public synchronized Credentials getCredentials() {
-Credentials creds = new Credentials(getCredentialsInternal());
-IteratorToken? iter = creds.getAllTokens().iterator();
-while (iter.hasNext()) {
- if (iter.next() instanceof Token.PrivateToken) {
-iter.remove();
+ public Credentials getCredentials() {
+synchronized (subject) {
+ Credentials creds = new Credentials(getCredentialsInternal());
+ IteratorToken? iter = creds.getAllTokens().iterator();
+ while (iter.hasNext()) {
+if (iter.next() instanceof Token.PrivateToken) {
+ iter.remove();
+}
}
+ return creds;
}
-return creds;
}
/**
* Add the given Credentials to this user.
* @param credentials of tokens and secrets
*/
- public synchronized void addCredentials(Credentials credentials) {
-getCredentialsInternal().addAll(credentials);
+ public void addCredentials(Credentials credentials) {
+
svn commit: r1596041 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon May 19 20:13:14 2014 New Revision: 1596041 URL: http://svn.apache.org/r1596041 Log: Reverting HADOOP-10485 from branch-2. 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=1596041r1=1596040r2=1596041view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 19 20:13:14 2014 @@ -23,8 +23,6 @@ Release 2.5.0 - UNRELEASED HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) -HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) - HADOOP-10503. Move junit up to v 4.11. (cnauroth) HADOOP-10535. Make the retry numbers in ActiveStandbyElector configurable.
svn commit: r1596041 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming: ./ dev-support/ src/main/java/org/apache/hadoop/record/ src/main/java/org/apache/hadoop/record/compiler/ src/m
Author: jlowe Date: Mon May 19 20:13:14 2014 New Revision: 1596041 URL: http://svn.apache.org/r1596041 Log: Reverting HADOOP-10485 from branch-2. Added: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ - copied from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFloat.java - copied unchanged from r1586059,
svn commit: r1596048 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/record/ src/main/java/org/apache/hadoop/record/compiler/
Author: jlowe Date: Mon May 19 20:31:40 2014 New Revision: 1596048 URL: http://svn.apache.org/r1596048 Log: Reverted HADOOP-10474 from branch-2. Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
svn commit: r1596048 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming: dev-support/findbugs-exclude.xml pom.xml src/main/java/org/apache/hadoop/record/
Author: jlowe Date: Mon May 19 20:31:40 2014 New Revision: 1596048 URL: http://svn.apache.org/r1596048 Log: Reverted HADOOP-10474 from branch-2. Removed: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/ Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml?rev=1596048r1=1596047r2=1596048view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml Mon May 19 20:31:40 2014 @@ -16,19 +16,6 @@ limitations under the License. -- FindBugsFilter - !-- Workaround bugs in findbugs 1.3.9. See http://sourceforge.net/p/findbugs/bugs/918 for more details. -- - Match -Or - Package name=org.apache.hadoop.streaming / - Class name=org.apache.hadoop.record.compiler.JFile / -/Or -Bug pattern=NP_ALWAYS_NULL/ - /Match - Match -Class name=org.apache.hadoop.streaming.JarBuilder / -Bug pattern=NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS/ - /Match - Match Or Class name=org.apache.hadoop.streaming.PipeMapper / @@ -40,32 +27,4 @@ /Or Bug pattern=EI_EXPOSE_REP/ /Match - - Match -Package name=org.apache.hadoop.record.compiler.generated / - /Match - - Match -Package name=org.apache.hadoop.record / -Or - Bug pattern=EI_EXPOSE_REP / - Bug pattern=EI_EXPOSE_REP2 / - Bug pattern=MS_PKGPROTECT / -/Or - /Match - - Match -Class name=org.apache.hadoop.record.meta.Utils / -Method name=skip / -Bug pattern=BC_UNCONFIRMED_CAST / - /Match - - !-- - The compareTo method is actually a dummy method that just - throws excpetions. So, no need to override equals. Ignore - -- - Match -Class name=org.apache.hadoop.record.meta.RecordTypeInfo / -Bug pattern=EQ_COMPARETO_USE_OBJECT_EQUALS / - /Match /FindBugsFilter Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml?rev=1596048r1=1596047r2=1596048view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Mon May 19 20:31:40 2014 @@ -42,11 +42,6 @@ scopetest/scope /dependency dependency - groupIdorg.apache.ant/groupId - artifactIdant/artifactId - scopeprovided/scope -/dependency -dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope
svn commit: r1596049 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon May 19 20:37:49 2014 New Revision: 1596049 URL: http://svn.apache.org/r1596049 Log: Updated CHANGES.txt to reflect revert of HADOOP 10474 and 10485 from branch-2 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1596049r1=1596048r2=1596049view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 19 20:37:49 2014 @@ -7,6 +7,8 @@ Trunk (Unreleased) HADOOP-8124. Remove the deprecated FSDataOutputStream constructor, FSDataOutputStream.sync() and Syncable.sync(). (szetszwo) +HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9) + NEW FEATURES HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) @@ -148,6 +150,8 @@ Trunk (Unreleased) HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9) +HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -340,8 +344,6 @@ Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES -HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9) - NEW FEATURES HADOOP-10498. Add support for proxy server. (daryn) @@ -359,8 +361,6 @@ Release 2.5.0 - UNRELEASED HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) -HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) - HADOOP-10503. Move junit up to v 4.11. (cnauroth) HADOOP-10535. Make the retry numbers in ActiveStandbyElector configurable.
svn commit: r1596075 - in /hadoop/common/trunk/hadoop-common-project: hadoop-common/CHANGES.txt hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Author: brandonli
Date: Mon May 19 22:16:11 2014
New Revision: 1596075
URL: http://svn.apache.org/r1596075
Log:
HADOOP-10612. NFS failed to refresh the user group id mapping table.
Contributed by Brandon Li
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.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=1596075r1=1596074r2=1596075view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon May
19 22:16:11 2014
@@ -521,6 +521,8 @@ Release 2.4.1 - UNRELEASED
HADOOP-10527. Fix incorrect return code and allow more retries on EINTR.
(kihwal)
+HADOOP-10612. NFS failed to refresh the user group id mapping table
(brandonli)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java?rev=1596075r1=1596074r2=1596075view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Mon May 19 22:16:11 2014
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.Time;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.BiMap;
@@ -79,7 +80,7 @@ public class IdUserGroup {
}
synchronized private boolean isExpired() {
-return lastUpdateTime - System.currentTimeMillis() timeout;
+return Time.monotonicNow() - lastUpdateTime timeout;
}
// If can't update the maps, will keep using the old ones
@@ -210,7 +211,7 @@ public class IdUserGroup {
uidNameMap = uMap;
gidNameMap = gMap;
-lastUpdateTime = System.currentTimeMillis();
+lastUpdateTime = Time.monotonicNow();
}
synchronized public int getUid(String user) throws IOException {
svn commit: r1596080 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-common/CHANGES.txt hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Author: brandonli
Date: Mon May 19 22:20:03 2014
New Revision: 1596080
URL: http://svn.apache.org/r1596080
Log:
HADOOP-10612. Merging change r1596075 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.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=1596080r1=1596079r2=1596080view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon May 19 22:20:03 2014
@@ -182,6 +182,8 @@ Release 2.4.1 - UNRELEASED
HADOOP-10527. Fix incorrect return code and allow more retries on EINTR.
(kihwal)
+HADOOP-10612. NFS failed to refresh the user group id mapping table
(brandonli)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java?rev=1596080r1=1596079r2=1596080view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Mon May 19 22:20:03 2014
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.Time;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.BiMap;
@@ -79,7 +80,7 @@ public class IdUserGroup {
}
synchronized private boolean isExpired() {
-return lastUpdateTime - System.currentTimeMillis() timeout;
+return Time.monotonicNow() - lastUpdateTime timeout;
}
// If can't update the maps, will keep using the old ones
@@ -210,7 +211,7 @@ public class IdUserGroup {
uidNameMap = uMap;
gidNameMap = gMap;
-lastUpdateTime = System.currentTimeMillis();
+lastUpdateTime = Time.monotonicNow();
}
synchronized public int getUid(String user) throws IOException {
svn commit: r1596083 - in /hadoop/common/branches/branch-2.4/hadoop-common-project: hadoop-common/CHANGES.txt hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Author: brandonli
Date: Mon May 19 22:22:17 2014
New Revision: 1596083
URL: http://svn.apache.org/r1596083
Log:
HADOOP-10612. Merging change r1596080 from branch-2
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1596083r1=1596082r2=1596083view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Mon May 19 22:22:17 2014
@@ -32,6 +32,8 @@ Release 2.4.1 - UNRELEASED
HADOOP-10527. Fix incorrect return code and allow more retries on EINTR.
(kihwal)
+HADOOP-10612. NFS failed to refresh the user group id mapping table
(brandonli)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java?rev=1596083r1=1596082r2=1596083view=diff
==
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
Mon May 19 22:22:17 2014
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.Time;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.BiMap;
@@ -79,7 +80,7 @@ public class IdUserGroup {
}
synchronized private boolean isExpired() {
-return lastUpdateTime - System.currentTimeMillis() timeout;
+return Time.monotonicNow() - lastUpdateTime timeout;
}
// If can't update the maps, will keep using the old ones
@@ -210,7 +211,7 @@ public class IdUserGroup {
uidNameMap = uMap;
gidNameMap = gMap;
-lastUpdateTime = System.currentTimeMillis();
+lastUpdateTime = Time.monotonicNow();
}
synchronized public int getUid(String user) throws IOException {
svn commit: r1596097 - /hadoop/common/trunk/hadoop-common-project/hadoop-kms/
Author: szetszwo Date: Tue May 20 00:46:09 2014 New Revision: 1596097 URL: http://svn.apache.org/r1596097 Log: Add .classpath, .project and .settings to svn:ignore. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-kms/ (props changed) Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-kms/ -- --- svn:ignore (original) +++ svn:ignore Tue May 20 00:46:09 2014 @@ -1,2 +1,5 @@ target downloads +.classpath +.project +.settings
