Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,619 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1153 Commits

Author SHA1 Message Date
Tsz-wo Sze 4c734a8ee8 svn merge -c 1353807 from trunk for HDFS-3498. Support replica removal in BlockPlacementPolicy and make BlockPlacementPolicyDefault extensible for reusing code in subclasses. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488844 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:35:04 +00:00
Tsz-wo Sze 332cf8faeb svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488631 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 23:02:10 +00:00
Konstantin Boudnik 44a72a119a Adding 2.0.5-alpha release to CHANGES.txt files of branch-2 
Also updating current version to 2.1.0-beta in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:32 +00:00
Tsz-wo Sze 360fa0c6f5 svn merge -c 1487942 from trunk for HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output hat ".snapshot" is a reserved name. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488097 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:16:05 +00:00
Tsz-wo Sze 6428612f35 svn merge -c 1487698 from trunk for HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488096 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:13:32 +00:00
Tsz-wo Sze 74fa2f1de8 svn merge -c 1487655 from trunk for HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488094 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:10:06 +00:00
Tsz-wo Sze 387b7af02f svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488093 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:07:52 +00:00
Tsz-wo Sze ab2588a78b svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488091 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:03:27 +00:00
Tsz-wo Sze 1b594395da svn merge -c 1483150 from trunk for HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488090 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:50:10 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:29:20 +00:00
Alejandro Abdelnur 8bb534f423 HDFS-4865. Remove sub resource warning from httpfs log at startup time. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487619 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 19:55:32 +00:00
Devaraj Das 0c221b3b03 Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 20:25:35 +00:00
Kihwal Lee 419fb4a4de svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 15:49:33 +00:00
Suresh Srinivas dbe14af299 HDFS-4825. Merge change 1486386 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486387 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 02:28:10 +00:00
Suresh Srinivas fa88e4ea6e HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 00:09:12 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:29:49 +00:00
Suresh Srinivas baa2db4c64 HADOOP-8562. Merge r1477376 for HADOOP-9413, r1476877 for HDFS-4734, r1476856 for HADOOP-9524. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486238 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:20:55 +00:00
Suresh Srinivas 1e119f5c31 HDFS-4705. Merge r1476610 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486199 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:54:00 +00:00
Suresh Srinivas f05a2e5b69 HDFS-4722. Merge r1476597 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:16:58 +00:00
Suresh Srinivas c0fbc823f0 HDFS-4740. Merge r1476596 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486174 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:14:04 +00:00
Suresh Srinivas bc0eb9d993 HDFS-4743. Merge r1476591 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486162 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:45:39 +00:00
Suresh Srinivas 0610d2d2d3 HDFS-4741. Merge r1476585 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:29:50 +00:00
Suresh Srinivas 0af2735024 HDFS-3131. Merge r1305688 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:26:33 +00:00
Suresh Srinivas f1f11999d9 HDFS-4732. Merge r1471090 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486146 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:17:52 +00:00
Suresh Srinivas 4a16d5b759 HDFS-4725. Merge r1470771 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486144 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:15:42 +00:00
Suresh Srinivas a9176a64a1 HDFS-4693. Merge r1468457 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486098 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 15:44:33 +00:00
Suresh Srinivas 9b910c5c88 HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 05:34:41 +00:00
Suresh Srinivas 0a96ae767f HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485932 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 05:12:56 +00:00
Suresh Srinivas 02205fa797 HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:51:31 +00:00
Suresh Srinivas a6c4b42353 HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060 for HDFS-4582 and r1457057 for HDFS-4603 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485907 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:42:28 +00:00
Suresh Srinivas 830909a910 HADOOP-8562. Merge changes r1454616 for HDFS-4573, r1454889 for HADOOP-8973, r1455360 for HDFS-4572, r1455605 for HDFS-4287 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485892 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 22:51:30 +00:00
Kihwal Lee 7f66f9ccf6 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/branches/branch-2@1485882 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 22:28:21 +00:00
Kihwal Lee 3f9b3d49a3 svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:37:32 +00:00
Suresh Srinivas 3eb800f539 HADOOP-9373. Merge change r1453599 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:07:05 +00:00
Kihwal Lee 623be287b7 HDFS-3875. Issue handling checksum errors in write pipeline. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484809 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 13:45:14 +00:00
Todd Lipcon 5fc2beed58 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/branches/branch-2@1483642 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 03:39:22 +00:00
Aaron Myers 4069886102 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/branches/branch-2@1483238 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 08:16:07 +00:00
Todd Lipcon f0c2f42b38 Add HDFS-347 and related JIRAs to CHANGES.txt under 2.0.5 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483213 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:10:46 +00:00
Tsz-wo Sze bfd2074a57 svn merge -c 1482661 from trunk for HDFS-3180. Add socket timeouts to WebHdfsFileSystem. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482662 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:31:48 +00:00
Tsz-wo Sze 9ec6c9e018 svn merge -c 1482658 from trunk for HDFS-4813. Add volatile to BlocksMap.blocks so that the replication thread can see the updated value. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482659 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:19:24 +00:00
Kihwal Lee 3d615b6573 svn merge -c 1482121. Merging from trunk to branch-2 to fix HDFS-4805. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482122 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 22:06:55 +00:00
Aaron Myers 9c512f83d8 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/branches/branch-2@1482013 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 18:13:44 +00:00
Aaron Myers 82c75115da 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/branches/branch-2@1481996 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 18:00:33 +00:00
Suresh Srinivas 2482e3270f HDFS-4533. Merge 1481178 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481211 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:54:27 +00:00
Aaron Myers bd816a2739 HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481166 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 19:54:27 +00:00
Kihwal Lee d0ffad0387 svn merge -c 1481084. Merging from trunk to branch-2 to fix HDFS-4799. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481086 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 16:38:27 +00:00
Aaron Myers 211a9d99db 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/branches/branch-2@1480842 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 00:19:57 +00:00
Vinod Kumar Vavilapalli c175e3f4aa Fixing release date for 2.0.4-alpha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480482 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 22:02:00 +00:00
Devaraj Das 1dd166d72e Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480136 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 00:12:01 +00:00
Devaraj Das 471b37704a Merge -r 1476394:1476395 from trunk onto branch-2. Fixes HDFS-2576. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480135 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 00:05:18 +00:00
Aaron Myers 20fd61951b 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/branches/branch-2@1480099 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 21:42:14 +00:00
Suresh Srinivas bd198d7dfe HDFS-4784. Merge r1478276 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478287 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:56:19 +00:00
Suresh Srinivas ab8ce0fcda HDFS-4785. Merge change r1478267 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478286 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:48:36 +00:00
Suresh Srinivas 78eaf8c3df HDFS-4434. Merge r1469644 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478282 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:35:58 +00:00
Aaron Myers a9c43af739 Move the CHANGES.txt entry for HDFS-4305 to the incompatible changes section. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477489 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 07:16:22 +00:00
Aaron Myers 0d10e7a16f 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/branches/branch-2@1477358 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 21:41:52 +00:00
Suresh Srinivas f76ad1af85 HDFS-4748. Merge r1476587 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:32:49 +00:00
Suresh Srinivas 091e5df455 HDFS-4768. Merge 1476579 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476581 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:11:41 +00:00
Tsz-wo Sze b2927bd936 svn merge -c 1476399 from trunk for HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing he datanode with the most recent heartbeat as the primary. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476400 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 20:52:29 +00:00
Suresh Srinivas 14246f3d24 HDFS-4434. Reverting the merge to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475972 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 21:28:51 +00:00
Suresh Srinivas a51590e1c5 HDFS-4053. Merging change r1399908 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475848 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 16:44:59 +00:00
Suresh Srinivas e304090117 Cleanup CHANGES.txt to have consistent formatting and match the descrtion with CHANGES.txt in trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475780 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 14:04:12 +00:00
Suresh Srinivas 14f658bf38 HDFS-4745. Merge 1475623 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475625 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 04:32:51 +00:00
Aaron Myers 2838617e0a Update CHANGES.txt for HDFS-4739. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471775 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 23:32:50 +00:00
Suresh Srinivas 1efa9d84ab HDFS-4434. Merge r1469644 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471703 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:41:56 +00:00
Suresh Srinivas 7ca417037f HDFS-4340. Merge r1448502 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471698 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:35:47 +00:00
Suresh Srinivas 13df6b76d2 HDFS-4340. Merge r1443169 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471692 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:31:42 +00:00
Suresh Srinivas 2dbf0c2af5 HDFS-4243. Merge r1416709 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471603 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 19:21:05 +00:00
Suresh Srinivas 0dd2ca1389 HDFS-4346. Merge change r1428167 and r1428560 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471598 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:59:08 +00:00
Suresh Srinivas 9d7e92100b HDFS-4339. Merge change r1465835 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471596 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:42:14 +00:00
Suresh Srinivas 05dc1ca3a5 HDFS-4296. Merge r1420700 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471590 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:29:00 +00:00
Suresh Srinivas 2620203b1a HDFS-4334. Merge r1426429 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471582 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:20:09 +00:00
Suresh Srinivas 0b2af91bc6 HDFS-4209. Merge r1414447 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471574 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:16:25 +00:00
Suresh Srinivas c68bb9cb51 HDFS-4151. Merge r1406006 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471567 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:01:46 +00:00
Suresh Srinivas 19198ea31d HDFS-4215. Merge r1411947 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471530 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:46:50 +00:00
Suresh Srinivas 876c1c9098 HDFS-4206. Merge change r1410996 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471522 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:38:53 +00:00
Suresh Srinivas b2b151139c HDFS-4152. Merge r1406326 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471508 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:22:55 +00:00
Suresh Srinivas c5227bd362 Remove duplicate HDFS-4112 entries in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471503 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:14:51 +00:00
Suresh Srinivas 40aaaf000e HDFS-4124. Merge r1403304 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471500 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:10:59 +00:00
Suresh Srinivas 611b3fc5e6 HDFS-4129. Merge r1403956 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471433 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:28:58 +00:00
Aaron Myers 79de664f03 HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471216 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:48:23 +00:00
Kihwal Lee fbce046a88 svn merge -c 1469839 Merging from trunk to branch-2 to fix HDFS-4699. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469840 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 14:11:28 +00:00
Suresh Srinivas b3941c65e8 HDFS-4695. Merge 1469015 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469018 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 18:14:16 +00:00
Suresh Srinivas 16d41cabf9 HDFS-4693. Merge 1468457 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468469 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 15:39:20 +00:00
Konstantin Shvachko a59b953861 HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467535 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 01:36:46 +00:00
Kihwal Lee c9b9ebde1d svn merge -c 1467307 Merging from trunk to branch-2 to fix HDFS-4477. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467308 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 15:19:59 +00:00
Thomas Graves 61ce78582f Preparing for release 0.23.7 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467070 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 20:09:26 +00:00
Suresh Srinivas 71a4677b36 HDFS-4679. Merge 1466721 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466729 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 23:17:23 +00:00
Todd Lipcon a27b04e11a HDFS-4643. Fix flakiness in TestQuorumJournalManager. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466252 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 21:34:03 +00:00
Suresh Srinivas 4f82642185 HDFS-4669. Merge change 1466176 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466181 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 19:09:01 +00:00
Suresh Srinivas 4167aed789 HDFS-4676. Merging change 1466099 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466102 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 16:21:41 +00:00
Suresh Srinivas 97b95fb3a0 HDFS-3940. Merging change r1465851 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466101 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 16:20:58 +00:00
Todd Lipcon b287d8de6d 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/branches/branch-2@1465752 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-08 19:57:24 +00:00
Uma Maheswara Rao G d208e6a15e Merge 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/branches/branch-2@1465435 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-07 18:04:33 +00:00
Aaron Myers 85c29d073c 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/branches/branch-2@1465184 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-06 04:11:18 +00:00
Konstantin Boudnik e4d027c3a2 svn merge -c1465121 
HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value.
Contributed by Jagane Sundar


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465123 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 20:45:13 +00:00
Kihwal Lee c6f70e7072 svn merge -c 1464548 Merging from trunk to branch-2 to fix HDFS-4548. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464553 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 14:03:51 +00:00
Kihwal Lee a7cdea51fa svn merge -c 1463698 Merging from trunk to branch-2 to fix HDFS-4649. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463699 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 19:13:46 +00:00
Aaron Myers 1d2b7cea58 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/branches/branch-2@1463644 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 17:50:56 +00:00
Aaron Myers 831d18a422 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/branches/branch-2@1463358 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:13:10 +00:00
Aaron Myers b05024a03a 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/branches/branch-2@1463356 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:08:03 +00:00
Todd Lipcon 932a394ba5 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/branches/branch-2@1461784 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:46:39 +00:00
Todd Lipcon 388bf3c267 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/branches/branch-2@1461779 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:43:55 +00:00
Kihwal Lee f0b9aeef47 svn merge -c 1461597 Merging from trunk to branch-2 to fix HDFS-4581. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461602 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 14:23:43 +00:00
Suresh Srinivas 5a808d8c15 HDFS-4635. Merge 1461364 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461365 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 23:04:52 +00:00
Tsz-wo Sze 17a304973c svn merge -c 1461040 from trunk for HDFS-4598. Fix the default value of ConcatSourcesParam and the WebHDFS doc. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461042 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 09:57:19 +00:00
Siddharth Seth 98fcb9eb89 reverting r1459593. HDFS-4584. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460795 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 17:57:35 +00:00
Siddharth Seth 3c2c6e4247 reverting r1459588. HDFS-4615. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460785 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 17:54:53 +00:00
Tsz-wo Sze 6af4449beb svn merge -c 1459592 from trunk for HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459593 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:57:30 +00:00
Tsz-wo Sze 21210295d6 svn merge -c 1459586 from trunk for HDFS-4615. Fix TestDFSShell failures on Windows. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459588 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:50:31 +00:00
Tsz-wo Sze 66dbdfeaf4 svn merge -c 1459576 from trunk for HDFS-4609. TestAuditLogs should release log handles between tests. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459577 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:19:45 +00:00
Tsz-wo Sze b005b46a95 svn merge -c 1459573 from trunk for HDFS-4607. In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459574 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:12:24 +00:00
Aaron Myers cbc30537d1 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/branches/branch-2@1459550 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 22:00:05 +00:00
Aaron Myers 92af1b7d8d 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/branches/branch-2@1459495 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 19:48:41 +00:00
Aaron Myers e25308f415 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/branches/branch-2@1458595 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-20 00:38:26 +00:00
Aaron Myers eb6a563194 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/branches/branch-2@1457883 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 17:26:45 +00:00
Aaron Myers 7a02bc2bac 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/branches/branch-2@1456633 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-14 20:05:49 +00:00
Aaron Myers 600af6a60f 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/branches/branch-2@1456585 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-14 18:17:56 +00:00
Daryn Sharp daa634aa00 svn merge -c 1456469 FIXES: 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/branches/branch-2@1456470 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-14 15:16:13 +00:00
Kihwal Lee 3a4e568e42 svn merge -c 1456172 Merging from trunk to branch-2 to fix HDFS-3344. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456176 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 22:00:15 +00:00
Aaron Myers b4716f96d2 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/branches/branch-2@1456109 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 19:56:03 +00:00
Suresh Srinivas 1ed2234b3d HDFS-4583. Merged 1456052 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456055 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 17:34:07 +00:00
Suresh Srinivas e81ffd1705 HDFS-4595. Merging 1456047 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456048 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 16:54:10 +00:00
Aaron Myers 35a933707f 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/branches/branch-2@1455783 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 03:01:19 +00:00
Aaron Myers 22a53efbbb 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/branches/branch-2@1455781 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 02:56:25 +00:00
Aaron Myers 92d306e303 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/branches/branch-2@1455778 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 02:34:08 +00:00
Suresh Srinivas 4b663fd69b HDFS-4013. Merge r1455754 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455756 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 23:38:18 +00:00
Kihwal Lee 95efc3d0fc svn merge -c 1454517 Merging from trunk to branch-2 to fix HDFS-4577. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454519 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 20:04:07 +00:00
Alejandro Abdelnur 50d493c89a 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/branches/branch-2@1454476 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 17:24:52 +00:00
Kihwal Lee 5a12614da7 svn merge -c 1454460. Merging from trunk to branch-2 to fix HDFS-4567. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454468 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 16:59:29 +00:00
Suresh Srinivas 4e38de7c95 HDFS-4569. Merge r1454233 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454236 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 04:01:17 +00:00
Suresh Srinivas 22cc69ee91 HDFS-4546. Merging 1r1454021 and r1454027 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454235 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 03:58:19 +00:00
Daryn Sharp 1fd01d8355 svn merge -c 1454059 FIXES: HDFS-4566. Webdhfs token cancelation should use authentication (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454064 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 20:00:36 +00:00
Daryn Sharp a3045acb37 svn merge -c 1453955 FIXES: HDFS-4560. Webhdfs cannot use tokens obtained by another user (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453956 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 16:58:12 +00:00
Arun Murthy 7808df2ed5 Preparing for 2.0.4-alpha bug-fix release. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453888 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 14:23:26 +00:00
Suresh Srinivas c21caa021d HDFS-4544. Merge 1453436 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453444 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 17:31:35 +00:00
Suresh Srinivas 54d7d46552 HDFS-4519. Merge change 1453050 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453051 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 22:39:43 +00:00
Suresh Srinivas 10f5644190 HDFS-4540. Merge 1453025 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453030 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 21:54:57 +00:00
Kihwal Lee 3c241b2494 svn merge -c 1452978 Merging from trunk to branch-2 to fix HDFS-4542. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452980 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 20:20:16 +00:00
Suresh Srinivas 3a3db918ff HDFS-4541. Merge 1452461 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452463 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 19:36:18 +00:00
Daryn Sharp b57b5cec27 svn merge -c 1452435 FIXES: HDFS-4532. RPC call queue may fill due to current user lookup (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452438 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 18:48:16 +00:00
Daryn Sharp 363d038e21 svn merge -c 1452384 FIXES: 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/branches/branch-2@1452388 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 16:48:24 +00:00
Suresh Srinivas a8dee7c237 HDFS-4518. Merge 1451348 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451387 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-28 22:08:26 +00:00
Aaron Myers 0c9ceb03b2 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/branches/branch-2@1449985 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 00:52:38 +00:00
Konstantin Boudnik 8f5c630a58 HDFS-4269. DatanodeManager#registerDatanode rejects all datanode registrations 
from localhost in single-node developer setup  (Contributed by Chris Nauroth)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449256 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-22 23:53:56 +00:00
Aaron Myers 90e4d62cec HDFS-4304. Make FSEditLogOp.MAX_OP_SIZE configurable. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449219 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-22 21:28:29 +00:00
Suresh Srinivas 9ce332ad39 HDFS-4222. Merge r1448801 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448805 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 21:09:17 +00:00
Uma Maheswara Rao G 975d24feb1 Merge 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/branches/branch-2@1448716 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 16:39:40 +00:00
Kihwal Lee 6beda592cc svn merge 1445964:1445965 from trunk to branch-2 to fix HDFS-4495. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445968 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 22:59:27 +00:00
Tsz-wo Sze 7ae27355bc svn merge -c 1445006 from trunk for HDFS-4342. Directories configured in dfs.namenode.edits.dir.required but not in dfs.namenode.edits.dir are silently ignored. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445007 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-12 00:50:46 +00:00