You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2012/12/07 16:40:26 UTC
svn commit: r1418363 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project:
hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/
hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/ hadoop-hdfs/
hadoop-hdfs/src/main/java/org/apache/...
Author: suresh
Date: Fri Dec 7 15:40:24 2012
New Revision: 1418363
URL: http://svn.apache.org/viewvc?rev=1418363&view=rev
Log:
HDFS-4236. Merge change 1418356 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java?rev=1418363&r1=1418362&r2=1418363&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java Fri Dec 7 15:40:24 2012
@@ -53,10 +53,9 @@ public class UserProvider extends Abstra
public String parseParam(String str) {
if (str != null) {
int len = str.length();
- if (len < 1 || len > 31) {
+ if (len < 1) {
throw new IllegalArgumentException(MessageFormat.format(
- "Parameter [{0}], invalid value [{1}], it's length must be between 1 and 31",
- getName(), str));
+ "Parameter [{0}], it's length must be at least 1", getName()));
}
}
return super.parseParam(str);
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java?rev=1418363&r1=1418362&r2=1418363&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java Fri Dec 7 15:40:24 2012
@@ -110,13 +110,6 @@ public class TestUserProvider {
@Test
@TestException(exception = IllegalArgumentException.class)
- public void userNameTooLong() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("a123456789012345678901234567890x");
- }
-
- @Test
- @TestException(exception = IllegalArgumentException.class)
public void userNameInvalidStart() {
UserProvider.UserParam userParam = new UserProvider.UserParam("username");
userParam.parseParam("1x");
@@ -136,12 +129,6 @@ public class TestUserProvider {
}
@Test
- public void userNameMaxLength() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a123456789012345678901234567890"));
- }
-
- @Test
public void userNameValidDollarSign() {
UserProvider.UserParam userParam = new UserProvider.UserParam("username");
assertNotNull(userParam.parseParam("a$"));
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1418363&r1=1418362&r2=1418363&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Dec 7 15:40:24 2012
@@ -303,6 +303,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-4282. TestEditLog.testFuzzSequences FAILED in all pre-commit test
(todd)
+ HDFS-4236. Remove artificial limit on username length introduced in
+ HDFS-4171. (tucu via suresh)
+
BREAKDOWN OF HDFS-3077 SUBTASKS
HDFS-3077. Quorum-based protocol for reading and writing edit logs.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java?rev=1418363&r1=1418362&r2=1418363&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java Fri Dec 7 15:40:24 2012
@@ -38,10 +38,9 @@ public class UserParam extends StringPar
MessageFormat.format("Parameter [{0}], cannot be NULL", NAME));
}
int len = str.length();
- if (len < 1 || len > 31) {
+ if (len < 1) {
throw new IllegalArgumentException(MessageFormat.format(
- "Parameter [{0}], invalid value [{1}], it's length must be between 1 and 31",
- NAME, str));
+ "Parameter [{0}], it's length must be at least 1", NAME));
}
return str;
}
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java?rev=1418363&r1=1418362&r2=1418363&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java Fri Dec 7 15:40:24 2012
@@ -245,11 +245,6 @@ public class TestParam {
}
@Test(expected = IllegalArgumentException.class)
- public void userNameTooLong() {
- new UserParam("a123456789012345678901234567890x");
- }
-
- @Test(expected = IllegalArgumentException.class)
public void userNameInvalidStart() {
new UserParam("1x");
}
@@ -266,12 +261,6 @@ public class TestParam {
}
@Test
- public void userNameMaxLength() {
- UserParam userParam = new UserParam("a123456789012345678901234567890");
- assertNotNull(userParam.getValue());
- }
-
- @Test
public void userNameValidDollarSign() {
UserParam userParam = new UserParam("a$");
assertNotNull(userParam.getValue());