Commit Graph

2652 Commits

Author SHA1 Message Date
Jonathan Turner Eagles ed4d318d68 HDFS-5023. TestSnapshotPathINodes.testAllowSnapshot is failing with jdk7 (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550261 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:16:48 +00:00
Chris Nauroth 709040c52e HDFS-5650. Remove AclReadFlag and AclWriteFlag in FileSystem API. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550256 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 20:54:46 +00:00
Junping Du 327a995561 HDFS-5580. Fix infinite loop in Balancer.waitForMoveCompletion. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550074 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 08:51:12 +00:00
Jing Zhao 732975be82 Move HDFS-5283 to section branch-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550032 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:31:57 +00:00
Aaron Myers e408ef35e9 Move entry for HDFS-5074 to correct section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550027 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:01:54 +00:00
Aaron Myers 512a18a8d9 HDFS-5074. Allow starting up from an fsimage checkpoint in the middle of a segment. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550016 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:32:22 +00:00
Jing Zhao 87734ec939 Move HDFS-5257,HDFS-5427,HDFS-5443,HDFS-5476,HDFS-5425,HDFS-5474,HDFS-5504,HDFS-5428 into branch-2.3 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550011 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:09:13 +00:00
Arpit Agarwal f3cef1c673 Merging r1549626 through r1549948 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1549949 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 19:50:02 +00:00
Chris Nauroth b4d8aabe6b HDFS-5594. FileSystem API for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1549910 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 17:56:30 +00:00
Chris Nauroth aff5be250a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1549906 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 17:35:17 +00:00
Andrew Wang a0c911a7f9 Move HDFS-4983 to 2.3 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1549747 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 02:37:20 +00:00
Chris Nauroth a6313b1523 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1549699 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 22:52:02 +00:00
Jing Zhao 87a6db45b7 HDFS-5629. Support HTTPS in JournalNode and SecondaryNameNode. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1549692 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 21:58:47 +00:00
Arpit Agarwal 43c33491fc Merging r1548329 through r1549625 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1549626 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 17:38:20 +00:00
Jing Zhao 155020a6f4 HDFS-5353. Short circuit reads fail when dfs.encrypt.data.transfer is enabled. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548987 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:52:18 +00:00
Jing Zhao 91d0b47270 HDFS-4983. Numeric usernames do not work with WebHDFS FS. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548968 13f79535-47bb-0310-9956-ffa450edef68
2013-12-07 21:10:53 +00:00
Tsz-wo Sze 4c87a27ad8 HDFS-5554. Flatten INodeFile hierarchy: Replace INodeFileWithSnapshot with FileWithSnapshotFeature. Contributed by jing9
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548796 13f79535-47bb-0310-9956-ffa450edef68
2013-12-07 06:17:46 +00:00
Jing Zhao 045dc880e1 HDFS-5312. Generate HTTP/HTTPS URL in DFSUtil#getInfoServer() based on the configured http policy. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548629 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 18:01:58 +00:00
Chris Nauroth 7676641cca Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1548386 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 06:57:15 +00:00
Jing Zhao 9df84c35d5 HDFS-5590. Block ID and generation stamp may be reused when persistBlocks is set to false. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548368 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:55:13 +00:00
Jing Zhao 6b459506c3 HDFS-5633. Improve OfflineImageViewer to use less memory. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548359 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:30:22 +00:00
Arpit Agarwal 00718c2ffa Merging r1547658 through r1548328 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1548329 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 23:41:09 +00:00
Andrew Wang 55e5b0653c HDFS-5630. Hook up cache directive and pool usage statistics. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548309 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 21:09:30 +00:00
Daryn Sharp 99aed805f8 Neglected to add new file in HDFS-5514 (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548167 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 15:31:35 +00:00
Daryn Sharp 6828337d85 HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548161 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 15:28:12 +00:00
Brandon Li aa4fba6d92 HDFS-5587. add debug information when NFS fails to start with duplicate user or group names. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548028 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 07:13:21 +00:00
Colin McCabe 950e0644b7 HDFS-5626. dfsadmin report shows incorrect values (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548000 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 02:59:14 +00:00
Andrew Wang 859e425dfa Revert HDFS-4983
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547970 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 00:05:10 +00:00
Andrew Wang f5e83a0b3e HDFS-4983. Numeric usernames do not work with WebHDFS FS. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547935 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 22:24:45 +00:00
Jing Zhao d02baff9a0 HDFS-5536. Implement HTTP policy for Namenode and DataNode. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547925 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 21:40:57 +00:00
Colin McCabe f791e291ca HDFS-5555. CacheAdmin commands fail when first listed NameNode is in Standby (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547895 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 20:06:25 +00:00
Arpit Agarwal b7ce46887b Merging r1547474 through r1547657 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1547658 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 00:45:38 +00:00
Colin McCabe 61c45aae4d HDFS-4997. libhdfs does not return correct error code in most cases (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547637 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:13:02 +00:00
Chris Nauroth 1234f99521 HDFS-4685. Add CHANGES-HDFS-4685.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1547590 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 21:10:29 +00:00
Arpit Agarwal 674d51e62e Merging r1547121 through r1547473 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1547492 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 17:33:46 +00:00
Arpit Agarwal a1aa1836fb HDFS-5484. StorageType and State in DatanodeStorageInfo in NameNode is not accurate. (Contributed by Eric Sirianni)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1547462 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 16:30:29 +00:00
Kihwal Lee 7af12ab207 HDFS-5558. LeaseManager monitor thread can crash if the last block is complete but another block is not. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547393 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 14:12:43 +00:00
Kihwal Lee 38a04a3042 HDFS-5557. Write pipeline recovery for the last packet in the block may cause rejection of valid replicas. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547173 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 20:18:52 +00:00
Arun Murthy a4e473c6a9 Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547136 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:37:39 +00:00
Arpit Agarwal 18159be495 Merging r1544666 through r1547120 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1547122 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 17:41:44 +00:00
Colin McCabe 58f73acdc1 move HDFS-5581 to 2.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547094 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:40:52 +00:00
Colin McCabe 13331a6863 HDFS-5581. NameNodeFsck should use only one instance of BlockPlacementPolicy (vinay via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547088 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:31:03 +00:00
Andrew Wang 9da451cac5 HDFS-5430. Support TTL on CacheDirectives. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546301 13f79535-47bb-0310-9956-ffa450edef68
2013-11-28 07:20:21 +00:00
Andrew Wang bb11d47758 HDFS-5562. TestCacheDirectives and TestFsDatasetCache should stub out native mlock. Contributed by Colin Patrick McCabe and Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546246 13f79535-47bb-0310-9956-ffa450edef68
2013-11-28 00:44:54 +00:00
Brandon Li 5ea533c2bf HDFS-5563. NFS gateway should commit the buffered data when read request comes after write to the same file. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546233 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 23:41:15 +00:00
Brandon Li ec5c8a9865 HDFS-5577. NFS user guide update. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546210 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 22:07:37 +00:00
Tsz-wo Sze 8df119da21 HDFS-5537. Remove FileWithSnapshot interface. Contributed by jing9
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546184 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 20:32:16 +00:00
Jing Zhao 2214871d91 HDFS-5545. Allow specifying endpoints for listeners in HttpServer. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546151 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 18:20:14 +00:00
Colin McCabe 13edb391d0 HDFS-5556. Add some more NameNode cache statistics, cache pool stats (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546143 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 17:55:52 +00:00
Uma Maheswara Rao G b6d483b122 HDFS-5568. Support includeSnapshots option with Fsck command. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545987 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 10:59:54 +00:00
Colin McCabe 05a9a80bd4 HDFS-5565. CacheAdmin help should match against non-dashed commands (wang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545850 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 21:38:46 +00:00
Jing Zhao 740cf232bd HDFS-5561. FSNameSystem#getNameJournalStatus() in JMX should return plain text instead of HTML. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545791 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 19:28:09 +00:00
Tsz-wo Sze 82ff2d3f2e HDFS-5286. Flatten INodeDirectory hierarchy: Replace INodeDirectoryWithQuota with DirectoryWithQuotaFeature.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545768 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 18:33:22 +00:00
Brandon Li 4a1acfc96f HDFS-5548. Use ConcurrentHashMap in portmap. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545756 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 18:13:04 +00:00
Jing Zhao d8a2383461 HDFS-5538. URLConnectionFactory should pick up the SSL related configuration by default. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545491 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 01:16:51 +00:00
Jing Zhao eb3c1607b0 HDFS-5533. Symlink delete/create should be treated as DELETE/CREATE in snapshot diff report. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545357 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 18:05:36 +00:00
Kihwal Lee 65ee88b0de HDFS-5526. Datanode cannot roll back to previous layout version. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545322 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 15:33:52 +00:00
Arpit Agarwal 81211123d8 HDFS-5559. Fix TestDatanodeConfig in HDFS-2832. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544891 13f79535-47bb-0310-9956-ffa450edef68
2013-11-23 23:27:13 +00:00
Arpit Agarwal f48ea1b516 Merging r1544304 through r1544665 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544672 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 20:51:06 +00:00
Arpit Agarwal 97acde2d33 HDFS-5542. Fix TODO and clean up the code in HDFS-2832. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544664 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 20:07:10 +00:00
Jing Zhao 4ef4425825 Move HDFS-5444 and HDFS-5525 to branch 2.3.0 section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544631 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:30:28 +00:00
Jing Zhao 105a31e21d HDFS-5552. Fix wrong information of Cluster summay in dfshealth.html. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544627 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:23:42 +00:00
Uma Maheswara Rao G 8034d04c49 HDFS-5544. Adding Test case For Checking dfs.checksum.type as NULL value. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544596 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 16:11:26 +00:00
Tsz-wo Sze ce68f410b0 HDFS-5285. Flatten INodeFile hierarchy: Replace INodeFileUnderConstruction and INodeFileUnderConstructionWithSnapshot with FileUnderContructionFeature. Contributed by jing9
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544389 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 01:39:02 +00:00
Brandon Li 82d0e820d0 HDFS-5407. Fix typos in DFSClientCache. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544362 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:08:40 +00:00
Brandon Li a379a7bbb9 HDFS-5288. Close idle connections in portmap. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 22:43:55 +00:00
Arpit Agarwal b33ff7b5f2 HDFS-5547. Fix build break after merge from trunk to HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544342 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 22:07:46 +00:00
Colin McCabe 9863cb1905 HDFS-5543. Fix narrow race condition in TestPathBasedCacheRequests (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544310 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 20:15:07 +00:00
Arpit Agarwal 16f7fb80d9 Merging r1543902 through r1544303 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544306 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 20:06:09 +00:00
Colin McCabe f91a45a96c HDFS-5473. Consistent naming of user-visible caching classes and methods (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 17:12:58 +00:00
Jing Zhao 39950cee7f HDFS-5532. Enable the webhdfs by default to support new HDFS web UI. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544047 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 07:16:16 +00:00
Tsz-wo Sze 5f458ef23f HDFS-5531. Combine the getNsQuota() and getDsQuota() methods in INode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544018 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 03:17:47 +00:00
Jing Zhao 3cae2ba63f HDFS-3987. Support webhdfs over HTTPS. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543962 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 21:51:58 +00:00
Andrew Wang 916ab9286b HDFS-5451. Add byte and file statistics to PathBasedCacheEntry. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543958 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 21:31:41 +00:00
Arpit Agarwal 75747754d2 Merging r1543710 through r1543901 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543902 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 18:37:22 +00:00
Jing Zhao c131ae39fc HDFS-5525. Inline dust templates for new Web UI. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543895 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 18:17:41 +00:00
Arpit Agarwal 2d9692a36d HDFS-5527. Fix TestUnderReplicatedBlocks on branch HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543885 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 17:13:35 +00:00
Uma Maheswara Rao G 04cf2a768c HDFS-5014. Process register commands with out holding BPOfferService lock. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543861 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 16:27:28 +00:00
Uma Maheswara Rao G f26d2adbf9 HDFS-4516. Client crash after block allocation and NN switch before lease recovery for the same file can cause readers to fail forever. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543829 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 14:43:11 +00:00
Arpit Agarwal 59393e0162 Merging r1543613 through r1543709 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543710 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 05:31:02 +00:00
Colin McCabe efea68dc35 HDFS-5511. improve CacheManipulator interface to allow better unit testing (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543676 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:48:05 +00:00
Andrew Wang 00d9b8eedb HDFS-5513. CacheAdmin commands fail when using . as the path. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543670 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:29:59 +00:00
Jonathan Turner Eagles 587f68b160 HDFS-1386. TestJMXGet fails in jdk7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543612 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:44:13 +00:00
Arpit Agarwal 3c9cbc6893 Merging r1543111 through r1543509 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543510 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 17:26:23 +00:00
Jing Zhao aa002344d0 HDFS-5428. Under construction files deletion after snapshot+checkpoint+nn restart leads nn safemode. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543329 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:31:40 +00:00
Arpit Agarwal c3c626d32b HDFS-5073. TestListCorruptFileBlocks fails intermittently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543303 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 04:07:28 +00:00
Colin McCabe 70234e2213 HDFS-5512. CacheAdmin -listPools fails with NPE when user lacks permissions to view all pools (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543293 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 02:35:34 +00:00
Colin McCabe 4f15d0af4f HDFS-5520. loading cache path directives from edit log doesnt update nextEntryId (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543286 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 02:01:28 +00:00
Jing Zhao e68e3e429d HDFS-5393. Serve bootstrap and jQuery locally. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543248 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:37:54 +00:00
Arpit Agarwal bd5ab41a90 Merging r1542123 through r1543110 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543115 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 19:22:42 +00:00
Uma Maheswara Rao G e3d7ef36ef HDFS-5372. In FSNamesystem, hasReadLock() returns false if the current thread holds the write lock (Contributed by Vinay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542887 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 04:18:44 +00:00
Jing Zhao fef8f49c58 HDFS-5502. Fix HTTPS support in HsftpFileSystem. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542438 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 01:00:42 +00:00
Brandon Li a2200a6417 HDFS-5519. COMMIT handler should update the commit status after sync. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542437 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 00:57:26 +00:00
Arpit Agarwal cd768489f3 HDFS-5515. Fix TestDFSStartupVersions for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1542176 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 05:21:58 +00:00
Jing Zhao 620890fcc0 HDFS-5489. Use TokenAspect in WebHDFSFileSystem. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 02:11:38 +00:00
Arpit Agarwal 132a8ff7c7 Merging r1541618 through r1542122 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1542125 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 23:56:56 +00:00
Kihwal Lee ceea91c9cd HDFS-5438. Flaws in block report processing can cause data loss. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542054 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 20:11:50 +00:00
Jing Zhao 43fa41fdee HDFS-5506. Use URLConnectionFactory in DelegationTokenFetcher. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542011 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 18:40:36 +00:00
Arpit Agarwal ea1c5ea086 HDFS-5510. Fix a findbug warning in DataStorage.java on HDFS-2832 branch. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1542006 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 18:16:02 +00:00
Kihwal Lee fe67e30bc2 HDFS-4995. Make getContentSummary less expensive. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541971 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 16:49:31 +00:00
Jing Zhao b771197ed5 HDFS-5487. Introduce unit test for TokenAspect. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541776 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:14:38 +00:00
Jing Zhao 735aae32e4 HDFS-5504. In HA mode, OP_DELETE_SNAPSHOT is not decrementing the safemode threshold, leads to NN safemode. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541773 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:03:34 +00:00
Jing Zhao de9271686a HDFS-5444. Choose default web UI based on browser capabilities. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541753 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 22:57:53 +00:00
Jing Zhao f22b512203 Move HDFS-5325 and HDFS-5488 from BUG-FIX to IMPROVEMENT in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541718 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:10:22 +00:00
Steve Loughran 1a38b48026 HDFS-5075 httpfs-config.sh calls out incorrect env script name
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541692 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:19:41 +00:00
Jing Zhao ced740e580 HDFS-5474. Deletesnapshot can make Namenode in safemode on NN restarts. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541685 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:59:55 +00:00
Jing Zhao 1c211f6749 HDFS-5440. Extract the logic of handling delegation tokens in HftpFileSystem to the TokenAspect class. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541665 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:25:09 +00:00
Colin McCabe 3c591aa442 HDFS-5366. recaching improvements (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541647 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 18:18:37 +00:00
Arpit Agarwal bf9f8511fa Merging r1541342 through r1541617 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541620 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 17:15:36 +00:00
Colin McCabe 39def49661 HDFS-5485. add command-line support for modifyDirective (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541377 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 03:29:02 +00:00
Arpit Agarwal d06a782c1e HDFS-5501. Fix pendingReceivedRequests tracking in BPServiceActor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541371 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 02:59:46 +00:00
Arpit Agarwal 46cbce9af1 HDFS-5508. Fix compilation error after merge. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 02:00:41 +00:00
Tsz-wo Sze ba98e8f737 merge r1535792 through r1541341 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541342 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:14:37 +00:00
Andrew Wang 9d06631719 HDFS-5450. better API for getting the cached blocks locations. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541338 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 00:31:55 +00:00
Colin McCabe ce35e0950c HDFS-5471. CacheAdmin -listPools fails when user lacks permissions to view all pools (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541323 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 23:52:23 +00:00
Jing Zhao 8162fdcdbc HDFS-5425. Renaming underconstruction file with snapshots can make NN failure on restart. Contributed by Vinay and Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541261 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 22:10:09 +00:00
Arpit Agarwal e5b3171c3b HDFS-5494. Fix findbugs warnings for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540924 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:36:24 +00:00
Andrew Wang 455269cf9f Move HDFS-5495 to 2.3.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540917 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:06:21 +00:00
Andrew Wang 646fcc8a56 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540914 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 01:56:56 +00:00
Arpit Agarwal ec5eebc450 Merging r1540548 through r1540909 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540910 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 01:16:10 +00:00
Arpit Agarwal 26f2bd67f2 HDFS-5491. Update editsStored for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540903 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:48:55 +00:00
Jing Zhao f10642a8fd HDFS-5488. Clean up TestHftpURLTimeout. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540894 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:21:57 +00:00
Andrew Wang 2b3e1abcda HDFS-5467. Remove tab characters in hdfs-default.xml. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540816 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:25:47 +00:00
Andrew Wang 9673baa7e8 HDFS-5320. Add datanode caching metrics. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540796 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 18:30:07 +00:00
Arpit Agarwal a161ff8f09 HDFS-5486. Fix TestNameNodeMetrics for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540619 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 06:40:06 +00:00
Arpit Agarwal bb5bd30df6 Merging r1540239 through r1540547 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540549 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 21:01:12 +00:00
Arpit Agarwal 907fb15ee8 HDFS-5480. Update Balancer for HDFS-2832. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540547 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 20:59:32 +00:00
Brandon Li ec9ec0084e HDFS-5469. Add configuration property for the sub-directroy export path. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540443 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 04:07:39 +00:00
Chris Nauroth 25ebe6bfd7 HDFS-5482. DistributedFileSystem#listPathBasedCacheDirectives must support relative paths. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540257 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 05:54:19 +00:00
Tsz-wo Sze fccbb5072c merge of r1535792 through r1540238 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540239 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:34:22 +00:00
Jing Zhao 37bc8e0c14 HDFS-5325. Remove WebHdfsFileSystem#ConnRunner. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540235 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:19:54 +00:00
Arpit Agarwal 90d1b1b6a4 HDFS-5481. Fix TestDataNodeVolumeFailure in branch HDFS-2832. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540228 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 00:19:48 +00:00
Jing Zhao a4bc1a6218 HDFS-5371. Let client retry the same NN when dfs.client.test.drop.namenode.response.number is enabled. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540197 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:39:58 +00:00
Jing Zhao f2ad787a27 HDFS-5476. Snapshot: clean the blocks/files/directories under a renamed file/directory while deletion. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540142 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 18:18:03 +00:00
Colin McCabe 97199baea1 HDFS-5394: Fix race conditions in DN caching and uncaching (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539909 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 03:00:19 +00:00
Arpit Agarwal 6b0611ed24 Merging r1539737 through r1539896 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539898 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:44:24 +00:00
Arpit Agarwal 06d24efed0 HDFS-5475. NN incorrectly tracks more than one replica per DN.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539890 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:01:18 +00:00
Colin McCabe f79b3e6b17 HDFS-5326. add modifyDirective to cacheAdmin (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539839 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 22:07:16 +00:00
Brandon Li 3fccdec6e0 HDFS-5364. Add OpenFileCtx cache. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539834 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 21:49:13 +00:00
Colin McCabe 77afc605fd HDFS-5468. CacheAdmin help command does not recognize commands (Stephen Chu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539786 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 19:58:52 +00:00
Jing Zhao 9964a94386 HDFS-5443. Delete 0-sized block when deleting an under-construction file that is included in snapshot. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539754 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:37:38 +00:00
Brandon Li 16c6755554 HDFS-5252. Stable write is not handled correctly in someplace. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539740 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:02:37 +00:00
Arpit Agarwal a604e3b73b HDFS-5472. Fix TestDatanodeManager, TestSafeMode and TestNNThroughputBenchmark. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539736 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 17:57:30 +00:00
Tsz-wo Sze 75777f1626 HDFS-5470. Add back trunk's reportDiff algorithm to the branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539504 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 00:13:05 +00:00
Arpit Agarwal fa5ba6d977 HDFS-5439. Fix TestPendingReplication. (Contributed by Junping Du, Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539247 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 06:50:33 +00:00
Arpit Agarwal 103fd6c6d8 Merging r1538408 through r1539244 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539245 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 06:14:13 +00:00
Arpit Agarwal 3e3fea7cd4 HDFS-5466. Update storage IDs when the pipeline is updated. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539203 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 00:25:10 +00:00
Andrew Wang 8639ecb26d HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539091 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:27:00 +00:00
Jing Zhao a6250a4943 HDFS-5427. Not able to read deleted files from snapshot directly under snapshottable dir after checkpoint and NN restart. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538875 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:38:50 +00:00
Chris Nauroth c47b3d7502 HDFS-5456. NameNode startup progress creates new steps if caller attempts to create a counter for a step that doesn't already exist. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538872 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:04:07 +00:00
Arpit Agarwal d2b7b6589d HDFS-5457. Fix TestDatanodeRegistration, TestFsck and TestAddBlockRetry. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538794 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 22:49:00 +00:00
Arpit Agarwal 1d357365b7 HDFS-5455. NN should update storageMap on first heartbeat.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538787 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 21:47:51 +00:00
Arpit Agarwal 0091606e2d HDFS-5448. Fix break caused by previous checkin for HDFS-5448.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538655 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 16:00:12 +00:00
Arpit Agarwal 9660bfa84c HDFS-5448. Datanode should generate its ID on first registration
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538496 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 02:13:04 +00:00
Tsz-wo Sze 7e46025f91 Merge r1537584 through r1538407 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538408 13f79535-47bb-0310-9956-ffa450edef68
2013-11-03 17:51:52 +00:00
Tsz-wo Sze 26a1fda51e HDFS-5452. Fix TestReplicationPolicy and TestBlocksScheduledCounter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538407 13f79535-47bb-0310-9956-ffa450edef68
2013-11-03 17:49:08 +00:00
Colin McCabe 7abf7e8151 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538248 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:42:27 +00:00
Uma Maheswara Rao G 833da65d86 HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538156 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 09:02:35 +00:00
Arpit Agarwal cbdeba29bd HDFS-5447. Fix TestJspHelper in branch HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538145 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 05:21:48 +00:00
Andrew Wang f607a8ddff Move HDFS-5035 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538124 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 01:08:26 +00:00
Andrew Wang 3b91b7dece HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538059 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 20:49:54 +00:00
Arpit Agarwal a891076159 Merging r1537252 through r1537583 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537584 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 18:49:54 +00:00
Arpit Agarwal 2af5083a35 HDFS-5437. Fix TestBlockReport and TestBPOfferService failures.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537365 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 02:32:25 +00:00
Chris Nauroth e42b17950e HDFS-4633. Change attribution in CHANGES.txt to version 2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537345 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 23:43:40 +00:00
Chris Nauroth ff549faea0 HDFS-5065. Change attribution in CHANGES.txt to version 2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537319 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:51:57 +00:00
Arpit Agarwal 4eebf56ccf Merging r1536890 through r1537251 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537252 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 19:28:44 +00:00
Chris Nauroth 6aeaef9276 HDFS-5386. Add feature documentation for datanode caching. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537243 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 19:01:13 +00:00
Chris Nauroth 9c29b86cab HDFS-5432. TestDatanodeJsp fails on Windows due to assumption that loopback address resolves to host name localhost. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537230 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 18:37:48 +00:00
Andrew Wang 75a162ff92 HDFS-5433. When reloading fsimage during checkpointing, we should clear existing snapshottable directories. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537192 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 17:27:51 +00:00
Arpit Agarwal 68a79b0d3f HDFS-5436. Move HsFtpFileSystem and HFtpFileSystem into org.apache.hdfs.web. (Contributed by Haohui Mai)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536921 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:44:34 +00:00
Arpit Agarwal 73cf16ce48 Merging r1536573 through r1536889 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:05:15 +00:00
Arpit Agarwal c2495a7bff Merging r1536572 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536889 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:04:31 +00:00
Colin McCabe 0ac867c9eb move HDFS-4657 to branch-2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:02:14 +00:00
Arpit Agarwal 16359ec2c7 Merging r1536182 through r1536558 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536801 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 16:44:53 +00:00
Colin McCabe 1b48f44feb Merge HDFS-4949 branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 00:49:20 +00:00
Chris Nauroth a2d81e3017 HDFS-5413. hdfs.cmd does not support passthrough to any arbitrary class. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536448 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:57:00 +00:00
Arpit Agarwal dc0b44a884 HDFS-5435. File append fails to initialize storageIDs. (Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536434 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:29:06 +00:00
Arpit Agarwal 67b93d6e25 Merging r1535792 through r1536181 from trunk to HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536182 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 18:43:58 +00:00
Arpit Agarwal b9d561c548 HDFS-5214. Fix NPEs in BlockManager and DirectoryScanner.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536179 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 18:29:49 +00:00
Jing Zhao 5829029154 HDFS-5257. addBlock() retry should return LocatedBlock with locations else client will get AIOBE. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535811 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 18:43:06 +00:00
Tsz-wo Sze 9043a92219 Merge r1535533 through r1535791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535792 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 17:23:11 +00:00
Tsz-wo Sze ec01db59ce HDFS-5417. Fix storage IDs in PBHelper and UpgradeUtilities.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535791 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 17:21:49 +00:00
Andrew Wang 83609cd7fb merge trunk to hdfs-4949 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535608 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 01:56:56 +00:00
Andrew Wang dc2ee20aec HDFS-5419. Fixup test-patch.sh warnings on HDFS-4949 branch. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535607 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 01:56:05 +00:00
Brandon Li 05f35518f1 HDFS-5171. NFS should create input stream for a file and try to share it with multiple read requests. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535586 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:40:34 +00:00
Andrew Wang e87b2a3684 merge trunk into HDFS-4949 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535563 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 21:38:25 +00:00
Arpit Agarwal 1fcc24d56a Merging r1535122 through r1535532 from trunk to HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535534 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 20:33:04 +00:00
Andrew Wang 222dbfe2ce HDFS-5405. Fix possible RetryCache hang for caching RPC handlers in FSNamesystem. (Contributed by Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535282 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 05:40:28 +00:00
Andrew Wang 4004a42d53 HDFS-5404 Resolve regressions in Windows compatibility on HDFS-4949 branch. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535217 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 00:08:15 +00:00
Kihwal Lee bf3271bd2b HDFS-5341. Reduce fsdataset lock duration during directory scanning. Contributed by Qus-Jiawei.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535188 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:29:51 +00:00
Jing Zhao 1387fb1394 HDFS-5363. Refactor WebHdfsFileSystem: move SPENGO-authenticated connection creation to URLConnectionFactory. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535169 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 20:48:25 +00:00
Arpit Agarwal f39f8c5734 HDFS-5401. Fix NPE in Directory Scanner.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535158 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 20:28:54 +00:00
Tsz-wo Sze b442fe92fb Merge r1534894 through r1535121 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535122 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 19:00:35 +00:00
Aaron Myers 82ed72d1d4 HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535056 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 15:15:29 +00:00
Arpit Agarwal 01f37e42f0 HDFS-5390. Send one incremental block report per storage directory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534891 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:28:48 +00:00
Arpit Agarwal b884af72c5 HDFS-5398. NameNode changes to process storage reports per storage directory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534847 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:29:40 +00:00
Arpit Agarwal ef17685f79 Merging r1534279 through r1534706 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534707 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 17:24:52 +00:00
Colin McCabe d45ca49e3d HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534655 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 15:10:17 +00:00
Arpit Agarwal 0ebab3a88a HDFS-5377. Heartbeats from Datandode should include one storage report per storage directory
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534464 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 02:22:17 +00:00
Tsz-wo Sze df87ed34f2 HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534426 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:20:39 +00:00
Tsz-wo Sze 40fec97bef svn merge -c -1534417 . for reverting HDFS-4885, which should be committed to trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534424 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:19:04 +00:00
Tsz-wo Sze 12ed24af66 HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534417 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 23:48:08 +00:00
Brandon Li 4380e480ce HDFS-5347. Add HDFS NFS user guide. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534377 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:15:20 +00:00
Jing Zhao fc99f3e8a3 HDFS-5382. Implement the UI of browsing filesystems in HTML 5 page. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534368 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 20:42:13 +00:00
Colin McCabe 69e5f90e9f HDFS-5385. Caching RPCs are AtMostOnce, but do not persist client ID and call ID to edit log. (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1534345 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 19:42:35 +00:00
Colin McCabe f9c08d02eb HDFS-5378. In CacheReport, don't send genstamp and length on the wire (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1534334 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 19:29:46 +00:00
Arpit Agarwal 62f95b003b Merging r1533208 through r1534278 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534279 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 17:11:34 +00:00
Uma Maheswara Rao G 7fd9148800 HDFS-5331 make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533917 13f79535-47bb-0310-9956-ffa450edef68
2013-10-20 15:23:10 +00:00
Colin McCabe d61af97810 HDFS-5203. Concurrent clients that add a cache directive on the same path may prematurely uncache each other. (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533651 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 22:15:26 +00:00
Colin McCabe 1d96e36013 HDFS-5388. Loading fsimage fails to find cache pools during namenode startup (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533616 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:20:20 +00:00
Chris Nauroth f3043374ff HDFS-5365. Move attribution to 2.2.1 in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533574 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 18:13:55 +00:00
Chris Nauroth 4d5a66f4b0 HDFS-5365. Fix libhdfs compile error on FreeBSD9. Contributed by Radim Kolar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533283 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 23:05:44 +00:00
Jonathan Turner Eagles a19b956975 HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533270 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 21:49:30 +00:00
Suresh Srinivas 631ccbdd20 HDFS-5374. Remove deadcode in DFSOutputStream. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533258 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:47:31 +00:00
Andrew Wang dcb0b85333 HDFS-5383. fix broken caching unit tests (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533253 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:31:13 +00:00
Arpit Agarwal f8d5755a69 Merging r1532911 through r1533207 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1533208 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:54:53 +00:00
Chris Nauroth 1fde8bcc85 HDFS-5336. DataNode should not output StartupProgress metrics. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533183 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:06:01 +00:00
Jing Zhao 9d24715a89 HDFS-5379. Update links to datanode information in dfshealth.html. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533181 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:58:27 +00:00
Chris Nauroth c4e57ee4c3 HDFS-5375. hdfs.cmd does not expose several snapshot commands. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533165 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:14:11 +00:00
Andrew Wang 34f08944b7 merge trunk to branch HDFS-4949
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532952 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 02:14:33 +00:00
Jing Zhao 909ab360c0 HDFS-5334. Implement dfshealth.jsp in HTML pages. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532949 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 01:31:33 +00:00
Andrew Wang 76c49b6e95 Move HDFS-5360 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532935 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:13:50 +00:00
Tsz-wo Sze 1ba58e2e2c HDFS-4376. Fix race conditions in Balancer. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532932 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:06:00 +00:00
Andrew Wang e432b4fe5e HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532930 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:59:51 +00:00
Jonathan Turner Eagles b838776163 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532928 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:42:12 +00:00
Colin McCabe 40c97caf19 add missing file for HDFS-5096
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532925 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:15:47 +00:00
Colin McCabe 3cc7a38a53 HDFS-5096. Automatically cache new data added to a cached path (contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532924 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:15:33 +00:00
Kihwal Lee a0fc90ea92 HDFS-5346. Avoid unnecessary call to getNumLiveDataNodes() for each block during IBR processing. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532915 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:14:28 +00:00
Arpit Agarwal a6076adbef Merging r1532877 through r1532910 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1532913 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:12:17 +00:00
Arpit Agarwal 168b133337 Merging r1527684 through r1532876 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1532910 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:07:28 +00:00
Suresh Srinivas dea1b2e84a HADOOP-10005. No need to check INFO severity level is enabled or not. Contributed by Jackie Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532907 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:00:07 +00:00
Suresh Srinivas f28f5ed628 HDFS-5370. Typo in Error Message: different between range in condition and range in error message. Contributed by Kousuke Saruta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:45:03 +00:00
Chris Nauroth 8da82eba1c HDFS-5373. hdfs cacheadmin -addDirective short usage does not mention -replication parameter. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532888 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:23:14 +00:00
Chris Nauroth 2cf5084c32 HDFS-5358: Add updated editsStored file for tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532863 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:58:38 +00:00
Tsz-wo Sze c46525ef27 Add TestOpenFilesWithSnapshot.java for HDFS-5283.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532860 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:44:21 +00:00
Tsz-wo Sze ffe347151e HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532857 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:38:31 +00:00
Jing Zhao 2145486ea9 HDFS-5130. Add test for snapshot related FsShell and DFSAdmin commands. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532580 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 22:45:08 +00:00
Brandon Li a9befa6f0a HDFS-5330. fix readdir and readdirplus for large directories. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532539 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:23:00 +00:00
Tsz-wo Sze 0a5f0efcb4 HDFS-5338. Add a conf to disable hostname check in datanode registration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532468 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:21:22 +00:00
Jing Zhao 258c181ade HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. Contributed by Ted Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532158 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 01:17:21 +00:00
Andrew Wang af89caf9e4 HDFS-5359. Allow LightWeightGSet#Iterator to remove elements. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 00:19:48 +00:00
Andrew Wang efe545b0c2 HDFS-5358. Add replication field to PathBasedCacheDirective. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532124 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 22:56:11 +00:00
Colin McCabe 15d08c4778 HDFS-5349. DNA_CACHE and DNA_UNCACHE should be by blockId only (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532116 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 22:19:10 +00:00
Jing Zhao cf0cf0a691 HDFS-5342. Provide more information in the FSNamesystem JMX interfaces. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532090 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 20:56:37 +00:00
Chris Nauroth 11716cf390 HADOOP-10040. Revert svn propset for CRLF line endings on Windows files. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531977 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:01:33 +00:00
Brandon Li 7cd044b1aa HDFS-5329. Update FSNamesystem#getListing() to handle inode path in startAfter token. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531617 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 04:28:49 +00:00
Luke Lu 0840906699 Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531500 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:54:58 +00:00
Chris Nauroth bbac0cf05e HADOOP-10040. hadoop.cmd in UNIX format and would not run by default on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531491 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:14:24 +00:00
Andrew Wang 09e9e57a0b HDFS-5348. Fix error message when dfs.datanode.max.locked.memory is improperly configured. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1531460 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 23:13:13 +00:00
Jing Zhao f7eaacc103 HDFS-5322. HDFS delegation token not found in cache errors seen on secure HA clusters. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531436 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:49:01 +00:00
Chris Nauroth 8111c3af6b HDFS-5224. Refactor PathBasedCache* methods to use a Path rather than a String. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1531406 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 19:44:20 +00:00
Luke Lu 1d07c5cf17 Move HDFS-5276 to 2.3.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531228 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:31:34 +00:00
Luke Lu d0aaa5ba9f HDFS-5276. Remove volatile from LightWeightHashSet. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531225 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:29:06 +00:00
Suresh Srinivas f2f5cdb555 HDFS-5335. Hive query failed with possible race in dfs output stream. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531152 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 23:58:08 +00:00
Brandon Li 7429debd86 HDFS-5337. should do hsync for a commit request even there is no pending writes. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530835 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 00:52:54 +00:00
Colin McCabe b8ae4e2a8e HDFS-5323. Remove some deadcode in BlockManager (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530814 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:27:27 +00:00
Andrew Wang 3fc8792b5c HDFS-5304. Expose if a block replica is cached in getFileBlockLocations. (Contributed by Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530802 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 21:30:08 +00:00
Kihwal Lee f6a2cac321 HDFS-4510. Cover classes ClusterJspHelper/NamenodeJspHelper with unit tests. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530669 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:33 +00:00
Daryn Sharp b858b812b7 HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530667 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:09:37 +00:00
Brandon Li 5c02d2f622 HDFS-5281. COMMIT request should not block. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530461 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 23:40:21 +00:00
Andrew Wang 54801ba4f9 Addenum for HDFS-5309, update binary edits again
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530410 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 20:01:48 +00:00
Brandon Li 09998741ac HDFS-5316. Namenode ignores the default https port. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530150 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 04:26:01 +00:00
Arun Murthy 418773f44e Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530128 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:03:29 +00:00
Brandon Li 61c1dd96c3 HDFS-5317. Go back to DFS Home link does not work on datanode webUI. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530114 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:07:12 +00:00
Jing Zhao 1fe1942328 HDFS-5291. Standby namenode after transition to active goes into safemode. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530112 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 23:58:44 +00:00
Colin McCabe b60e18db74 HDFS-5314. Do not expose CachePool type in AddCachePoolOp (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530073 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 21:26:01 +00:00
Brandon Li 267a606831 HDFS-5307. Support both HTTP and HTTPS in jsp pages. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530027 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 19:02:55 +00:00
Arun Murthy b8f1cf3192 HDFS-4817. Moving changelog to Release 2.2.0 section to reflect the backport.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529751 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:30:18 +00:00
Arun Murthy 43c7a834dc Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529750 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:17:00 +00:00
Brandon Li caa4abd30c HDFS-5259. Support client which combines appended data with old data before sends it to NFS server. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529730 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 02:57:24 +00:00
Jing Zhao 7317e97bd7 HDFS-5299. DFS client hangs in updatePipeline RPC when failover happened. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529660 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:39:03 +00:00
Andrew Wang 633b693517 HDFS-5309. Fix failing caching unit tests. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1529646 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 17:06:03 +00:00
Jing Zhao cb5a51565a HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp from a secured cluster to an insecured cluster. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529571 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 06:15:31 +00:00
Brandon Li 8e08046661 HDFS-5306. Datanode https port is not available at the namenode. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529562 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 03:22:57 +00:00
Jing Zhao cae1ed9f6c HDFS-5308. Replace HttpConfig#getSchemePrefix with implicit schemes in HDFS JSP. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529512 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 20:40:48 +00:00
Andrew Wang eb2175db1a HDFS-5190. Move cache pool related CLI commands to CacheAdmin. (Contributed by Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1529334 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 22:28:23 +00:00
Jing Zhao 3c1f18de43 HDFS-5300. FSNameSystem#deleteSnapshot() should not check owner in case of permissions disabled. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529294 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:54:06 +00:00
Andrew Wang af1ac9a5e8 HDFS-5119. Persist CacheManager state in the edit log. (Contributed by Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1529238 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 17:46:18 +00:00
Aaron Myers 65a55f2294 HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes spurious test failure. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528693 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 00:38:00 +00:00
Chris Nauroth fc5bd930df HDFS-5279. Guard against NullPointerException in NameNode JSP pages before initialization of FSNamesystem. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528308 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 05:25:18 +00:00
Suresh Srinivas 703838c598 HADOOP-10012. Secure Oozie jobs fail with delegation token renewal exception in Namenode HA setup. Contributed by Daryn Sharp and Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528301 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 04:00:06 +00:00
Arpit Agarwal b99d160437 HDFS-5255. Distcp job fails with hsftp when https is enabled in insecure cluster.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528279 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:03:15 +00:00
Kihwal Lee 4fe912df9c HDFS-4512. Cover package org.apache.hadoop.hdfs.server.common with tests. Contributed by Vadim Bondarev.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528097 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 14:02:19 +00:00
Kihwal Lee 6d5577fe7b HDFS-4517. Cover class RemoteBlockReader with unit tests. Contributed by Vadim Bondarev and Dennis Y.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527807 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:31:00 +00:00
Brandon Li 25cdbdb71a HDFS-5230. Introduce RpcInfo to decouple XDR classes from the RPC API. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527726 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:21:17 +00:00
Arpit Agarwal 6331ff024c Merging r1526971 through r1527683 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1527697 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 18:28:07 +00:00
Brandon Li e4154fc83a HDFS-5256. Use guava LoadingCache to implement DFSClientCache. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527452 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 06:06:06 +00:00
Chris Nauroth eccdb9aa8b HDFS-5260. Merge zero-copy memory-mapped HDFS client reads to trunk and branch-2. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527113 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 22:51:12 +00:00
Jing Zhao b2e174c9a5 HDFS-5265. Namenode fails to start when dfs.https.port is unspecified. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527093 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:45:00 +00:00
Brandon Li 027419832c HDFS-5268. NFS write commit verifier is not set in a few places. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527087 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:28:06 +00:00
Arpit Agarwal 46099ce7f1 HDFS-4988. Datanode must support all the volumes as individual storages.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1526969 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 16:05:39 +00:00
Arpit Agarwal 8062d8c239 Merging r1526366 through r1526708 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1526717 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 21:49:18 +00:00
Chris Nauroth 8f17d64527 HDFS-5266. ElasticByteBufferPool#Key does not implement equals. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1526671 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:30:14 +00:00
Chris Nauroth ae501ceeb7 HDFS-5186. TestFileJournalManager fails on Windows due to file handle leaks. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526615 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:33:07 +00:00
Chris Nauroth 269eb42b2f HDFS-5258. Skip tests in TestHDFSCLI that are not applicable on Windows. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526610 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:23:16 +00:00
Colin McCabe 8a66e493ba HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526567 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:30 +00:00
Brandon Li f2e6091bb2 HDFS-5041. Add the time of last heartbeat to dead server Web UI. Contributed by Shinichi Yamashita
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526368 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:11:12 +00:00
Arpit Agarwal 77856140f4 Merging r1525759 through r1526365 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1526366 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 03:41:09 +00:00
Brandon Li 3582026204 HDFS-5246. Make Hadoop nfs server port and mount daemon port configurable. Contributed by Jinghui Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526316 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 21:59:35 +00:00
Colin McCabe 464470e715 HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526297 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:51:09 +00:00