Todd Lipcon
c45c8ee720
Complete commit of prior merge.
...
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 16:47:16 +00:00
Todd Lipcon
bbb24fbf5d
Merge trunk into branch.
...
Conflicts resolved:
C hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java
! C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/SocketCache.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java
(thanks to Colin for help resolving)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1462652 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 21:33:35 +00:00
Todd Lipcon
1611b51a97
HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462303 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:58:45 +00:00
Sanjay Radia
0e6604aab3
HDFS-4633 TestDFSClientExcludedNodes fails sporadically if excluded nodes cache expires too quickly (Chris Nauroth via Sanjay)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461846 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 20:49:48 +00:00
Todd Lipcon
694a672131
HDFS-4538. Allow use of legacy blockreader. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1461818 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 19:28:12 +00:00
Todd Lipcon
4809bfa6ed
HDFS-4618. Default transaction interval for checkpoints is too low. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461783 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 18:46:32 +00:00
Todd Lipcon
81192e4e41
HDFS-4621. Additional logging to help diagnose slow QJM syncs. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461777 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 18:42:43 +00:00
Kihwal Lee
c9f5052803
HDFS-4581. DataNode.checkDiskError should not be called on network errors. Contributed by Rohit Kochar.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461597 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:21:13 +00:00
Suresh Srinivas
fdf1e6e07e
HDFS-4635. Move BlockManager#computeCapacity to LightWeightGSet. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461364 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 23:01:03 +00:00
Tsz-wo Sze
ca3e09bab5
HDFS-4598. Fix the default value of ConcatSourcesParam and the WebHDFS doc.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461040 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 09:54:48 +00:00
Tsz-wo Sze
7ed618e324
HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459592 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:56:06 +00:00
Tsz-wo Sze
c2e186bae6
HDFS-4615. Fix TestDFSShell failures on Windows. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459586 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:48:39 +00:00
Tsz-wo Sze
e976294d35
HDFS-4609. TestAuditLogs should release log handles between tests. Contributed by Ivan Mitic
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459576 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:18:26 +00:00
Tsz-wo Sze
1b98d8dda3
HDFS-4607. In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows. Contributed by Ivan Mitic
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459573 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:11:20 +00:00
Aaron Myers
036c168f4f
HDFS-4620. Documentation for dfs.namenode.rpc-address specifies wrong format. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459549 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 21:59:02 +00:00
Aaron Myers
a10fbb93e7
HDFS-4246. The exclude node list should be more forgiving, for each output stream. Contributed by Harsh J. Chouraria.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459475 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 18:58:06 +00:00
Aaron Myers
c92b59fd8d
HDFS-4614. FSNamesystem#getContentSummary should use getPermissionChecker helper method. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1458593 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 00:36:13 +00:00
Aaron Myers
64741f4635
HDFS-4521. Invalid network toploogies should not be cached. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457878 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 17:20:13 +00:00
Suresh Srinivas
415d038319
HDFS-4604. TestJournalNode fails on Windows. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457069 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:59:20 +00:00
Suresh Srinivas
9c7c2f4f27
HDFS-4603. TestMiniDFSCluster fails on Windows. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457057 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:41:18 +00:00
Aaron Myers
807e08334e
HDFS-4596. Shutting down namenode during checkpointing can lead to md5sum error. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456630 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 20:01:03 +00:00
Aaron Myers
bcabbcdf4c
HDFS-3277. fail over to loading a different FSImage if the first one we try to load is corrupt. Contributed by Colin Patrick McCabe and Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456578 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 18:04:04 +00:00
Daryn Sharp
2c42337545
HDFS-3367. WebHDFS doesn't use the logged in user when opening connections (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456469 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 15:14:13 +00:00
Kihwal Lee
7987bcf3f4
HDFS-3344. Unreliable corrupt blocks counting in TestProcessCorruptBlocks. Contributed by Kihwal Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456172 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 21:58:19 +00:00
Aaron Myers
3bf09c5150
HDFS-4591. HA clients can fail to fail over while Standby NN is performing long checkpoint. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456107 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 19:51:19 +00:00
Suresh Srinivas
1f3a18ff44
HDFS-4582. TestHostsFiles fails on Windows. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456060 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 17:43:34 +00:00
Suresh Srinivas
c390683bcc
HDFS-4583. TestNodeCount fails. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456052 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 17:15:38 +00:00
Suresh Srinivas
8c20a8f495
HDFS-4595. When short circuit read is fails, DFSClient does not fallback to regular reads. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456047 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 16:45:31 +00:00
Suresh Srinivas
e4e13618e8
HDFS-4593. TestSaveNamespace fails on Windows. Contributed by Arpit Agarwal.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455956 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 14:28:55 +00:00
Aaron Myers
06f711d819
HDFS-4484. libwebhdfs compilation broken with gcc 4.6.2. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455782 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 02:59:00 +00:00
Aaron Myers
7c8419f14f
HDFS-4522. LightWeightGSet expects incrementing a volatile to be atomic. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455780 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 02:55:20 +00:00
Aaron Myers
86a940f7ad
HDFS-4592. Default values for access time precision are out of sync between hdfs-default.xml and the code. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455777 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 02:32:44 +00:00
Suresh Srinivas
c5017c71e4
HDFS-4013. TestHftpURLTimeouts throws NPE. Contributed by Chao Shi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455755 13f79535-47bb-0310-9956-ffa450edef68
2013-03-12 23:37:03 +00:00
Aaron Myers
813e97494a
HDFS-4586. TestDataDirs.testGetDataDirsFromURIs fails with all directories in dfs.datanode.data.dir are invalid. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455708 13f79535-47bb-0310-9956-ffa450edef68
2013-03-12 20:55:33 +00:00
Suresh Srinivas
d49c50732e
HDFS-4287. HTTPFS tests fail on Windows. Contributed by Chris Nauroth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455605 13f79535-47bb-0310-9956-ffa450edef68
2013-03-12 16:35:09 +00:00
Suresh Srinivas
9daa958c5a
HDFS-4572. Fix TestJournal failures on Windows. Contributed by Arpit Agarwal.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455360 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 23:13:55 +00:00
Aaron Myers
9d62cdd680
HDFS-4391. TestDataTransferKeepalive fails when tests are executed in a certain order. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455343 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 21:44:25 +00:00
Suresh Srinivas
c1fabc5e91
HDFS-4573. Fix TestINodeFile on Windows. Contributed by Arpit Agarwal.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454616 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 22:54:50 +00:00
Kihwal Lee
140076fb57
HDFS-4577. Webhdfs operations should declare if authentication is required. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454517 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 20:01:58 +00:00
Alejandro Abdelnur
a549d6fa2c
HDFS-4571. WebHDFS should not set the service hostname on the server side. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454475 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 17:23:47 +00:00
Kihwal Lee
94a22114b9
HDFS-4567. Webhdfs does not need a token for token operations. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454460 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 16:56:34 +00:00
Suresh Srinivas
4909821aa9
HDFS-4569. Small image transfer related cleanups. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454233 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 03:37:21 +00:00
Daryn Sharp
8a4f03cb70
HDFS-4566. Webdhfs token cancelation should use authentication (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454059 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 19:58:04 +00:00
Suresh Srinivas
49b2c6ab77
Change the jira number of commit 1454021 to HDFS-4565. Attribute it to the right contributor, Arpit Gupta
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454027 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 19:25:07 +00:00
Suresh Srinivas
301079b4bf
HDFS-4546. Use DFSUtil.getSpnegoKeytabKey() to get the spnego keytab key in secondary namenode and namenode http server. Contributed by Arpit Agarwal.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1454021 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 19:23:13 +00:00
Daryn Sharp
97c4668312
HDFS-4560. Webhdfs cannot use tokens obtained by another user (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453955 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 16:56:19 +00:00
Arun Murthy
80c2cf57fd
Preparing for bug-fix 2.0.4-alpha release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453886 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 14:21:40 +00:00
Suresh Srinivas
96fc01fbc2
HADOOP-9373. Remove empty files that should have been removed in the commit r1453599
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453645 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 01:16:02 +00:00
Jonathan Turner Eagles
b427fe9de8
HADOOP-9209. Add shell command to dump file checksums (Todd Lipcon via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453613 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 23:17:14 +00:00
Suresh Srinivas
50d136f9c9
HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453599 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 22:37:42 +00:00