big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,210 Commits 2 Branches 2 Tags 264 MiB
c2495a7bff
Commit Graph

1942 Commits

Author SHA1 Message Date
Colin McCabe
52ebd9c389 HDFS-4626. ClientProtocol#getLinkTarget should throw an exception for non-symlink and non-existent paths. (Andrew Wang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493980 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 01:07:13 +00:00
Jing Zhao
eff5e6da1d HDFS-4875. Add a test for testing snapshot file length. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493850 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 17:23:45 +00:00
Chris Nauroth
5694c34040 HDFS-4866. Protocol buffer support cannot compile under C. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493300 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-15 03:52:40 +00:00
Chris Nauroth
0d1a994fbb HDFS-4904. Remove JournalService. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493235 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 20:27:17 +00:00
Chris Nauroth
0ef156a86e HDFS-4783. TestDelegationTokensWithHA#testHAUtilClonesDelegationTokens fails on Windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493149 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 16:44:22 +00:00
Tsz-wo Sze
4cd605413a HDFS-4845. FSNamesystem.deleteInternal should acquire write-lock before changing the inode map. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492941 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 03:12:08 +00:00
Jing Zhao
7e1744ccf9 HDFS-4902. DFSClient#getSnapshotDiffReport should use string path rather than o.a.h.fs.Path. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492791 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 18:11:42 +00:00
Chris Nauroth
c5821cf38b HADOOP-9638. Parallel test changes caused invalid test path for several HDFS tests on Windows. Contributed by Andrey Klochkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492297 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 17:21:47 +00:00
Tsz-wo Sze
f9186f3ae8 HDFS-4819. Update Snapshot doc to clarify that nested snapshots are not allowed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492062 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 05:43:35 +00:00
Jing Zhao
390eca2cde HDFS-4873. callGetBlockLocations returns incorrect number of blocks for snapshotted files. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491957 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-11 21:03:09 +00:00
Konstantin Shvachko
8e0f166cf3 HDFS-4878. On Remove Block, block is not removed from neededReplications queue. Contributed by Tao Luo. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491671 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-11 01:39:32 +00:00
Suresh Srinivas
8e23270e0d HDFS-4752. TestRBWBlockInvalidation fails on Windows due to file locking. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491631 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 22:37:36 +00:00
Ivan Mitic
cb11d68f40 HDFS-4677. Editlog should support synchronous writes. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491096 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-08 23:28:37 +00:00
Kihwal Lee
2a76cddcd5 HDFS-4832. Namenode doesn't change the number of missing blocks in safemode when DNs rejoin or leave. Contributed by Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490803 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 20:01:55 +00:00
Suresh Srinivas
a764da16d6 HDFS-4880. Print the image and edits file loaded by the namenode in the logs. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490746 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 17:35:34 +00:00
Kihwal Lee
0e889e77c5 HDFS-4862. SafeModeInfo.isManual() returns true when resources are low even if it wasn't entered into manually. Contributed by Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490486 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 01:15:28 +00:00
Konstantin Shvachko
8854c210bd HDFS-4867. metaSave NPEs when there are invalid blocks in repl queue. Contributed by Plamen Jeliazkov and Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490433 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 20:44:40 +00:00
Jing Zhao
d46e160862 HDFS-4877. Snapshot: fix the scenario where a directory is renamed under its prior descendant. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490421 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 20:15:07 +00:00
Jing Zhao
496b80b28c HDFS-4850. Fix OfflineImageViewer to work on fsimages with empty files or snapshots. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490080 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 23:32:53 +00:00
Tsz-wo Sze
e00f828b11 HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489708 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 05:26:32 +00:00
Aaron Myers
8171203692 HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch corruptReplicas and liveReplicas is not needed. Contributed by Tian Hong Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489668 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 23:01:37 +00:00
Kihwal Lee
c4382e7565 HDFS-4840. ReplicationMonitor gets NPE during shutdown. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489634 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 21:43:08 +00:00
Colin McCabe
4ee1ec2126 Remove extra code that code erroneously committed in HDFS-3934 (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489083 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 17:58:44 +00:00
Colin McCabe
4c13c986e1 Add needed file for HDFS-3934 (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489068 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 17:29:37 +00:00
Colin McCabe
a7bfb25d2b HDFS-3934. duplicative dfs_hosts entries handled wrong. (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489065 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 17:14:27 +00:00
Jason Darrell Lowe
85623a2d75 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488040 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 22:43:16 +00:00
Brandon Li
bf99961d67 HDFS-4848. copyFromLocal and renaming a file to .snapshot should output that .snapshot is a reserved name. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487942 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 17:26:25 +00:00
Jing Zhao
a0abed41a0 HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487698 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 01:38:54 +00:00
Jing Zhao
01f27f5c23 HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487655 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 22:22:44 +00:00
Brandon Li
719034c12c HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487647 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 21:25:01 +00:00
Jing Zhao
973017cab7 HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487643 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 20:54:53 +00:00
Devaraj Das
4bb72210c2 HDFS-4827. Slight update to the implementation of API for handling favored nodes in DFSClient. Contributed by Devaraj Das. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487093 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 20:17:39 +00:00
Kihwal Lee
45b9d19f9d HDFS-4780. Use the correct relogin method for services. Contributed by Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486974 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 15:47:56 +00:00
Kihwal Lee
359ea88016 HDFS-4714. Log short messages in Namenode RPC server for exceptions meant for clients. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485881 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 22:28:06 +00:00
Kihwal Lee
2ad7397c49 HDFS-4807. createSocketForPipeline() should not include timeout extension on connect. Contributed by Cristina Abad. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485861 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:35:32 +00:00
Aaron Myers
8c62c46046 HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485371 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 19:37:41 +00:00
Vinod Kumar Vavilapalli
27e6673ec3 MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485085 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 06:36:24 +00:00
Kihwal Lee
98a692fd63 HDFS-3875. Issue handling checksum errors in write pipeline. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1484808 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 13:42:23 +00:00
Todd Lipcon
9fdb117476 HDFS-4824. FileInputStreamCache.close leaves dangling reference to FileInputStreamCache.cacheCleaner. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483641 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 03:39:18 +00:00
Aaron Myers
0cd0f64656 HDFS-4830. Typo in config settings for AvailableSpaceVolumeChoosingPolicy in hdfs-default.xml. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483603 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 23:21:35 +00:00
Aaron Myers
58e191f0c5 HDFS-4787. Create a new HdfsConfiguration before each TestDFSClientRetries testcases. Contributed by Tian Hong Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483235 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 08:11:23 +00:00
Tsz-wo Sze
da05873e0e HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. Contributed by Chris Nauroth 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483150 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 02:00:03 +00:00
Tsz-wo Sze
f7af4a014c HDFS-3180. Add socket timeouts to WebHdfsFileSystem. Contributed by Chris Nauroth 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482661 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:23:56 +00:00
Tsz-wo Sze
5c82a0cd1a HDFS-4813. Add volatile to BlocksMap.blocks so that the replication thread can see the updated value. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482658 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:18:27 +00:00
Kihwal Lee
d027b947d6 HDFS-4805. Webhdfs client is fragile to token renewal errors. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482121 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 22:03:43 +00:00
Aaron Myers
09593530fb HDFS-4300. TransferFsImage.downloadEditsToStorage should use a tmp file for destination. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481987 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 17:47:04 +00:00
Aaron Myers
6521b5ee42 HDFS-4765. Permission check of symlink deletion incorrectly throws UnresolvedLinkException. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481976 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 17:22:00 +00:00
Aaron Myers
945cb2ecaa HADOOP-9485. No default value in the code for hadoop.rpc.socket.factory.class.default. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481200 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:45:32 +00:00
Suresh Srinivas
b1603b44c5 HDFS-4533. start-dfs.sh ignores additional parameters besides -upgrade. Contributed by Fengdong Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481178 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 20:23:24 +00:00
Aaron Myers
b9a0286223 HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481160 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 19:43:48 +00:00
Aaron Myers
4ed1fc58c0 HDFS-4698. Provide client-side metrics for remote reads, local reads, and short-circuit reads. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481121 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 17:58:07 +00:00
Kihwal Lee
1161ceb2c9 HDFS-4799. Corrupt replica can be prematurely removed from corruptReplicas map. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481084 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 16:36:20 +00:00
Aaron Myers
7e5b63af13 HDFS-4810. several HDFS HA tests have timeouts that are too short. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480841 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 00:16:18 +00:00
Aaron Myers
a18fd620d0 HDFS-4661. A few little code cleanups of some HDFS-347-related code. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480839 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 00:03:17 +00:00
Tsz-wo Sze
5980139140 HDFS-4809. When a QuotaExceededException is thrown during rename, the quota usage should be subtracted back. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480508 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 00:23:57 +00:00
Tsz-wo Sze
37d6f14560 Merge r1479733 through r1480439 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480440 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 20:20:56 +00:00
Tsz-wo Sze
08ec505d6b HDFS-4806. In INodeDirectoryWithSnapshot, use isInLatestSnapshot() to determine if an added/removed child should be recorded in the snapshot diff. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480146 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 01:17:24 +00:00
Aaron Myers
3ad40e9dad HDFS-4804. WARN when users set the block balanced preference percent below 0.5 or above 1.0. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480098 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 21:40:50 +00:00
Tsz-wo Sze
41312abe84 HDFS-4802. Disallowing snapshot on / twice should throw SnapshotException but not IllegalStateException. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480015 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 18:45:03 +00:00
Tsz-wo Sze
393188c445 Merge r1477868 through r1479732 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479733 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 00:17:50 +00:00
Tsz-wo Sze
98b416f5ac HDFS-4801. lsSnapshottableDir throws IllegalArgumentException when root is snapshottable. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479709 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 22:48:54 +00:00
Tsz-wo Sze
0aab1ef996 HDFS-4800. Fix INodeDirectoryWithSnapshot#cleanDeletedINode. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479707 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 22:45:00 +00:00
Tsz-wo Sze
424b270c94 HDFS-4798. Update computeContentSummary() for the reference nodes in snapshots. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479671 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 18:48:24 +00:00
Tsz-wo Sze
72d783374c HDFS-4791. Update and fix deletion of reference inode. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479198 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-04 22:10:55 +00:00
Suresh Srinivas
a4bae51b7d HDFS-4784. NPE in FSDirectory.resolvePath(). Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478276 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:02:12 +00:00
Suresh Srinivas
03ba436d42 HDFS-4785. Concat operation does not remove concatenated files from InodeMap. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478267 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 04:51:21 +00:00
Tsz-wo Sze
7c14f1557b HDFS-4781. Fix a NullPointerException when listing .snapshot under a non-existing directory. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1478135 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 18:33:08 +00:00
Sanjay Radia
6096cb3435 HDFS-4659 Support setting execution bit for regular files (Brandon Li via sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477994 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 13:31:08 +00:00
Tsz-wo Sze
faca77f227 Merge r1476453 through r1477867 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477868 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 23:02:35 +00:00
Tsz-wo Sze
98c0421fbf HDFS-4758. Disallow nested snapshottable directories and unwrap RemoteException. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477867 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 22:55:38 +00:00
Devaraj Das
2542d69d65 HDFS-4778. Fixes some issues that the first patch on HDFS-2576 missed. Contributed by Devaraj Das. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477849 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 21:46:02 +00:00
Tsz-wo Sze
3a3e0f5731 HDFS-4760. Update inodeMap after node replacement. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477827 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 21:05:20 +00:00
Suresh Srinivas
3704e091a8 HDFS-4610. Use common utils FileUtil#setReadable/Writable/Executable and FileUtil#canRead/Write/Execute. Contrbitued by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477427 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 00:35:53 +00:00
Suresh Srinivas
e2091275dc HDFS-4610. Reverting the patch Jenkins build is not run. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477396 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 22:40:03 +00:00
Suresh Srinivas
fb30240b87 HDFS-4610. Use common utils FileUtil#setReadable/Writable/Executable & FileUtil#canRead/Write/Execute. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477385 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 22:26:53 +00:00
Tsz-wo Sze
e097f8404b HDFS-4773. Fix bugs in quota usage computation and OfflineImageViewer. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477367 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 22:03:23 +00:00
Aaron Myers
ce7e5565f4 HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477354 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 21:28:48 +00:00
Aaron Myers
ce73b3b01f HDFS-4687. TestDelegationTokenForProxyUser#testWebHdfsDoAs is flaky with JDK7. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477344 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 21:10:50 +00:00
Tsz-wo Sze
884cbb681a HDFS-4578. Restrict snapshot IDs to 24-bit wide. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477181 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 16:37:30 +00:00
Suresh Srinivas
e17d5a9683 HDFS-4734. HDFS Tests that use ShellCommandFencer are broken on Windows. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476877 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 02:07:58 +00:00
Suresh Srinivas
3e00835dad HDFS-4705. Address HDFS test failures on Windows because of invalid dfs.namenode.name.dir. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476610 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 16:16:19 +00:00
Suresh Srinivas
f55fd818e0 HDFS-4722. TestGetConf#testFederation times out on Windows. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476597 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:53:37 +00:00
Suresh Srinivas
fbf10b2604 HDFS-4740. Fixes for a few test failures on Windows. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476596 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:47:15 +00:00
Suresh Srinivas
0181ce03af HDFS-4743. TestNNStorageRetentionManager fails on Windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476591 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:38:02 +00:00
Suresh Srinivas
90612f6423 HDFS-4748. MiniJournalCluster#restartJournalNode leaks resources, which causes sporadic test failures. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476587 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:29:41 +00:00
Suresh Srinivas
fe3853484e HADOOP-9290. Some tests cannot load native library on windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476586 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:24:02 +00:00
Suresh Srinivas
b7afde6d52 HDFS-4741. TestStorageRestore#testStorageRestoreFailure fails on Windows. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476585 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:16:32 +00:00
Suresh Srinivas
4e21c347d2 HDFS-4768. File handle leak in datanode when a block pool is removed. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476579 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:08:34 +00:00
Tsz-wo Sze
5276f4e04d HDFS-4767. If a directory is snapshottable, do not replace it when clearing quota. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476454 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 00:05:49 +00:00
Tsz-wo Sze
60341dae19 Merge r1476010 through r1476452 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476453 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 23:50:17 +00:00
Tsz-wo Sze
75b4231a8c HDFS-4761. When resetting FSDirectory, the inodeMap should also be reset. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476452 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 23:47:57 +00:00
Tsz-wo Sze
a5ae562d70 HDFS-4650. When passing two non-existing snapshot names to snapshotDiff, it returns success if the names are the same. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476408 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 21:30:53 +00:00
Tsz-wo Sze
d2495d553f HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing the datanode with the most recent heartbeat as the primary. Contributed by Varun Sharma 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476399 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 20:51:45 +00:00
Devaraj Das
5d2ffde68e HDFS-2576. Enhances the DistributedFileSystem's create API so that clients can specify favored datanodes for a file's blocks. Contributed by Devaraj Das and Pritam Damania. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476395 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 20:39:51 +00:00
Tsz-wo Sze
9da3865841 HDFS-4650. Fix a bug in FSDirectory and add more unit tests for rename with existence of snapshottable directories and snapshots. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476012 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 01:31:43 +00:00
Tsz-wo Sze
fa500825fa Merge r1471229 through r1476009 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476011 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 01:19:00 +00:00
Tsz-wo Sze
76b80b48ec HDFS-4755. Fix AccessControlException message and moves "implements LinkedElement" from INode to INodeWithAdditionalFields. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476009 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 01:05:47 +00:00
Tsz-wo Sze
43ac0739ce svn merge -c -1476006 . for reverting the previous trunk merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476008 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 01:02:45 +00:00
Tsz-wo Sze
a259e0ba79 Merge r1471229 through r1476005 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476006 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 00:55:45 +00:00
Tsz-wo Sze
06fb184d4d HDFS-4757. Update FSDirectory#inodeMap when replacing an INodeDirectory while setting quota. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476005 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 00:50:09 +00:00
Tsz-wo Sze
36f43dcb4f HDFS-4742. Fix appending to a renamed file with snapshot. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475903 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 18:53:14 +00:00
Tsz-wo Sze
745bfa0311 HDFS-4749. Use INodeId to identify the corresponding directory node in FSImage saving/loading. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475902 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 18:51:00 +00:00
Suresh Srinivas
16ef8dd3a5 HDFS-4745. TestDataTransferKeepalive#testSlowReader has race condition that causes sporadic failure. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475623 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 04:25:58 +00:00
Aaron Myers
e6b5b01561 HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471769 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 23:29:30 +00:00
Tsz-wo Sze
e8b64d3851 HDFS-4729. Fix OfflineImageViewer and permission checking for snapshot operations. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471665 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 20:47:13 +00:00
Tsz-wo Sze
0fa5cad0b2 HDFS-4686. Update quota computation for rename and INodeReference. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471647 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 20:31:06 +00:00
Tsz-wo Sze
5f1e3b561a Merge r1470760 through r1471228 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471229 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 02:21:58 +00:00
Tsz-wo Sze
3a812e9f3a HDFS-4738. Changes AbstractINodeDiff to implement Comparable<Integer>, and fix javadoc and other warnings. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471228 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 02:11:18 +00:00
Aaron Myers
4c662fd3fe HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471215 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:47:13 +00:00
Tsz-wo Sze
65752c09ab HDFS-4735. DisallowSnapshot throws IllegalStateException for nested snapshottable directories. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471214 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:28:07 +00:00
Tsz-wo Sze
631be95398 HDFS-4732. Fix TestDFSUpgradeFromImage which fails on Windows due to failure to unpack old image tarball that contains hard links. Chris Nauroth 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471090 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-23 18:47:47 +00:00
Tsz-wo Sze
fd24c6e833 HDFS-4725. Fix HDFS file handle leaks in FSEditLog, NameNode, OfflineEditsBinaryLoader and some tests. Contributed by Chris Nauroth 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470771 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-23 01:18:36 +00:00
Tsz-wo Sze
10a2d82b45 HDFS-4719. Remove AbstractINodeDiff.Factory and move its methods to AbstractINodeDiffList. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470759 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-23 00:11:51 +00:00
Tsz-wo Sze
92e0416ced HDFS-4727. Update inodeMap after deleting files/directories/snapshots. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470756 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-23 00:00:47 +00:00
Tsz-wo Sze
43bdc22e92 HDFS-4726. Fix test failures after merging the INodeId-INode mapping from trunk. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470735 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-22 22:13:58 +00:00
Tsz-wo Sze
cb229db4bd HDFS-4708. Add snapshot user documentation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470665 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-22 19:13:18 +00:00
Suresh Srinivas
27b3f84fe5 Merge trunk to HDFS-2802 branch. This involves fixing many conflict with HDFS-4434. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470225 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 20:22:21 +00:00
Suresh Srinivas
0b101bd7e8 HDFS-4434. Reverting change r1470089 that merges trunk to HDFS-2802. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470194 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 16:57:44 +00:00
Suresh Srinivas
9af0babe7e Merging trunk after fixing conflict with HDFS-4434. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470089 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 00:02:43 +00:00
Kihwal Lee
16cc4a6e86 HDFS-4699. TestPipelinesFailover#testPipelineRecoveryStress fails sporadically. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469839 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 14:08:29 +00:00
Tsz-wo Sze
9ab8fa36f2 HDFS-4717. Change the path parameter type of the snapshot methods in HdfsAdmin from String to Path. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469664 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 02:07:52 +00:00
Suresh Srinivas
980e6c54ba HDFS-4434. Provide a mapping from INodeId to INode. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469644 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 00:10:09 +00:00
Tsz-wo Sze
419fd3999c HDFS-4706. Do not replace root inode for disallowSnapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469122 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 01:39:12 +00:00
Tsz-wo Sze
0ad27ad3e3 HDFS-4707. Add snapshot methods to FilterFileSystem and fix findbugs warnings. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469119 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 01:28:00 +00:00
Tsz-wo Sze
2186912ff9 Merge r1467713 through r1469041 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469042 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 19:41:50 +00:00
Suresh Srinivas
d090a3b600 HDFS-4695. TestEditLog leaks open file handles between tests. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469015 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 18:11:31 +00:00
Tsz-wo Sze
9280468b1a HDFS-4550. Refactor INodeDirectory.INodesInPath to a standalone class. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468725 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 02:41:38 +00:00
Tsz-wo Sze
38bd7061c1 HDFS-4529. Disallow concat when one of the src files is in some snapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468667 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 23:16:02 +00:00
Tsz-wo Sze
6bda1f20ad HDFS-4700. Fix the undo section of rename with snapshots. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468632 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 22:03:58 +00:00
Suresh Srinivas
1822529e88 HDFS-4693. Some test cases in TestCheckpoint do not clean up after themselves. Contributed by Arpit Agarwal and Suresh. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1468457 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 15:10:47 +00:00
Tsz-wo Sze
d13f6ebe20 HDFS-4666. Define ".snapshot" as a reserved inode name so that users cannot create a file/directory with ".snapshot" as the name. If ".snapshot" is used in a previous version of HDFS, it must be renamed before upgrade; otherwise, upgrade will fail. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468238 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-15 21:42:06 +00:00
Tsz-wo Sze
bf807063bc Merging r1466653 through r1467712 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467713 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 23:05:54 +00:00
Tsz-wo Sze
0f78c50ea7 HDFS-4692. Use timestamp as default snapshot names. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467706 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 21:41:33 +00:00
Tsz-wo Sze
9c6a7bebe2 HDFS-4675. Fix rename across snapshottable directories. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467540 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 02:48:34 +00:00
Aaron Myers
801b484f97 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467538 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 02:13:59 +00:00
Konstantin Shvachko
242028a3fb HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467534 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 01:35:58 +00:00
Aaron Myers
b7aaa1b74c Merge trunk into the HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1467511 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 23:05:28 +00:00
Kihwal Lee
f863543206 HDFS-4477. Secondary namenode may retain old tokens. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467307 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 15:18:07 +00:00
Suresh Srinivas
fd1000bcef HDFS-4679. Namenode operation checks should be done in a consistent manner. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466721 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 22:45:23 +00:00
Tsz-wo Sze
4c00514ede HDFS-4684. Use INode id for image serialization when writing INodeReference. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1466718 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 22:24:30 +00:00
Tsz-wo Sze
3209d4a3c4 Merge r1464808 through r1466652 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1466658 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 20:17:39 +00:00
Todd Lipcon
f0351527d5 HDFS-4643. Fix flakiness in TestQuorumJournalManager. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466253 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 21:34:12 +00:00
Suresh Srinivas
d9593621b5 HDFS-4669. TestBlockPoolManager fails using IBM java. Contributed by Tian Hong Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466176 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 19:04:28 +00:00
Suresh Srinivas
e73db45185 HDFS-4674. TestBPOfferService fails on Windows due to failure parsing datanode data directory as URI. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466148 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 17:33:05 +00:00
Suresh Srinivas
425f495591 HDFS-4676. TestHDFSFileSystemContract should set MiniDFSCluster variable to null to free up memory. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466099 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 16:17:06 +00:00
Suresh Srinivas
f680865d99 HDFS-3940. Add Gset#clear method and clear the block map when namenode is shutdown. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465851 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 01:21:48 +00:00
Suresh Srinivas
19201622be HDFS-4339. Persist inode id in fsimage and editlog. Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465835 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-08 23:57:31 +00:00
Todd Lipcon
087acf8fd6 HDFS-3981. Fix handling of FSN lock in getBlockLocations. Contributed by Xiaobo Peng and Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465751 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-08 19:57:16 +00:00
Uma Maheswara Rao G
c5bb615317 HDFS-4525. Provide an API for knowing that whether file is closed or not. Contributed by SreeHari. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465434 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-07 18:01:17 +00:00
Aaron Myers
a9d515aed8 HDFS-1804. Add a new block-volume device choosing policy that looks at free space. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465183 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-06 04:08:09 +00:00
Konstantin Boudnik
bcbe100541 HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by Jagane Sundar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465121 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 20:41:04 +00:00
Tsz-wo Sze
07d7d92179 Merge r1462698 through r1464807 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1464815 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 02:43:29 +00:00
Tsz-wo Sze
ca848beb53 HDFS-4647. Rename should call setLocalName after an inode is removed from snapshots. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1464795 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 23:52:38 +00:00
Suresh Srinivas
999ce497f0 HDFS-4625. Make TestNNWithQJM#testNewNamenodeTakesOverWriter work on Windows. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464780 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 22:54:09 +00:00
Kihwal Lee
547d2b0bac HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464548 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 13:50:31 +00:00
Luke Lu
d088d2ddea HDFS-4665. Move TestNetworkTopologyWithNodeGroup to common. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464303 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 07:12:28 +00:00
Kihwal Lee
8293e22565 HDFS-4649. Webhdfs cannot list large directories. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463698 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 19:11:56 +00:00
Aaron Myers
9c26c28c87 HDFS-4658. Standby NN will log that it has received a block report "after becoming active". Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463643 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 17:49:58 +00:00
Aaron Myers
ef9e1ba763 HDFS-4656. DN heartbeat loop can be briefly tight. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463357 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:11:07 +00:00
Aaron Myers
329fb1f433 HDFS-4655. DNA_FINALIZE is logged as being an unknown command by the DN when received from the standby NN. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463355 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:05:55 +00:00
Tsz-wo Sze
1096917649 HDFS-4611. Update FSImage for INodeReference. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1463332 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 23:24:42 +00:00
Tsz-wo Sze
8ee6ecaea4 HDFS-4637. INodeDirectory#replaceSelf4Quota may incorrectly convert a newly created directory to an INodeDirectoryWithSnapshot. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1463075 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 01:53:21 +00:00
Tsz-wo Sze
9602869d19 HDFS-4648. For snapshot deletion, when merging the diff from to-delete snapshot to the prior snapshot, make sure files/directories created after the prior snapshot get deleted. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462865 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-30 23:57:27 +00:00
Tsz-wo Sze
f5bbc2d950 Merge r1460409 through r1462697 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462698 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-30 03:50:03 +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
Tsz-wo Sze
25aab4203c HDFS-4636. Update quota usage when deleting files/dirs that were created after taking the latest snapshot. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462192 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-28 16:18:04 +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
cc2f96f655 HDFS-4612. Not to use INode.getParent() when generating snapshot diff report. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460590 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 10:21:30 +00:00
Suresh Srinivas
698e3f8ae5 Merging trunk to branch HDFS-2802 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460410 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-24 15:56:18 +00:00
Suresh Srinivas
993a76f2dd HDFS-4627. Fix FSImageFormat#Loader NPE and synchronization issues. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460389 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-24 14:53:52 +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
Tsz-wo Sze
ca7c588185 HDFS-4616. Update the FilesDeleted metric while deleting file/dir in the current tree. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1459485 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 19:30:35 +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
Tsz-wo Sze
9701555899 HDFS-4534. Add INodeReference in order to support rename with snapshots. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1458164 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 06:27:26 +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
Tsz-wo Sze
a5a66330a8 Merge r1455389 through r1457712 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1457716 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 11:45:07 +00:00
Tsz-wo Sze
77f7bfa9ef HDFS-4556. Add snapshotdiff and LsSnapshottableDir tools to hdfs script. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1457712 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 11:36:59 +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
Suresh Srinivas
b8f3133e04 Adding file missed in the revision 1455805 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1455807 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 06:06:21 +00:00
Suresh Srinivas
719c313be1 HDFS-4144. Create test for all snapshot-related metrics. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1455805 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 06:05:00 +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
Tsz-wo Sze
3b3ea5c422 HDFS-4563. Update namespace/diskspace usage after deleting snapshots. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1455396 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 02:41:25 +00:00
Tsz-wo Sze
f35cd45811 Merge r1454237 through r1455388 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1455390 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 01:58:43 +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
Tsz-wo Sze
43f8d0b9c9 HDFS-4574. Move Diff to the util package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1454988 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-11 03:45:52 +00:00
Suresh Srinivas
d32fb8a62b HDFS-4579. Annotate snapshot tests. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1454748 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-09 18:14:30 +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
82230367ba Merging trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1454238 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 04:13:41 +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
Tsz-wo Sze
8d95784bf1 HDFS-4557. Fix FSDirectory#delete when INode#cleanSubtree returns 0. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1454138 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 22:34:51 +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
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
Tsz-wo Sze
3145cf1ab2 Merge r1449958 through r1453659 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1453669 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 02:57:40 +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
638801cce1 HADOOP-8952. Enhancements to support Hadoop on Windows Server and Windows Azure environments. Contributed by Ivan Mitic, Chuan Liu, Ramya Sunil, Bikas Saha, Kanna Karanam, John Gordon, Brandon Li, Chris Nauroth, David Lao, Sumadhur Reddy Bolli, Arpit Agarwal, Ahmed El Baz, Mike Liddell, Jing Zhao, Thejas Nair, Steve Maine, Ganeshan Iyer, Raja Aluri, Giridharan Kesavan, Ramya Bharathi Nimmagadda. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453486 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 19:15:18 +00:00
Suresh Srinivas
456064d899 HDFS-4544. Error in deleting blocks should not do check disk, for all types of errors. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453436 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 17:18:46 +00:00
Suresh Srinivas
56c7e7a12e HDFS-4519. Support overriding jsvc binary and log file locations when launching secure datanode. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453050 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 22:37:04 +00:00
Suresh Srinivas
a82e67af6c HDFS-4540. Namenode http server should use the web authentication keytab for spnego principal. Contributed by Arpit Gupta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453025 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 21:47:22 +00:00
Kihwal Lee
97ccd64401 HDFS-4542. Webhdfs doesn't support secure proxy users. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1452978 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 20:17:56 +00:00
Tsz-wo Sze
b1333e5b56 HDFS-4545. With snapshots, FSDirectory.unprotectedSetReplication(..) always changes file replication but it may or may not changes block replication. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1452636 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 02:23:34 +00:00
Suresh Srinivas
3ea26d3408 HDFS-4541. Set hadoop.log.dir and hadoop.id.str when starting secure datanode to write the logs to right dir by default. Contributed by Arpit Gupta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1452461 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 19:34:15 +00:00
Daryn Sharp
d8ca9c655b HDFS-4532. RPC call queue may fill due to current user lookup (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1452435 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 18:36:30 +00:00
Daryn Sharp
cfa86e6110 HDFS-4128. 2NN gets stuck in inconsistent state if edit log replay fails in the middle (kihwal via daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1452384 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 16:44:23 +00:00
Suresh Srinivas
2e02b92664 HDFS-4518. Finer grained metrics for HDFS capacity. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1451348 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-28 21:13:59 +00:00
Tsz-wo Sze
c7cf85ccb4 HDFS-4507. Update quota verification for snapshots. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1451081 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-28 03:08:08 +00:00
Tsz-wo Sze
e2a618e1cc HDFS-4523. Fix INodeFile replacement, TestQuota and javac errors from trunk merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1450477 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 22:04:35 +00:00
Aaron Myers
7e2d98da40 HDFS-4235. When outputting XML, OfflineEditsViewer can't handle some edits containing non-ASCII strings. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1449984 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 00:44:52 +00:00
Tsz-wo Sze
aa82b03823 Merge r1448505 through r1449957 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1449976 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 00:10:17 +00:00
Tsz-wo Sze
59e968a114 HDFS-4514. Add CLI for supporting snapshot rename, diff report, and snapshottable directory listing. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1449956 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-25 23:14:58 +00:00
Aaron Myers
63522b3224 HADOOP-8569. CMakeLists.txt: define _GNU_SOURCE and _LARGEFILE_SOURCE. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1449922 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-25 22:07:45 +00:00
Tsz-wo Sze
d8ccf4e521 Add the new test file by HDFS-4520. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1449863 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-25 19:49:52 +00:00
Tsz-wo Sze
5ddbbd9d65 HDFS-4520. Support listing snapshots under a snapshottable directory using ls. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1449862 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-25 19:49:05 +00:00
Tsz-wo Sze
0deff1727e HDFS-4524. Update SnapshotManager#snapshottables when loading fsimage. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1449265 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-23 02:44:05 +00:00
Aaron Myers
019d6a22b1 HDFS-4304. Make FSEditLogOp.MAX_OP_SIZE configurable. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1449218 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-22 21:21:16 +00:00
Aaron Myers
8271fae921 HADOOP-9267. hadoop -help, -h, --help should show usage instructions. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1449161 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-22 18:36:24 +00:00
Suresh Srinivas
cdb292f44c HDFS-4222. NN is unresponsive and loses heartbeats from DNs when configured to use LDAP and LDAP has issues. Contributed by Xiaobo Peng and Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1448801 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 21:02:39 +00:00
Uma Maheswara Rao G
bf44d16ef4 HDFS-4482. ReplicationMonitor thread can exit with NPE due to the race between delete and replication of same file. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1448708 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 16:25:12 +00:00
Tsz-wo Sze
89d05b53d9 Merge r1446505 through r1448504 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1448505 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 03:30:10 +00:00
Tsz-wo Sze
f29fa9e820 HDFS-4499. Fix file/directory/snapshot deletion for file diff. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1448504 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 03:27:36 +00:00
Tsz-wo Sze
567ab4335f HDFS-4502. JsonUtil.toFileStatus(..) should check if the fileId property exists. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1448502 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 03:19:16 +00:00
Tsz-wo Sze
fac3883188 HDFS-4503. Update computeContentSummary(..), spaceConsumedInTree(..) and diskspaceConsumed(..) in INode for snapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1448373 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-20 20:02:24 +00:00
Tsz-wo Sze
14eaab6778 HDFS-4431. Support snapshot in OfflineImageViewer. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446993 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-17 02:58:31 +00:00
Aaron Myers
f61581501a Merge trunk into HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-16 01:12:07 +00:00
Aaron Myers
3a417cbf1d HDFS-347: style cleanups. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446830 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-16 00:59:01 +00:00
Suresh Srinivas
a9f6a27e93 Merge trunk to HDFS-2802 branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446507 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-15 10:57:34 +00:00
Tsz-wo Sze
d9e2514d21 HDFS-4487. Fix snapshot diff report for HDFS-4446. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446385 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 23:07:49 +00:00
Tsz-wo Sze
d42d0860cb HDFS-4500. Refactor snapshot INode methods. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446355 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 22:00:36 +00:00
Tsz-wo Sze
02e6b72ae1 HDFS-4481. Change fsimage to support snapshot file diffs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446000 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 00:43:28 +00:00
Kihwal Lee
a9974c791a HDFS-4495. Allow client-side lease renewal to be retried beyond soft-limit. Contributed by Kihwal Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445965 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 22:51:21 +00:00
Alejandro Abdelnur
6bcbf492a2 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445956 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 22:13:44 +00:00
Todd Lipcon
27e158362c HDFS-4496. DFSClient: don't create a domain socket unless we need it. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1445491 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 07:26:42 +00:00
Tsz-wo Sze
969e84decb HDFS-4342. Directories configured in dfs.namenode.edits.dir.required but not in dfs.namenode.edits.dir are silently ignored. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445006 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-12 00:50:00 +00:00
Aaron Myers
aa92072b54 HDFS-4453. Make a simple doc to describe the usage and design of the shortcircuit read feature. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1444963 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-11 21:10:23 +00:00
Tsz-wo Sze
fa8bafbd46 Merge r1441206 through r1444434 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1444439 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-09 21:29:44 +00:00
Tsz-wo Sze
afe77ce53d HDFS-4480. Eliminate the file snapshot circular linked list. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1444280 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-08 23:19:32 +00:00
Tsz-wo Sze
4f7d921324 HDFS-4446. Support file snapshots with diff lists. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1443825 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-08 02:18:55 +00:00
Aaron Myers
6f0c56cb95 HDFS-4471. Namenode WebUI file browsing does not work with wildcard addresses configured. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443807 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-08 00:28:00 +00:00
Suresh Srinivas
7114a61318 HDFS-4470. Several HDFS tests attempt file operations on invalid HDFS paths when running on Windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443744 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-07 21:52:55 +00:00
Tsz-wo Sze
90c3700c52 HDFS-4458. In DFSUtil.getNameServiceUris(..), convert default fs URI using NetUtils.createSocketAddr(..) for being consistent with other addresses. Contributed by Binglin Chang 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443297 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-07 03:04:18 +00:00
Aaron Myers
3d46863e12 HDFS-4473. Don't create domain socket unless we need it. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1443283 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-07 00:02:12 +00:00
Suresh Srinivas
4525c4a25b HDFS-4340. Update addBlock() to inculde inode id as additional argument. Contributed Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443169 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:52:34 +00:00
Tsz-wo Sze
e28edbffe1 HDFS-4468. Use the new StringUtils methods added by HADOOP-9252 and fix TestHDFSCLI and TestQuota. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442824 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 01:13:16 +00:00
Aaron Myers
ef8dd606ab HDFS-4344. dfshealth.jsp throws NumberFormatException when dfs.hosts/dfs.hosts.exclude includes port number. Contributed by Andy Isaacson. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442465 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-05 04:07:31 +00:00
Aaron Myers
5a0b746639 HDFS-4404. Create file failure when the machine of first attempted NameNode is down. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442461 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-05 03:18:14 +00:00
Aaron Myers
a8e39feed2 HDFS-4462. 2NN will fail to checkpoint after an HDFS upgrade from a pre-federation version of HDFS. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442375 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-04 21:29:39 +00:00
Uma Maheswara Rao G
52e6f5a276 HDFS-4445. All BKJM ledgers are not checked while tailing, So failover will fail. Contributed Vinay. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441935 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-03 17:33:55 +00:00
Suresh Srinivas
8590564dc5 HDFS-4350. Make enabling of stale marking on read and write paths independent. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441819 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 22:18:50 +00:00
Suresh Srinivas
24d96cbcdb HDFS-4414. Add support for getting snapshot diff from DistributedFileSystem. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441808 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 20:39:01 +00:00
Konstantin Shvachko
61a262757c HDFS-4452. getAdditionalBlock() can create multiple blocks if the client times out and retries. Contributed by Konstantin Shvachko. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441681 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 02:07:26 +00:00
Tsz-wo Sze
e7db60fbfc HDFS-4464. Combine collectSubtreeBlocksAndClear with deleteDiffsForSnapshot and rename it to destroySubtreeAndCollectBlocks. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441680 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 01:53:17 +00:00
Alejandro Abdelnur
bbdae834d2 HDFS-4456. Add concat to HttpFS and WebHDFS REST API docs. (plamenj2003 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441603 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-01 19:42:06 +00:00
Tsz-wo Sze
40df526bd3 Merge r1440222 through r1441205 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441206 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-31 21:39:42 +00:00
Tsz-wo Sze
2710e961e5 HDFS-4361. When listing snapshottable directories, only return those where the user has permission to take snapshots. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441202 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-31 21:35:19 +00:00
Tsz-wo Sze
2372e394dd HDFS-4189. Renames the getMutableXxx methods to getXxx4Write and fix a bug that some getExistingPathINodes calls should be getINodesInPath4Write. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441193 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-31 21:13:04 +00:00
Suresh Srinivas
6ecbb35019 HDFS-4151. hdfs balancer command returns exit code 1 on success instead of 0. Contributed by Joshua Blatt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441113 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-31 18:44:37 +00:00
Aaron Myers
e7380b4f9c HDFS-4428. FsDatasetImpl should disclose what the error is when a rename fails. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440865 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-31 07:29:46 +00:00
Aaron Myers
dcd27ff778 Merge trunk into HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1440579 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-30 18:32:00 +00:00
Konstantin Shvachko
481b6cccf0 HDFS-3598. WebHDFS support for file concat. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440290 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-30 06:51:57 +00:00
Aaron Myers
73066dc958 HADOOP-9221. Convert remaining xdocs to APT. Contributed by Andy Isaacson. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440245 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-30 01:52:14 +00:00
Tsz-wo Sze
f352b4ce0c Merge r1438306 through r1440221 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1440222 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 23:53:59 +00:00
Tsz-wo Sze
6f4fe09687 HDFS-4447. Refactor INodeDirectoryWithSnapshot for supporting general INode diff lists. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1440216 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 23:25:49 +00:00
Kihwal Lee
8acfa66897 HDFS-4288. NN accepts incremental BR as IBR in safemode. contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440192 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 22:44:35 +00:00
Suresh Srinivas
66ea187228 HDFS-4131. Add capability to namenode to get snapshot diff. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1440152 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 21:31:44 +00:00
Aaron Myers
33cee25aad HADOOP-9190. packaging docs is broken. Contributed by Andy Isaacson. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1439796 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 09:17:40 +00:00
Suresh Srinivas
5988208b7d HDFS-4432. Support INodeFileUnderConstructionWithSnapshot in FSImage saving/loading. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1439682 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-28 22:48:58 +00:00
Suresh Srinivas
58c0c6f069 HDFS-4444. Add space between total transaction time and number of transactions in FSEditLog#printStatistics. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1439559 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-28 18:56:37 +00:00
Harsh J
9639f37ee2 HDFS-4259. Improve pipeline DN replacement failure message. Contributed by Harsh J. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1439126 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-27 17:42:25 +00:00
Tsz-wo Sze
86f6dfb338 HDFS-4443. Remove a trailing '`' character from the HTML code generated by NamenodeJspHelper.generateNodeData(..). Contributed by Christian Rohling 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438808 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 01:17:45 +00:00
Tsz-wo Sze
a3bf208386 HDFS-4441. Move INodeDirectoryWithSnapshot.Diff and the related classes to a package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1438782 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:01:51 +00:00
Tsz-wo Sze
12e8ba804f HDFS-4429. When the latest snapshot exists, INodeFileUnderConstruction should be replaced with INodeFileWithSnapshot but not INodeFile. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1438304 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-25 03:09:26 +00:00
Aaron Myers
c0e16efe91 HDFS-4440. Avoid annoying log message when dfs.domain.socket.path is not set. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1438280 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-25 00:44:37 +00:00
Tsz-wo Sze
bb80f2fb29 HDFS-4436. Change INode.recordModification(..) to return only the current inode and remove the updateCircularList parameter from some methods in INodeDirectoryWithSnapshot.Diff. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1438203 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-24 21:33:34 +00:00
Tsz-wo Sze
74d1e5c302 Merge r1432789 through r1437840 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1437843 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-24 02:45:45 +00:00
Todd Lipcon
4e74c52e60 HDFS-4433. Make TestPeerCache not flaky. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1437680 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 20:01:33 +00:00
Suresh Srinivas
a1e6df6bc4 HDFS-4426. Secondary namenode shuts down immediately after startup. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1437627 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 19:00:39 +00:00
Todd Lipcon
797465820b Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1437623 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 18:51:24 +00:00
Todd Lipcon
d12f465c67 HDFS-4417. Fix case where local reads get disabled incorrectly. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1437616 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 18:38:56 +00:00
Suresh Srinivas
fe3584aadf HDFS-4126. Add reading/writing snapshot information to FSImage. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1437256 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 02:48:01 +00:00
Todd Lipcon
cfae13306a HDFS-4403. DFSClient can infer checksum type when not provided by reading first byte. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1436730 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-22 02:59:25 +00:00
Todd Lipcon
89bd14913a HDFS-4416. Rename dfs.datanode.domain.socket.path to dfs.domain.socket.path. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1436568 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-21 19:29:06 +00:00
Aaron Myers
d3d350ef0f HDFS-4359. Slow RPC responses from NN can prevent metrics collection on DNs. Contributed by liang xie. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435299 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 18:39:24 +00:00
Tsz-wo Sze
b71d386890 HDFS-4098. Add FileWithSnapshot, INodeFileUnderConstructionWithSnapshot and INodeFileUnderConstructionSnapshot for supporting append to snapshotted files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1434966 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-17 23:38:30 +00:00
Todd Lipcon
52c5b8ea9f HDFS-4418. increase default FileInputStreamCache size. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1434953 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-17 23:11:30 +00:00
Suresh Srinivas
8f70a25b1c HDFS-4393. Make empty request and responses in protocol translators can be static final members. Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1434844 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-17 18:21:29 +00:00
Tsz-wo Sze
7856221d4a HDFS-4407. Change INodeDirectoryWithSnapshot.Diff.combinePostDiff(..) to merge-sort like and keep the postDiff parameter unmodified. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1433918 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 12:43:51 +00:00
Todd Lipcon
5b0187dcd3 Revert r1433755: HDFS-4288. NN accepts incremental BR as IBR in safemode. Contributed by Daryn Sharp. 
This commit caused TestBlockManager to fail.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433820 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 04:22:38 +00:00
Todd Lipcon
27d068b684 HDFS-4288. NN accepts incremental BR as IBR in safemode. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433755 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 00:09:54 +00:00
Todd Lipcon
347cf6e176 HADOOP-8712. Change default hadoop.security.group.mapping to JniBasedUnixGroupsNetgroupMappingWithFallback. Contributed by Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433624 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 20:43:32 +00:00
Suresh Srinivas
4a579d4de9 HDFS-4392. Use NetUtils#getFreeSocketPort in MiniDFSCluster. Contributed by Andrew Purtell. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433578 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 18:47:51 +00:00
Tsz-wo Sze
00d318378e HDFS-4397. Fix a bug in INodeDirectoryWithSnapshot.Diff.combinePostDiff(..) that it may put the wrong node into the deleted list. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1433293 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 06:20:22 +00:00
Tsz-wo Sze
397835acdf svn merge -c -1432788 for reverting HDFS-4098. Add FileWithLink, INodeFileUnderConstructionWithLink and INodeFileUnderConstructionSnapshot in order to support append to snapshotted files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1433284 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 04:33:14 +00:00
Eli Collins
e6dbad4f6f HADOOP-9178. src/main/conf is missing hadoop-policy.xml. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433275 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 03:25:12 +00:00
Todd Lipcon
2f4e2c607e Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433249 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:42:06 +00:00
Todd Lipcon
2fd41b3b42 HDFS-4402. Some small DomainSocket fixes: avoid findbugs warning, change log level, etc. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433242 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:31:35 +00:00
Suresh Srinivas
8767a37b9b HDFS-4375. Use token request messages defined in hadoop common. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433235 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:26:23 +00:00
Suresh Srinivas
6dbc7e03e5 HDFS-4369. GetBlockKeysResponseProto does not handle null response. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433206 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 23:13:27 +00:00
Suresh Srinivas
0671176111 HDFS-4364. GetLinkTargetResponseProto does not handle null path. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433194 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 23:01:39 +00:00
Todd Lipcon
d08b1af26a HDFS-4400. DFSInputStream#getBlockReader: last retries should ignore the cache. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433144 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 21:34:22 +00:00
Todd Lipcon
12bf674e8e Merge trunk into branch. 
Fixed a couple trivial conflicts due to HDFS-4363, which moved some methods
from HdfsProtoUtil to PBHelper


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433133 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 21:12:16 +00:00
Todd Lipcon
3052ad1f00 HDFS-3429. DataNode reads checksums even if client does not need them. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433117 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 20:47:08 +00:00
Thomas Graves
e26da77544 HDFS-4385. Maven RAT plugin is not checking all source files (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432933 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 14:36:40 +00:00
Tsz-wo Sze
686e13db2f HDFS-4395. In INodeDirectorySnapshottable's constructor, the passed-in dir could be an INodeDirectoryWithSnapshot. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432838 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 08:40:13 +00:00
Tsz-wo Sze
90d6d55a4b Merge r1426019 through r1432788 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432796 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 03:44:35 +00:00
Tsz-wo Sze
25116c26fd HDFS-4098. Add FileWithLink, INodeFileUnderConstructionWithLink and INodeFileUnderConstructionSnapshot in order to support append to snapshotted files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432788 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 02:30:15 +00:00
Tsz-wo Sze
bc0aff27a4 HDFS-4245. Include snapshot related operations in TestOfflineEditsViewer. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432592 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-13 11:29:14 +00:00
Konstantin Shvachko
06406d7056 HDFS-1245. Plugable block id generation. Contributed by Konstantin Shvachko. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432539 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-13 01:13:29 +00:00
Todd Lipcon
d2737575ad HDFS-4390. Bypass UNIX domain socket unit tests when they cannot be run. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1432350 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-12 01:19:27 +00:00
Todd Lipcon
9a4030e0e8 HDFS-4356. BlockReaderLocal should use passed file descriptors rather than paths. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1432335 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 23:52:22 +00:00
Suresh Srinivas
ad1cd71b10 HDFS-4381. Merge change r1432149 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432247 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 19:42:11 +00:00
Suresh Srinivas
93c1b4b25a Merge r1414455:r1426018 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1432246 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 19:40:23 +00:00
Eli Collins
ebfa3ab1fa HDFS-4384. test_libhdfs_threaded gets SEGV if JNIEnv cannot be initialized. Contributed by Colin Patrick McCabe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432221 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 18:47:52 +00:00
Suresh Srinivas
bbc21ad5d4 HDFS-4381. Document fsimage format details in FSImageFormat class javadoc. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432149 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 16:57:12 +00:00
Aaron Myers
91c28d4409 HDFS-4328. TestLargeBlock#testLargeBlockSize is timing out. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431867 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 03:44:36 +00:00
Eli Collins
82b218c605 HDFS-4377. Some trivial DN comment cleanup. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431753 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 00:09:37 +00:00
Suresh Srinivas
be5509c537 HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS. Contributed by Ted Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431726 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 23:20:46 +00:00
Suresh Srinivas
2bd35d8de3 HDFS-4367. GetDataEncryptionKeyResponseProto does not handle null response. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431459 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 16:03:37 +00:00
Eli Collins
6449f52455 HDFS-4032. Specify the charset explicitly rather than rely on the default. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431179 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 02:30:05 +00:00
Aaron Myers
7e599d9e3b HADOOP-9155. FsPermission should have different default value, 777 for directory and 666 for file. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431148 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 23:30:41 +00:00
Aaron Myers
3555e7c574 HDFS-4306. PBHelper.convertLocatedBlock miss convert BlockToken. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431117 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 22:29:41 +00:00