Author: atm
Date: Tue Nov 29 17:55:28 2011
New Revision: 1208002
URL: http://svn.apache.org/viewvc?rev=1208002&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
Propchange: hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:1152502-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:1152502-1208001
/hadoop/core/branches/branch-0.19/hdfs:713112
/hadoop/hdfs/branches/HDFS-1052:987665-1095512
/hadoop/hdfs/branches/HDFS-265:796829-820463
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1208002&r1=1208001&r2=1208002&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Nov 29 17:55:28 2011
@@ -80,8 +80,6 @@ Trunk (unreleased changes)
(Tomasz Nykiel via todd)
BUG FIXES
- HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)
-
HDFS-2299. TestOfflineEditsViewer is failing on trunk. (Uma Maheswara Rao G
via atm)
HDFS-2310. TestBackupNode fails since HADOOP-7524 went in.
@@ -98,7 +96,7 @@ Trunk (unreleased changes)
HDFS-46. Change default namespace quota of root directory from
Integer.MAX_VALUE to Long.MAX_VALUE. (Uma Maheswara Rao G via szetszwo)
- HDFS-2373. Commands using webhdfs and hftp print unnecessary debug
+ HDFS-2373. Commands using WebHDFS and hftp print unnecessary debug
info on the console with security enabled. (Arpit Gupta via suresh)
HDFS-2349. Corruption detected during block transfers between DNs
@@ -124,7 +122,7 @@ Release 0.23.1 - UNRELEASED
NEW FEATURES
- HDFS-2316. [umbrella] webhdfs: a complete FileSystem implementation for
+ HDFS-2316. [umbrella] WebHDFS: a complete FileSystem implementation for
accessing HDFS over HTTP (szetszwo)
IMPROVEMENTS
@@ -190,6 +188,8 @@ Release 0.23.1 - UNRELEASED
HDFS-2588. hdfs jsp pages missing DOCTYPE. (Dave Vronay via mattf)
HDFS-2590. Fix the missing links in the WebHDFS forrest doc. (szetszwo)
+
+ HDFS-2596. TestDirectoryScanner doesn't test parallel scans. (eli)
Release 0.23.0 - 2011-11-01
@@ -500,24 +500,24 @@ Release 0.23.0 - 2011-11-01
HDFS-2284. Add a new FileSystem, webhdfs://, for supporting write Http
access to HDFS. (szetszwo)
- HDFS-2317. Support read access to HDFS in webhdfs. (szetszwo)
+ HDFS-2317. Support read access to HDFS in WebHDFS. (szetszwo)
- HDFS-2338. Add configuration option to enable/disable webhdfs.
+ HDFS-2338. Add configuration option to enable/disable WebHDFS.
(jitendra via szetszwo)
- HDFS-2318. Provide authentication to webhdfs using SPNEGO and delegation
+ HDFS-2318. Provide authentication to WebHDFS using SPNEGO and delegation
tokens. (szetszwo)
- HDFS-2340. Support getFileBlockLocations and getDelegationToken in webhdfs.
+ HDFS-2340. Support getFileBlockLocations and getDelegationToken in WebHDFS.
(szetszwo)
- HDFS-2348. Support getContentSummary and getFileChecksum in webhdfs.
+ HDFS-2348. Support getContentSummary and getFileChecksum in WebHDFS.
(szetszwo)
- HDFS-2385. Support renew and cancel delegation tokens in webhdfs.
+ HDFS-2385. Support renew and cancel delegation tokens in WebHDFS.
(szetszwo)
- HDFS-2539. Support doAs and GETHOMEDIRECTORY in webhdfs.
+ HDFS-2539. Support doAs and GETHOMEDIRECTORY in WebHDFS.
(szetszwo)
IMPROVEMENTS
@@ -915,19 +915,19 @@ Release 0.23.0 - 2011-11-01
HDFS-2485. Improve code layout and constants in UnderReplicatedBlocks
(stevel)
- HDFS-2356. Support case insensitive query parameter names in webhdfs.
+ HDFS-2356. Support case insensitive query parameter names in WebHDFS.
(szetszwo)
HDFS-2368. Move SPNEGO conf properties from hdfs-default.xml to
hdfs-site.xml. (szetszwo)
- HDFS-2395. Add a root element in the JSON responses of webhdfs.
+ HDFS-2395. Add a root element in the JSON responses of WebHDFS.
(szetszwo)
- HDFS-2427. Change the default permission in webhdfs to 755 and add range
+ HDFS-2427. Change the default permission in WebHDFS to 755 and add range
check/validation for all parameters. (szetszwo)
- HDFS-2501. Add version prefix and root methods to webhdfs. (szetszwo)
+ HDFS-2501. Add version prefix and root methods to WebHDFS. (szetszwo)
HDFS-1869. mkdirs should use the supplied permission for all of the created
directories. (Daryn Sharp via szetszwo)
@@ -1310,30 +1310,30 @@ Release 0.23.0 - 2011-11-01
HDFS-2409. _HOST in dfs.web.authentication.kerberos.principal. (jitendra)
- HDFS-2404. webhdfs liststatus json response is not correct. (suresh)
+ HDFS-2404. WebHDFS liststatus json response is not correct. (suresh)
HDFS-2441. Remove the Content-Type set by HttpServer.QuotingInputFilter in
- webhdfs responses. (szetszwo)
+ WebHDFS responses. (szetszwo)
HDFS-2428. Convert com.sun.jersey.api.ParamException$QueryParamException
- to IllegalArgumentException and response it as http BAD_REQUEST in webhdfs.
+ to IllegalArgumentException and response it as http BAD_REQUEST in WebHDFS.
(szetszwo)
HDFS-2424. Added a root element "HdfsFileStatuses" for the response
- of webhdfs listStatus. (szetszwo)
+ of WebHDFS listStatus. (szetszwo)
MAPREDUCE-2764. Fix renewal of dfs delegation tokens. (Owen via jitendra)
- HDFS-2439. Fix NullPointerException in webhdfs when opening a non-existing
+ HDFS-2439. Fix NullPointerException in WebHDFS when opening a non-existing
file or creating a file without specifying the replication parameter.
(szetszwo)
- HDFS-2453. Fix http response code for partial content in webhdfs, added
+ HDFS-2453. Fix http response code for partial content in WebHDFS, added
getDefaultBlockSize() and getDefaultReplication() in WebHdfsFileSystem
and cleared content type in ExceptionHandler. (szetszwo)
HDFS-2411. The the auth to local mappings are not being respected, with
- webhdfs enabled. (jitendra)
+ WebHDFS enabled. (jitendra)
HDFS-2494. Close the streams and DFSClient in DatanodeWebHdfsMethods.
(Uma Maheswara Rao G via szetszwo)
@@ -1341,7 +1341,7 @@ Release 0.23.0 - 2011-11-01
HDFS-2298. Fix TestDfsOverAvroRpc by changing ClientProtocol to
not include multiple methods of the same name. (cutting)
- HDFS-2432. Webhdfs: response FORBIDDEN when setReplication on non-files;
+ HDFS-2432. WebHDFS: response FORBIDDEN when setReplication on non-files;
clear umask before creating a flie; throw IllegalArgumentException if
setOwner with both owner and group empty; throw FileNotFoundException if
getFileStatus on non-existing files; fix bugs in getBlockLocations; and
@@ -1350,19 +1350,19 @@ Release 0.23.0 - 2011-11-01
HDFS-2065. Add null checks in DFSClient.getFileChecksum(..). (Uma
Maheswara Rao G via szetszwo)
- HDFS-2416. distcp with a webhdfs uri on a secure cluster fails. (jitendra)
+ HDFS-2416. distcp with a WebHDFS uri on a secure cluster fails. (jitendra)
- HDFS-2527. WebHdfs: remove the use of "Range" header in Open; use ugi
+ HDFS-2527. WebHDFS: remove the use of "Range" header in Open; use ugi
username if renewer parameter is null in GetDelegationToken; response OK
when setting replication for non-files; rename GETFILEBLOCKLOCATIONS to
GET_BLOCK_LOCATIONS and state that it is a private unstable API; replace
isDirectory and isSymlink with enum {FILE, DIRECTORY, SYMLINK} in
HdfsFileStatus JSON object. (szetszwo)
- HDFS-2528. Webhdfs: set delegation kind to WEBHDFS and add a HDFS token
+ HDFS-2528. WebHDFS: set delegation kind to WEBHDFS and add a HDFS token
when http requests are redirected to datanode. (szetszwo)
- HDFS-2540. Webhdfs: change "Expect: 100-continue" to two-step write;
change
+ HDFS-2540. WebHDFS: change "Expect: 100-continue" to two-step write;
change
"HdfsFileStatus" and "localName" respectively to "FileStatus" and
"pathSuffix" in JSON response. (szetszwo)
@@ -1964,10 +1964,21 @@ Release 0.22.0 - Unreleased
HDFS-2002. Incorrect computation of needed blocks in getTurnOffTip().
(Plamen Jeliazkov via shv)
+ HDFS-2573. TestFiDataXceiverServer is failing, not testing OOME (cos)
+
HDFS-2514. Link resolution bug for intermediate symlinks with
relative targets. (eli)
- HDFS-2573. TestFiDataXceiverServer is failing, not testing OOME (cos)
+ HDFS-1786. Some cli test cases expect a "null" message
+ (Uma Maheswara Rao G via todd)
+
+ HDFS-1855. TestDatanodeBlockScanner.testBlockCorruptionRecoveryPolicy()
+ part 2 fails in two different ways. (Matt Foley via eli)
+
+ HDFS-2346. TestHost2NodesMap & TestReplicasMap will fail depending upon
+ execution order of test methods (Laxman, Uma Maheswara Rao G via shv)
+
+ HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)
Release 0.21.1 - Unreleased
@@ -2112,16 +2123,9 @@ Release 0.21.1 - Unreleased
block placement and checkpoint/backup node features. (Joe Crobak
via szetszwo)
-
HDFS-1596. Replace fs.checkpoint.* with dfs.namenode.checkpoint.*
in documentations. (Harsh J Chouraria via szetszwo)
- HDFS-1786. Some cli test cases expect a "null" message
- (Uma Maheswara Rao G via todd)
-
- HDFS-1855. TestDatanodeBlockScanner.testBlockCorruptionRecoveryPolicy()
- part 2 fails in two different ways. (Matt Foley via eli)
-
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
@@ -2590,7 +2594,7 @@ Release 0.21.0 - 2010-08-13
HDFS-1012. hdfsproxy: Support for fully qualified HDFS path in addition to
simple unqualified path. (Srikanth Sundarrajan via szetszwo)
- HDFS-933. Namenode should issue a delegation token only for kerberos
+ HDFS-993. Namenode should issue a delegation token only for kerberos
authenticated clients.(jnp via boryas)
HDFS-1087. Modify audit log to use a StringBuilder rather than a Formatter.
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:1159757-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:1159757-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/java:713112
/hadoop/core/branches/branch-0.19/hdfs/src/main/java:713112
/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native:1152502-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native:1152502-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/main/native:713112
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode:1159757-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode:1159757-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/main/webapps/datanode:713112
/hadoop/core/branches/branch-0.19/hdfs/src/webapps/datanode:713112
/hadoop/core/trunk/src/webapps/datanode:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs:1152502-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs:1152502-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/main/webapps/hdfs:713112
/hadoop/core/branches/branch-0.19/hdfs/src/webapps/hdfs:713112
/hadoop/core/trunk/src/webapps/hdfs:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary:1152502-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary:1152502-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/main/webapps/secondary:713112
/hadoop/core/branches/branch-0.19/hdfs/src/webapps/secondary:713112
/hadoop/core/trunk/src/webapps/secondary:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs:1159757-1207485
+/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs:1159757-1208001
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs:713112
/hadoop/core/trunk/src/test/hdfs:776175-785643
/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs:987665-1095512
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java?rev=1208002&r1=1208001&r2=1208002&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
Tue Nov 29 17:55:28 2011
@@ -156,8 +156,8 @@ public class TestParallelRead {
*/
private void pRead(int start, int len) throws Exception {
assertTrue(
- "Bad args: " + start + " + " + len + " should be < " + fileSize,
- start + len < fileSize);
+ "Bad args: " + start + " + " + len + " should be <= " + fileSize,
+ start + len <= fileSize);
DFSInputStream dis = testInfo.dis;
byte buf[] = new byte[len];
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java?rev=1208002&r1=1208001&r2=1208002&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
Tue Nov 29 17:55:28 2011
@@ -218,7 +218,7 @@ public class TestDirectoryScanner extend
public void testDirectoryScanner() throws Exception {
// Run the test with and without parallel scanning
- for (int parallelism = 1; parallelism < 2; parallelism++) {
+ for (int parallelism = 1; parallelism < 3; parallelism++) {
runTest(parallelism);
}
}
