Commit Graph

1923 Commits

Author SHA1 Message Date
Suresh Srinivas
9a43df8e5a HDFS-4825. webhdfs / httpfs tests broken because of min block size change. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486386 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 02:11:37 +00:00
Suresh Srinivas
a5d7b6ef6f HADOOP-8562. Moved related jiras to 2.0.5 section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486336 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 15:15:50 +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
Todd Lipcon
2245fcc8c5 Move HDFS-347 and related JIRAs to 2.0.5 section of CHANGES.txt after backport
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483212 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:09:41 +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
Tsz-wo Sze
742707d621 Combine CHANGES.HDFS-2802.txt to CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480840 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 00:15:29 +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
3ecf94e2b7 Merge r1480440 through r1480820 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480824 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:46:39 +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
Vinod Kumar Vavilapalli
e5692ecbe1 Fixing release date for 2.0.4-alpha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480480 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 21:57:44 +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
01e3fa1166 Move the CHANGES.txt entry for HDFS-4804 from BUG to IMPROVEMENT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480101 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:43:06 +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
6cec97be4b HDFS-4785 and HDFS-4784 are moved to 2.0.5 release section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478563 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 21:31:23 +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
7e7d99e905 HDFS-2576. Moved the commit message lines for HDFS-4778 and HDFS-2576 in CHANGES.txt to the right places.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477855 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 22:14:44 +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
Aaron Myers
a02e376850 Move the CHANGES.txt entry for HDFS-4305 to the incompatible changes section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477488 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 07:13:09 +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
Aaron Myers
c06bbc25e8 HDFS-4733. Make HttpFS username pattern configurable. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477237 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 18:05:04 +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
a89f8e4d95 Cleanup CHANGES.txt and move the jira to appropriate 2.x release section to make it consistent with branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475779 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:03:22 +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
Suresh Srinivas
a09c29b8c0 HDFS-4339. Add the missed entry CHANGES.txt from r1465835
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471595 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:41:12 +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
Thomas Graves
6d9c311840 Preparing for release 0.23.7
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:08:00 +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
Todd Lipcon
c45c8ee720 Complete commit of prior merge.
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 16:47:16 +00:00
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