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

2875 Commits

Author SHA1 Message Date
Chris Nauroth b1f87bbabd HDFS-5986. Capture the number of blocks pending deletion on namenode webUI. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575384 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 19:37:15 +00:00
Chris Nauroth b55c1aab7b HDFS-6069. Quash stack traces when ACLs are disabled. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575184 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 06:06:12 +00:00
Chris Nauroth 12711177d3 HDFS-6063. TestAclCLI fails intermittently when running test 24: copyFromLocal. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575171 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 05:44:57 +00:00
Colin McCabe 173c115951 HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575109 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 01:18:32 +00:00
Colin McCabe 591be56052 HDFS-6067. TestPread.testMaxOutHedgedReadPool is flaky (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575100 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 23:48:23 +00:00
Haohui Mai 90b1e25c7f HDFS-6084. DFSConfigKeys.DFS_BLOCKREPORT_INTERVAL_MSEC_DEFAULT is not updated with latest block report interval of 6 hrs. Contributed by Vinayakumar B. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575086 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 22:54:36 +00:00
Brandon Li 278d40f9ac Fix CHANGES.txt for HDFS-6060 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575023 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 19:52:02 +00:00
Brandon Li 8955f718f1 HDFS-6060. NameNode should not check DataNode layout version. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575021 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 19:29:11 +00:00
Colin McCabe 115e60b0dc HDFS-6059. TestBlockReaderLocal fails if native library not available (ajisakaa via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574998 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 18:52:22 +00:00
Haohui Mai e65084b616 HDFS-6062. TestRetryCacheWithHA#testConcat is flaky. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574997 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 18:51:04 +00:00
Colin McCabe 5a3f614794 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574796 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:21:16 +00:00
Haohui Mai 9192f8446d HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change. Contributed by Akira Ajisaka and Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574792 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:13:40 +00:00
Colin McCabe 95e0f616b9 HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574787 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 07:57:19 +00:00
Haohui Mai ad61eec072 HADOOP-10386. Log proxy hostname in various exceptions being thrown in a HA setup. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574716 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 23:09:47 +00:00
Aaron Myers 6adf7a0ecb HDFS-5898. Allow NFS gateway to login/relogin from its kerberos keytab. Contributed by Abin Shahab. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574693 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 22:20:39 +00:00
Haohui Mai b46fbd0275 HDFS-5857. TestWebHDFS#testNamenodeRestart fails intermittently with NPE. Contributed By Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574683 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 21:51:24 +00:00
Brandon Li 206e2b0cd2 HDFS-6044. Add property for setting the NFS look up time for users. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574622 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 19:01:05 +00:00
Brandon Li 8e84dedd4c HDFS-6043. Give HDFS daemons NFS3 and Portmap their own OPTS. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574616 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 18:50:45 +00:00
Jing Zhao e1162ebb1f HDFS-5167. Add metrics about the NameNode retry cache. Contributed by Tsuyoshi OZAWA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574603 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 18:22:04 +00:00
Haohui Mai e90687f90e HDFS-5321. Clean up the HTTP-related configuration in HDFS. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574270 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 00:28:21 +00:00
Tsz-wo Sze 291dbc3d27 svn merge --reintegrate https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535 back to trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574259 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 23:53:26 +00:00
Colin McCabe 1da076fd13 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574246 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 23:33:29 +00:00
Michael Stack c0a903da22 HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574205 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 21:07:03 +00:00
Jing Zhao f9ebdea446 Merging r1573814 through r1574170 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1574171 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 18:22:26 +00:00
Colin McCabe c94e43c6df HDFS-6046. add dfs.client.mmap.enabled (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573887 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:46:08 +00:00
Colin McCabe 33500fd304 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573883 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:31:43 +00:00
Chris Nauroth 2cfe554980 HDFS-6039. Uploading a File under a Dir with default acls throws "Duplicated ACLFeature". Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573879 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:08:25 +00:00
Jing Zhao 5d29338017 HDFS-6041. Downgrade/Finalize should rename the rollback image instead of purging it. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573851 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 04:42:58 +00:00
Tsz-wo Sze 9ad8dd1e8a Merge r1569890 through r1573813 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573821 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 23:51:58 +00:00
Arpit Agarwal 98983b2788 HDFS-6042. Fix rolling upgrade documentation and error messages. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573785 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 22:31:17 +00:00
Haohui Mai aa8a6e498a HDFS-6013. add rollingUpgrade information to latest UI. Contributed by Vinayakumar B. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573700 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 19:51:33 +00:00
Haohui Mai 146bf6c01e HDFS-5866. '-maxSize' and '-step' option fail in OfflineImageViewer. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573694 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 19:40:45 +00:00
Colin McCabe 6465b0b55f add missing file for HDFS-5950 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573434 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 04:01:26 +00:00
Colin McCabe dd049a2f60 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573433 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 03:58:37 +00:00
Tsz-wo Sze 0a7db7f179 Merge r1569890 through r1573119 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573120 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-01 01:14:38 +00:00
Tsz-wo Sze c69cc31adc HDFS-6034. Use DataNodeLayoutVersion for DN registration check and do not verify layout version if there is a rolling upgrade in progress. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573119 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-01 01:14:02 +00:00
Haohui Mai fec1e2eed9 HDFS-5956. A file size is multiplied by the replication factor in 'hdfs oiv -p FileDistribution' option. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573078 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 21:07:03 +00:00
Arpit Agarwal 44c5c778f0 HDFS-5821. TestHDFSCLI fails for user names with the dash character. (Contributed by Gera Shegalov) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573076 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 21:05:16 +00:00
Arpit Agarwal d00605f8f0 HADOOP-10285. Admin interface to swap callqueue at runtime. (Contributed by Chris Li) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573052 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:48:31 +00:00
Aaron Myers 8e809b8c81 HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573050 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:45:37 +00:00
Jing Zhao 3965d65200 Move HDFS-4200 to branch-2.4.0 section in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573046 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:42:35 +00:00
Tsz-wo Sze ee663fad14 Merge r1569890 through r1573042 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573043 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:37:47 +00:00
Tsz-wo Sze 1bab14bb49 HDFS-6031. Add back the "-rollingUpgrade started" namenode startup option; otherwise, namenode cannot start when the layout version is changed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573040 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:33:08 +00:00
Colin McCabe 2333388e47 HDFS-6030. Remove an unused constructor in INode.java (yzhang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573031 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 18:47:31 +00:00
Jing Zhao 5c381ade4e HDFS-5339. WebHDFS URI does not accept logical nameservices when security is enabled. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573026 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 18:39:01 +00:00
Jing Zhao 5409908026 HDFS-6032. -rollingUpgrade query hits NPE after the NN restarts. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572801 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 01:23:52 +00:00
Jing Zhao e9a17c8ce0 HDFS-6029. Secondary NN fails to checkpoint after -rollingUpgrade prepare. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572800 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 01:21:53 +00:00
Chris Nauroth 1fe2bd5534 HDFS-6028. Print clearer error message when user attempts to delete required mask entry from ACL. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572753 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 22:12:34 +00:00
Tsz-wo Sze 9b81883952 Merge r1569890 through r1572722 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572723 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 20:39:34 +00:00
Chris Nauroth e5ccaa5d03 HADOOP-10353. FsUrlStreamHandlerFactory is not thread safe. Contributed by Tudor Scurtu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572679 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 18:53:54 +00:00
Tsz-wo Sze 0369e56989 HDFS-6025. Update findbugsExcludeFile.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572488 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 09:58:59 +00:00
Jing Zhao e1084736b2 Add TestRollingUpgradeDowngrade.java for HDFS-6024 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572434 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 05:04:13 +00:00
Tsz-wo Sze 58bccdbc04 Merge r1569890 through r1572417 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572418 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 03:11:07 +00:00
Tsz-wo Sze 9a114bebd8 HDFS-6026. Fix TestDFSUpgrade and TestDataNodeRollingUpgrade. Contributed by jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572417 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 03:10:25 +00:00
Jing Zhao aee7b449e2 HDFS-6024. Test whether the NN will reject the downgrade if it has a fsimage from a newer release. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572338 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 23:20:42 +00:00
Jing Zhao ccf0744243 HDFS-6023. Test whether the standby NN continues to checkpoint after the prepare stage. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572337 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 23:17:53 +00:00
Andrew Wang c080fec82b HDFS-3969. Small bug fixes and improvements for disk locations API. Contributed by Todd Lipcon and Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572284 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 21:55:47 +00:00
Tsz-wo Sze 9cc0d5d497 Merge r1569890 through r1572250 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572251 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 20:55:50 +00:00
Chris Nauroth 8542c1f28f HDFS-4685. Move to 2.4.0 in CHANGES.txt in preparation for merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572189 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 18:40:01 +00:00
Jing Zhao 4ba2bdf340 HDFS-6018. Exception recorded in LOG when IPCLoggerChannel#close is called. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572183 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 18:23:10 +00:00
Jing Zhao dedcc09e71 HDFS-6019. Standby NN might not checkpoint when processing the rolling upgrade marker. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572182 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 18:20:53 +00:00
Kihwal Lee c8182ea764 HDFS-6020. Fix the five findbugs warnings. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572165 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 17:07:56 +00:00
Chris Nauroth 5f9cdbd24f HDFS-5936. MiniDFSCluster does not clean data left behind by SecondaryNameNode. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572150 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 16:30:58 +00:00
Chris Nauroth 7be2c002b3 HDFS-5908. Change AclFeature to capture list of ACL entries in an ImmutableList. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572142 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 16:22:56 +00:00
Chris Nauroth 4449247410 HDFS-6008. Namenode dead node link is giving HTTP error 500. Contributed by Benoy Antony. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571881 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 00:25:29 +00:00
Arpit Agarwal 9df1c533dc HDFS-6017. Query the status of rolling upgrade in the preparation stage in TestRollingUpgrade and TestRollingUpgradeRollback. (Contributed by Haohui Mai) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571875 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 00:13:53 +00:00
Jing Zhao e3d2e4c156 HDFS-6000. Avoid saving namespace when starting rolling upgrade. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571840 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 21:58:53 +00:00
Tsz-wo Sze abc9a6dad5 Merge r1569890 through r1571813 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571814 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 20:24:57 +00:00
Chris Nauroth 39c09c43bd HDFS-6006. Remove duplicate code in FSNameSystem#getFileInfo. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571813 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 20:20:21 +00:00
Kihwal Lee fa6e59891c HDFS-5498. Improve datanode startup time. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571797 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 19:27:53 +00:00
Kihwal Lee 57b28693ee HDFS-5924. Utilize OOB upgrade message processing for writes. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571792 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 19:24:15 +00:00
Kihwal Lee 6780b086d8 HDFS-6015. Fix TestBlockRecovery#testRaceBetweenReplicaRecoveryAndFinalizeBlock. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571785 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 18:51:14 +00:00
Kihwal Lee f52fe68a2b HDFS-6014. Fix findbug warnings introduced by HDFS-5583. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571784 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 18:48:30 +00:00
Jing Zhao df6e1ab491 HDFS-5939. WebHdfs returns misleading error code and logs nothing if trying to create a file with no DNs in cluster. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571781 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 18:36:46 +00:00
Chris Nauroth 6c9c3144dd HDFS-5623. NameNode: add tests for skipping ACL enforcement when permission checks are disabled, user is superuser or user is member of supergroup. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571745 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 17:02:59 +00:00
Tsz-wo Sze 2c8a6f5712 HDFS-6003. Add the new -rollingUpgrade startup option to the namenode usage message. Contributed by Vinayakumar B 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571596 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 07:50:38 +00:00
Chris Nauroth d5639c85fb HADOOP-10361. Correct alignment in CLI output for ACLs. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571573 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 05:54:51 +00:00
Tsz-wo Sze 98db64dd49 Merge r1569890 through r1571553 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571554 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 03:30:24 +00:00
Arpit Agarwal 440c3cd105 HDFS-5922. DN heartbeat thread can get stuck in tight loop. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571542 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 02:16:29 +00:00
Tsz-wo Sze 0809f32f4b Merge r1569890 through r1571508 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571509 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 01:16:30 +00:00
Tsz-wo Sze 8c4d8058d8 HDFS-5778. Add rolling upgrade user document. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571508 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 01:14:12 +00:00
Kihwal Lee 1c6b5d2b58 HDFS-5583. Make DN send an OOB Ack on shutdown before restarting. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571491 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 23:38:04 +00:00
Michael Stack 036af54387 HDFS-5776 Support 'hedged' reads in DFSClient 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571467 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 22:34:55 +00:00
Michael Stack 17db74a1c1 HDFS-5776 Support 'hedged' reads in DFSClient 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571466 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 22:34:41 +00:00
Arpit Agarwal c066cef587 HDFS-6004. Change DFSAdmin for rolling upgrade commands. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571463 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 22:05:07 +00:00
Arpit Agarwal dbf14320c0 HDFS-6005. Simplify Datanode rollback and downgrade. (Contributed by Suresh Srinivas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571431 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 20:46:35 +00:00
Jing Zhao 8e7a2b8d5d HDFS-5999. Do not create rollback fsimage when it already exists. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571096 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-23 21:35:07 +00:00
Tsz-wo Sze 3f7852bd27 HDFS-5994. Fix TestDataNodeRollingUpgrade. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570734 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 22:40:06 +00:00
Tsz-wo Sze 78325b08c5 Merge r1569890 through r1570692 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570694 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 20:08:08 +00:00
Tsz-wo Sze 0ad6cdd031 HDFS-5992. Fix NPE in MD5FileUtils and update editsStored for TestOfflineEditsViewer. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570690 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 20:02:27 +00:00
Jing Zhao c324f3096f HDFS-5935. New Namenode UI FS browser should throw smarter error messages. Cotributed by Travis Thompson. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570663 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 18:57:06 +00:00
Chris Nauroth 4f8a487fcd HDFS-5981. loadGenerator exit code is not reliable. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570468 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 06:39:08 +00:00
Chris Nauroth 327d2ceca2 HADOOP-10352. Recursive setfacl erroneously attempts to apply default ACL to files. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570466 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 06:29:52 +00:00
Andrew Wang b00817b54a HDFS-5988. Bad fsimage always generated after upgrade. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570429 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 02:48:40 +00:00
Jing Zhao 4da6de1ca3 HDFS-5982. Need to update snapshot manager when applying editlog for deleting a snapshottable directory. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570395 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 00:15:11 +00:00
Tsz-wo Sze 37afb4d683 Merge r1569890 through r1570391 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570392 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 23:47:58 +00:00
Arpit Agarwal 329c705181 HDFS-5987. Fix findbugs warnings in Rolling Upgrade branch. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570389 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 23:21:11 +00:00
Brandon Li 7568e2f193 HDFS-5944. LeaseManager:findLeaseWithPrefixPath can't handle path like /a/b/ and cause SecondaryNameNode failed do checkpoint. Contributed by Yunjiong Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570366 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 22:27:13 +00:00
Kihwal Lee 0b51bdd94f HDFS-5985. SimulatedFSDataset#disableAndPurgeTrashStorage should not throw UnsupportedOperationException. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570363 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 21:57:52 +00:00
Tsz-wo Sze 016d3b8171 HDFS-5984. Fix TestEditLog and TestStandbyCheckpoints. Contributed by jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570361 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 21:42:10 +00:00
Jing Zhao 5a3460cf78 Move HDFS-5768 and HDFS-5775 to Section 2.4.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570302 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 18:54:36 +00:00
Jing Zhao 8b196816d8 HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove it in trunk. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570295 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 18:34:24 +00:00
Kihwal Lee b23f6cc1f2 HDFS-5962. Mtime and atime are not persisted for symbolic links. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570252 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 16:09:20 +00:00
Tsz-wo Sze 55aec006f4 Merge r1569890 through r1570083 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570084 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 04:38:30 +00:00
Tsz-wo Sze 2088584864 HDFS-5980. Rollback does not need to load edits. Contributed by jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570078 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 03:57:59 +00:00
Andrew Wang 077adb25b7 HDFS-5979. Typo and logger fix for fsimage PB code. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570070 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 03:25:08 +00:00
Arpit Agarwal e2c0af8e7b HDFS-5742. DatanodeCluster (mini cluster of DNs) fails to start. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570067 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 03:20:29 +00:00
Arpit Agarwal b95294416c HDFS-5483. NN should gracefully handle multiple block replicas on same DN. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570040 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 01:43:12 +00:00
Arpit Agarwal 50a0bedead HDFS-5976. Create unit tests for downgrade and finalize rolling upgrade. (Contributed by Haohui Mai) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570019 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 00:47:15 +00:00
Arpit Agarwal 0cd98fd482 HDFS-5963. Remove empty file TestEditLogUpgradeMarker.java 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569996 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 00:01:03 +00:00
Arpit Agarwal e891c55f8b HDFS-5963. TestRollingUpgrade#testSecondaryNameNode causes subsequent tests to fail. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569993 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 23:56:02 +00:00
Arpit Agarwal 0369aff403 HDFS-5868. Make hsync implementation pluggable. (Contributed by Buddy Taylor) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569978 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 23:38:46 +00:00
Arpit Agarwal 2f341414dd HDFS-5318. Support read-only and read-write paths to shared replicas. (Contributed by Eric Sirianni) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569951 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 22:59:37 +00:00
Colin McCabe 06b504f4a6 HDFS-5973. add DomainSocket#shutdown method. (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569950 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 22:57:32 +00:00
Tsz-wo Sze d69985d90b HDFS-5974. Fix compilation error, NameNodeLayoutVersion and DataNodeLayoutVersion after merge from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569931 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 21:40:42 +00:00
Tsz-wo Sze 72c214c89b Merge r1555021 through r1569889 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569890 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 19:57:36 +00:00
Tsz-wo Sze 377424e36a HDFS-5966. Fix rollback of rolling upgrade in NameNode HA setup. Contributed by jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569885 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 19:41:22 +00:00
Chris Nauroth b2832e8d94 HDFS-4685. Correct minor whitespace difference in FSImageSerialization.java in preparation for trunk merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569860 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 18:05:27 +00:00
Chris Nauroth 3cee918a36 HDFS-4685. Move attribution to correct section of CHANGES.txt files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569854 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 17:49:30 +00:00
Chris Nauroth e472ffd515 HDFS-4685. Move attribution from CHANGES-HDFS-4685.txt to CHANGES.txt in hadoop-common and hadoop-hdfs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569841 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 17:33:59 +00:00
Chris Nauroth 909eb7e4f1 Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569833 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 17:24:02 +00:00
Kihwal Lee 7e8d85ebb3 HDFS-5961. OIV cannot load fsimages containing a symbolic link. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569789 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 15:28:57 +00:00
Colin McCabe e408966ea7 Update change description for HDFS-5953 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569579 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 01:05:38 +00:00
Tsz-wo Sze 99b4caa888 Merge r1555021 through r1569522 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569524 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 20:42:26 +00:00
Tsz-wo Sze bc962d6df4 HDFS-5945. Add rolling upgrade information to fsimage; and disallow upgrade and rolling upgrade to be started simultaneously. Contributed by szetszwo & jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569515 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 20:12:17 +00:00
Jing Zhao a845a18c67 HDFS-5893. HftpFileSystem.RangeHeaderUrlOpener uses the default URLConnectionFactory which does not import SSL certificates. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569477 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 19:06:31 +00:00
Kihwal Lee 62b023c241 HDFS-5803. TestBalancer.testBalancer0 fails. Contributed by Chen He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569391 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 15:39:59 +00:00
Kihwal Lee 4aa664f677 HDFS-5780. TestRBWBlockInvalidation times out intemittently. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569368 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 14:53:05 +00:00
Arun Murthy 1417803326 Branching for hadoop-2.5 releases. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569185 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 04:38:51 +00:00
Suresh Srinivas bf5971b86a HDFS-5959. Fix typo at section name in FSImageFormatProtobuf.java. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569156 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 01:06:44 +00:00
Chris Nauroth beb17701d7 HDFS-4685. Copying HDFS CHANGES.txt from trunk to remove erroneous double entry of HDFS-5698 changes. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569146 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-17 23:48:39 +00:00
Chris Nauroth e288316acf Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569142 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-17 23:22:32 +00:00
Chris Nauroth 2c7dfa29bd Fix javadoc in OfflineImageViewer. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569124 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-17 22:28:57 +00:00
Arpit Agarwal a04cb17540 HDFS-5698. Update CHANGES.txt to move breakdown of tasks to correct release 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568582 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 01:29:52 +00:00
Arpit Agarwal 8b63c41891 HDFS-5749. Web UI does not show up during the period of loading FSImage. (Contributed by Haohui Mai) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568578 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 01:20:19 +00:00
Andrew Wang 3f6a6c88bb HDFS-5953. TestBlockReaderFactory fails in trunk. (Akira Ajisaka via wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568568 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 00:52:47 +00:00
Jing Zhao 470d4253b2 HDFS-5920. Support rollback of rolling upgrade in NameNode and JournalNodes. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568563 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 00:28:21 +00:00
Brandon Li ef90940594 HDFS-5716. Allow WebHDFS to use pluggable authentication filter. Contributed by Haohui Mai 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568547 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 00:04:44 +00:00
Brandon Li a0a5edb6f3 HDFS-5949. New Namenode UI when trying to download a file, the browser doesn't know the file name.Contributed by Haohui Mai 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568536 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 22:15:21 +00:00
Arpit Agarwal a57550914f HDFS-5948. TestBackupNode flakes with port in use error. (Contributed by Haohui Mai) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568532 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:57:26 +00:00
Arpit Agarwal 8741c3b951 HDFS-5907. Add test cases missed in previous checkin 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568529 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:37:16 +00:00
Andrew Wang 04888258b7 HDFS-3128. Unit tests should not use a test root in /tmp. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568526 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:29:27 +00:00
Kihwal Lee 9830ef0d32 HDFS-5585. Provide admin commands for data node upgrade. Contributed by Kihwal Lee. (missing file) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568524 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:20:34 +00:00
Kihwal Lee 1a68f13521 HDFS-5585. Provide admin commands for data node upgrade. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568523 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:20:02 +00:00
Arpit Agarwal a795bc42d0 HDFS-5494. Merge Protobuf-based-FSImage code from trunk - fix build break after merge. (Contributed by Jing Zhao) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568517 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 20:56:24 +00:00
Chris Nauroth d8fd23fc46 Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568497 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 19:30:52 +00:00
Jing Zhao ba4b10354c Merging r1566359 through r1568420 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568437 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 18:32:37 +00:00
Suresh Srinivas 72f63c8957 HDFS-5943. 'dfs.namenode.https-address' property is not loaded from configuration in federation setup. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568412 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 18:07:04 +00:00
Arpit Agarwal 5df82fa01d HDFS-5907. BlockPoolSliceStorage trash to handle block deletions during rolling upgrade. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568346 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 16:37:42 +00:00
Jing Zhao 84ae8a3ca8 Move Flatten INode hierarchy jiras (HDFS-5531, HDFS-5285, HDFS-5286, HDFS-5537, HDFS-5554, HDFS-5647, HDFS-5632, HDFS-5715, HDFS-5726) to 2.4.0 section in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568218 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 08:32:55 +00:00