Commit Graph

2673 Commits

Author SHA1 Message Date
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
Brandon Li f4c339a1c5 HDFS-5901
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568168 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:53:14 +00:00
Brandon Li 2ccc1daacf HDFS-5934. New Namenode UI back button doesn't work as expected. Contributed by Travis Thompson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568165 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:47:11 +00:00
Brandon Li 983f11ba2d HDFS-5913. Nfs3Utils#getWccAttr() should check attr parameter against null. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568076 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 22:41:29 +00:00
Chris Nauroth 934011c2ab Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568029 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 20:19:53 +00:00
Chris Nauroth 17e48139c2 HADOOP-10344. Fix TestAclCommands after merging HADOOP-10338 patch. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568026 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 20:17:00 +00:00
Chris Nauroth 8ffd3a91a5 HDFS-5941. add dfs.namenode.secondary.https-address and dfs.namenode.secondary.https-address in hdfs-default.xml. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568019 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 19:53:20 +00:00
Chris Nauroth a49dee06fb Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567994 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 18:21:46 +00:00
Chris Nauroth c17dc01b2e HDFS-5937. Update CHANGES-HDFS-4685.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567992 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 18:12:40 +00:00
Chris Nauroth e291c7905f HDFS-5937. Fix TestOfflineEditsViewer on HDFS-4685 branch. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567986 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 17:52:26 +00:00
Kihwal Lee b0456745f9 HDFS-5904. TestFileStatus fails intermittently. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567946 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 15:06:17 +00:00
Tsz-wo Sze a4f152db96 Merge r1555021 through r1566358 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1567874 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 09:53:52 +00:00
Tsz-wo Sze 4f9bbaa301 HDFS-5889. When starting rolling upgrade, create a fs image for rollback so that the standby namenode can create checkpoints during upgrade. Contributed by szetszwo & jing9
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1567861 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 08:04:58 +00:00
Haohui Mai 9ee7c2a077 HDFS-5932. Ls should display the ACL bit. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567850 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 05:51:28 +00:00
Colin McCabe f0d64a078d HDFS-5940. Minor cleanups to ShortCircuitReplica, FsDatasetCache, and DomainSocketWatcher (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567835 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 03:10:48 +00:00
Jing Zhao 2624b20291 HDFS-5847. Consolidate INodeReference into a separate section. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567812 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 00:00:42 +00:00