Commit Graph

2813 Commits

Author SHA1 Message Date
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
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
Brandon Li
256adb2106 HDFS-5891. webhdfs should not try connecting the DN during redirection. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567810 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 23:57:35 +00:00
Chris Nauroth
ea0b21af15 HDFS-5933. Optimize the FSImage layout for ACLs. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567785 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:56:32 +00:00
Chris Nauroth
fc14360b03 HDFS-5923. Do not persist the ACL bit in the FsPermission. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567784 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:54:49 +00:00
Colin McCabe
b3af8edc26 HDFS-5938. Make BlockReaderFactory#BlockReaderPeer a static class to avoid a findbugs warning (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567767 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:01:53 +00:00
Colin McCabe
beb0d25d2a HDFS-5810. Unify mmap cache and short-circuit file descriptor cache (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567720 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 19:08:52 +00:00
Suresh Srinivas
5efc9978dd HDFS-5879. Some TestHftpFileSystem tests do not close streams. Contributed by Gera Shegalov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567704 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 18:02:21 +00:00
Konstantin Shvachko
fa78a7a99a HDFS-4858. HDFS DataNode to NameNode RPC should timeout. Contributed by Henry Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567535 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 07:01:29 +00:00
Colin McCabe
53fed66d91 HADOOP-10338. Cannot get the FileStatus of the root inode from the new Globber (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567497 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 02:12:11 +00:00
Chris Nauroth
6d2a0aa1db HDFS-5925. ACL configuration flag must only reject ACL API calls, not ACLs present in fsimage or edits. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567450 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 23:13:48 +00:00
Chris Nauroth
b0ab36ac01 HDFS-5625. Write end user documentation for HDFS ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567421 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 22:18:08 +00:00
Suresh Srinivas
93eafc8590 HDFS-5929. Add blockpool % usage to HDFS federated nn page. Contributed by Siqi Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567411 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 22:04:15 +00:00
Chris Nauroth
dd03cd1336 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567238 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 17:55:07 +00:00
Arun Murthy
c43c9dd7b5 Preparing to release hadoop-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567111 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:25:30 +00:00
Chris Nauroth
d03acc7560 HDFS-5914. Incorporate ACLs with the changes from HDFS-5698. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566991 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 06:25:13 +00:00
Chris Nauroth
3bf2f04bac Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566988 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 06:00:56 +00:00
Aaron Myers
666684eb90 HDFS-5921. Cannot browse file system via NN web UI if any directory has the sticky bit set. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566916 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 00:46:45 +00:00
Chris Nauroth
5c978a43c3 HDFS-5915. Refactor FSImageFormatProtobuf to simplify cross section reads. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566824 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 23:13:06 +00:00
Brandon Li
c7e265bf26 HDFS-5886. Potential null pointer deference in RpcProgramNfs3#readlink(). Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566468 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 23:15:48 +00:00
Konstantin Shvachko
ff24753aa7 HDFS-4370. Fix typo Blanacer in DataNode. Contributed by Chu Tong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566422 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 21:07:28 +00:00
Konstantin Shvachko
204704a92d HDFS-5837. dfs.namenode.replication.considerLoad should consider decommissioned nodes. Contributed by Tao Luo.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566410 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 20:49:18 +00:00
Haohui Mai
2ed075e1bb Merging r1566042 through r1566364 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566375 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 19:45:00 +00:00
Jing Zhao
a2edb11b68 HDFS-5698. Use protobuf to serialize / deserialize FSImage. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566359 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 19:18:51 +00:00
Chris Nauroth
c6505f0499 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566100 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 19:05:12 +00:00
Chris Nauroth
dd2eb97ddd HDFS-5899. Add configuration flag to disable/enable support for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 16:20:29 +00:00
Chris Nauroth
c89c516b95 HDFS-5616. NameNode: implement default ACL handling. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1565845 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 23:11:27 +00:00
Andrew Wang
60eca33e83 HDFS-5900. Cannot set cache pool limit of unlimited via CacheAdmin. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565841 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 22:58:23 +00:00
Colin McCabe
d01158a498 HDFS-5882. TestAuditLogs is flaky (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565840 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 22:55:27 +00:00
Brandon Li
300e4906af HDFS-5874. Should not compare DataNode current layout version with that of NameNode in DataStrorage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565750 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 18:25:41 +00:00
Tsz-wo Sze
ccf08d9dc8 Merge r1555021 through r1565516 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565519 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 02:43:04 +00:00
Tsz-wo Sze
c780454413 HDFS-5869. When starting rolling upgrade or NN restarts, NN should create a checkpoint right before the upgrade marker.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565516 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 02:08:05 +00:00
Kihwal Lee
fe2fb24a61 HDFS-5807. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails intermittently. Contributed by Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565505 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 00:43:45 +00:00
Chris Nauroth
12c2582c1f HDFS-5895. HDFS cacheadmin -listPools has exit_code of 1 when the command returns 0 result. Contributed by Tassapol Athiapinya.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565440 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 21:16:01 +00:00
Colin McCabe
e0cda48959 HDFS-4911. Reduce PeerCache timeout to be commensurate with dfs.datanode.socket.reuse.keepalive (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565435 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 21:08:09 +00:00
Kihwal Lee
ab96a0838d HDFS-5881. Fix skip() of the short-circuit local reader(legacy). Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565310 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 15:45:47 +00:00
Brandon Li
b2ce764093 HDFS-5890. Avoid NPE in Datanode heartbeat. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565023 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 00:40:24 +00:00
Jing Zhao
d598b6ef9f HDFS-5873. dfs.http.policy should have higher precedence over dfs.https.enable. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564973 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:48:06 +00:00
Jing Zhao
69dbf0b225 HDFS-5876. SecureDataNodeStarter does not pick up configuration in hdfs-site.xml. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564897 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 19:43:56 +00:00
Andrew Wang
dcaaeefeaf Addendum patch for HDFS-5709, add missing license header.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564885 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 19:17:20 +00:00
Aaron Myers
d6bd920bba HDFS-5709. Improve NameNode upgrade with existing reserved paths and path components. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564645 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 06:48:00 +00:00
Todd Lipcon
747cce814c Correct CHANGES.txt entry for HDFS-5399 (contributed by Jing, not Haohui)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564632 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:20:48 +00:00
Todd Lipcon
0aa09f6d5a HDFS-5399. Revisit SafeModeException and corresponding retry policies. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564629 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:18:31 +00:00
Brandon Li
cd1e8d2e34 HDFS-5791. TestHttpsFileSystem should use a random port to avoid binding error during testing. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564198 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 05:11:11 +00:00
Brandon Li
6439cd0f69 HDFS-5767. NFS implementation assumes userName userId mapping to be unique, which is not true sometimes. Contributed by Yongjun Zhang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564141 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 00:27:25 +00:00
Junping Du
94b512bc51 HDFS-5828. BlockPlacementPolicyWithNodeGroup can place multiple replicas on the same node group when dfs.namenode.avoid.write.stale.datanode is true. (Buddy via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563640 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 15:39:02 +00:00
Tsz-wo Sze
35e59eeaa2 Merge r1555021 through r1563384 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 09:01:41 +00:00
Tsz-wo Sze
4f92eb2f61 HDFS-5848. Add rolling upgrade status to heartbeat response.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563384 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 08:58:55 +00:00
Chris Nauroth
0abf8e58b7 HDFS-5861. Add CLI test for Ls output for extended ACL marker. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563375 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 05:58:31 +00:00
Chris Nauroth
3fd9f29d56 HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use common getFeature helper method. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563374 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 05:55:20 +00:00
Colin McCabe
140246bad8 HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563362 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:25:33 +00:00
Colin McCabe
f6bfe98639 HDFS-5859. DataNode#checkBlockToken should check block tokens even if security is not enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563328 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:08:23 +00:00
Chris Nauroth
9e8cabf8ce Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563327 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:05:23 +00:00
Chris Nauroth
fa99a8471d HDFS-5858. Refactor common ACL test cases to be run through multiple FileSystem implementations. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563325 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:02:45 +00:00
Jing Zhao
1f7dd7811a HDFS-5804. HDFS NFS Gateway fails to mount and proxy when using Kerberos. Contributed by Abin Shahab.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563323 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:00:34 +00:00
Chris Nauroth
14f1f76bf6 HDFS-5614. NameNode: implement handling of ACLs in combination with snapshots. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563304 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 22:21:19 +00:00
Arpit Agarwal
5beeb30169 HDFS-5153. Datanode should send block reports for each storage in a separate message. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563254 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 21:00:33 +00:00
Chris Nauroth
d5f4f76a23 HADOOP-10270. getfacl does not display effective permissions of masked. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563219 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 18:59:16 +00:00
Chris Nauroth
c654c2e8b9 HDFS-5849. Removing ACL from an inode fails if it has only a default ACL. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563205 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 18:33:56 +00:00
Suresh Srinivas
7039b776c6 HDFS-5856. DataNode.checkDiskError might throw NPE. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563064 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 05:35:30 +00:00
Tsz-wo Sze
f2972402b7 Merge r1555021 through r1563041 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563042 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 03:24:24 +00:00
Tsz-wo Sze
00067895a0 HDFS-5754. Split LayoutVerion into NameNodeLayoutVersion and DataNodeLayoutVersion. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563041 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 03:21:45 +00:00