Commit Graph

1589 Commits

Author SHA1 Message Date
Jing Zhao 1b00e40a30 HDFS-5538. Merge change r1545491 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551692 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:45:27 +00:00
Andrew Wang e8b27cc5a2 HDFS-5350. Name Node should report fsimage transfer time as a metric. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551427 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 00:48:04 +00:00
Colin McCabe bbc30c2607 HDFS-5666. Fix inconsistent synchronization in BPOfferService (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551302 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 18:35:53 +00:00
Uma Maheswara Rao G 659cb9d9f7 HDFS-5592. statechangeLog of completeFile should be logged only in case of success. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551147 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 09:56:07 +00:00
Junping Du 888593c1dc Merge 1550620 from trunk: HDFS-5652. Refactor invalid block token exception handling in DFSInputStream. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550623 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 03:01:05 +00:00
Junping Du 059b0dffd5 Merge 1550335 from trunk: HDFS-5637. Try to refeatchToken while local read InvalidToken occurred. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550339 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 03:25:06 +00:00
Colin McCabe 36488a641a HDFS-4201. NPE in BPServiceActor#sendHeartBeat (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550268 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:30:07 +00:00
Jonathan Turner Eagles 52125d151d HDFS-5023. TestSnapshotPathINodes.testAllowSnapshot is failing with jdk7 (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550266 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:24:41 +00:00
Junping Du 29848761ea Merge 1550074 from trunk: HDFS-5580. Fix infinite loop in Balancer.waitForMoveCompletion. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550078 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 09:13:45 +00:00
Colin McCabe c9ad1bb3aa HADOOP-10020. disable symlinks temporarily (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550034 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:44:35 +00:00
Jing Zhao 4f7ae17602 Move HDFS-5283 to section branch-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550033 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:34:23 +00:00
Aaron Myers 8cc6fd847f Move entry for HDFS-5074 to correct section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550026 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:01:20 +00:00
Aaron Myers 75e97fc4bf 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/branches/branch-2@1550021 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:49:29 +00:00
Jing Zhao 39a506d5a0 Merge change r1550011 from trunk: 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/branches/branch-2@1550012 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:10:42 +00:00
Andrew Wang 507ce20d4f Move HDFS-4983 to 2.3 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549749 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 02:37:50 +00:00
Jing Zhao 6026982bcb HDFS-5353. Merge change r1548987 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548988 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:56:21 +00:00
Jing Zhao 1c1645d17f HDFS-4983. Merge change r1548968 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548972 13f79535-47bb-0310-9956-ffa450edef68
2013-12-07 21:23:24 +00:00
Jing Zhao 22b1584b87 HDFS-5590. Merge change r1548368 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548372 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 02:12:55 +00:00
Jing Zhao 6855f10a33 HDFS-5633. Merge change r1548359 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548361 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:33:18 +00:00
Daryn Sharp c90426e4d7 svn merge -c 1548161 FIXES: HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 15:35:48 +00:00
Brandon Li 9f2f36cadb HDFS-5587. Merging change r1548028 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548029 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 07:24:06 +00:00
Andrew Wang 6bb3b89bc9 Revert HDFS-4983
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547971 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 00:06:20 +00:00
Andrew Wang 54d167406d 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/branches/branch-2@1547940 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 22:34:52 +00:00
Colin McCabe faf8b3ff53 HDFS-4997. libhdfs does not return correct error code in most cases (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547639 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:16:55 +00:00
Kihwal Lee a5c36c322b svn merge -c 1547393 merging from trunk to branch-2 to fix: HDFS-5558. LeaseManager monitor thread can crash if the last block is complete but another block is not.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547395 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 14:14:53 +00:00
Kihwal Lee 2ea9cd4896 svn merge -c 1547173 merging from trunk to branch-2 to fix: HDFS-5557. Write pipeline recovery for the last packet in the block may cause rejection of valid replicas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547179 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 20:27:37 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
Arun Murthy f5dc7b0c6b 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/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +00:00
Colin McCabe b128742363 move HDFS-5581 to 2.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547093 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:40:27 +00:00
Colin McCabe d3f200bad0 HDFS-5581. NameNodeFsck should use only one instance of BlockPlacementPolicy (vinay via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547090 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:36:13 +00:00
Brandon Li db432fe76e HDFS-5563. Merging change r1546233 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546235 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 23:47:09 +00:00
Brandon Li c28ba9bc5d HDFS-5577. Merging change r1546210 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546217 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 22:35:14 +00:00
Uma Maheswara Rao G 25119a39c0 Merge HDFS-5568. Support includeSnapshots option with Fsck command. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545991 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 11:01:02 +00:00
Jing Zhao e65e4c8afa HDFS-5561. Merge change r1545791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545793 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 19:33:26 +00:00
Brandon Li 5aa5bad303 HDFS-5548. Merging change r1545756 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545759 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 18:19:34 +00:00
Jing Zhao 543db74645 HDFS-5533. Merge change r1545357 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545358 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 18:08:57 +00:00
Kihwal Lee 204a17c736 svn merge -c 1545322 merging from trunk to branch-2 to fix HDFS-5266. Datanode cannot roll back to previous layout version.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545324 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 15:36:39 +00:00
Jing Zhao 65c9af5538 HDFS-5552. Merge change r1544627 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544636 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:50:53 +00:00
Jing Zhao 08b96cc2a3 HDFS-5525. Merge change r1543895 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544635 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:49:07 +00:00
Jing Zhao addb9f1e22 HDFS-5444. Merge change r1541753 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544634 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:45:31 +00:00
Uma Maheswara Rao G 78af36bb07 Merge 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/branches/branch-2@1544598 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 16:14:37 +00:00
Brandon Li db3ed5df52 HDFS-5407. Merging change r1544362 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544378 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:59:22 +00:00
Brandon Li 90d5ecf92e HDFS-5288. Merging change r1544352 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544359 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 22:55:12 +00:00
Jing Zhao 2bba4969d1 HDFS-5532. Merge change r1544047 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544048 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 07:20:18 +00:00
Jing Zhao 7e10509fe4 HDFS-3987. Merge change r1543962 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543967 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:00:32 +00:00
Uma Maheswara Rao G 6e1234cbf4 Merge HDFS-5014. Process register commands with out holding BPOfferService lock. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543862 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 16:29:08 +00:00
Uma Maheswara Rao G b0bd967090 Merge 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/branches/branch-2@1543839 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 15:04:05 +00:00
Jonathan Turner Eagles dd889fc773 HDFS-1386. TestJMXGet fails in jdk7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543613 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:47:42 +00:00
Jing Zhao 918cf98cac HDFS-5428. Merge change r1543329 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543332 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:39:46 +00:00
Arpit Agarwal 0e9d89a70f HDFS-5073. Merging r1543303 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543304 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 04:11:33 +00:00