Commit Graph

1614 Commits

Author SHA1 Message Date
Arpit Agarwal 1ec54d9532 HDFS-5406. Update CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556085 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:31:04 +00:00
Arpit Agarwal a7417a0af9 HDFS-5406. Merge r1551093 and r1551110 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556084 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:29:44 +00:00
Arpit Agarwal fe95f9a81f HDFS-5454. Merge r1551296 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556083 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:26:06 +00:00
Arpit Agarwal 4f044fc5ff HDFS-2832. Merge r1550363 from trunk for merging HDFS Heterogeneous Storage feature phase 1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556076 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 23:58:33 +00:00
Colin McCabe 5745523e98 HDFS-5220 Expose group resolution time as metric (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555986 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:30:13 +00:00
Jing Zhao 1d6d0b823f HDFS-5695. Merge change r1555164 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555166 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 17:47:26 +00:00
Uma Maheswara Rao G 1df8cb9ce0 Merge. HDFS-5671. Fix socket leak in DFSInputStream#getBlockReader. Contributed by JamesLi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554556 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 16:26:48 +00:00
Colin McCabe aa78eefe38 HDFS-5582. hdfs getconf -excludeFile or -includeFile always failed (satish via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554297 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 19:36:26 +00:00
Konstantin Shvachko fda1b24acf HDFS-5675. Add Mkdirs operation to NNThroughputBenchmark. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554074 13f79535-47bb-0310-9956-ffa450edef68
2013-12-29 21:28:27 +00:00
Jing Zhao 60f8b513f1 HDFS-5690. Merge change r1553167 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 18:28:09 +00:00
Suresh Srinivas 82ce19829d HDFS-5691. Merge 1552802 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552803 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 20:09:21 +00:00
Kihwal Lee 9c0060ead8 svn merge -c 1552711 merging from trunk to branch-2 to fix HDFS-5681. renewLease should not hold fsn write lock.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552713 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 16:07:02 +00:00
Junping Du 35dda73fba Merge 1552256 from trunk: HDFS-5540. Fix intermittent failure in TestBlocksWithNotEnoughRacks. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552278 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 10:10:24 +00:00
Michael Stack 3d22b5fd40 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552236 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 06:14:13 +00:00
Michael Stack 4f5cac8601 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552235 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 06:05:43 +00:00
Jing Zhao 8dbe8d2165 HDFS-5661. Merge change r1552177 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552180 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 00:31:25 +00:00
Colin McCabe 2ebc126b9e HDFS-5676. fix inconsistent synchronization of CachingStrategy (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552164 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 23:30:08 +00:00
Brandon Li 48a9215359 HDFS-5662. Merging change r1552131 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552135 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 22:36:21 +00:00
Colin McCabe d6f80a1ce8 HDFS-5634. Allow BlockReaderLocal to switch between checksumming and not (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552119 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 21:55:38 +00:00
Tsz-wo Sze 165c6cb1d3 svn merge -c 1551812 from trunk for HDFS-5674. Editlog code cleanup: remove @SuppressWarnings("deprecation") in FSEditLogOp; change FSEditLogOpCodes.fromByte(..) to be more efficient; and change Some fields in FSEditLog to final.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551813 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 02:50:01 +00:00
Jing Zhao 7a3ac36ede HDFS-5629. Merge change r1549692 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551723 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:31:12 +00:00
Jing Zhao 246e9cb136 HDFS-5312. Merge change r1548629 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551721 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:25:05 +00:00
Jing Zhao b19b529f38 HDFS-5536. Merge change r1547925 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551715 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:18:38 +00:00
Brandon Li c143486c17 HDFS-5657. Merging change r1551691 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551705 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:01:33 +00:00
Jing Zhao 88d09130e8 HDFS-5545. Merge change r1546151 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
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