Commit Graph

1912 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Chris Nauroth
7a03dc0482 HDFS-5608. WebHDFS: implement ACL APIs. Contributed by Sachin Jose and Renil Joseph.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563013 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 23:13:24 +00:00
Todd Lipcon
fd2ba4911b HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562970 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 21:21:15 +00:00
Jing Zhao
3d9ad8e3b6 HDFS-5843. DFSClient.getFileChecksum() throws IOException if checksum is disabled. Contributed by Laurent Goujon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562927 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:15:13 +00:00
Chris Nauroth
10ef8a4b56 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1562670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:55:14 +00:00
Andrew Wang
799ad3d670 HDFS-5841. Update HDFS caching documentation with new changes. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562649 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:17:16 +00:00
Andrew Wang
c96d078033 HDFS-5845. SecondaryNameNode dies when checkpointing with cache pools.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562644 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 23:59:21 +00:00
Jing Zhao
8c505adddb HDFS-5842. Cannot create hftp filesystem when using a proxy user ugi and a doAs on a secure cluster. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562603 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 21:53:32 +00:00
Suresh Srinivas
33a47743a5 HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561959 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:32:52 +00:00
Tsz-wo Sze
efcdf81ca9 Merge r1555021 through r1561943 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561944 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:37:13 +00:00
Tsz-wo Sze
917502ef31 HDFS-5835. Add a new option for starting Namenode when rolling upgrade is in progress.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561943 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:35:47 +00:00
Arpit Agarwal
b8776ee65b HDFS-5833. Fix incorrect javadoc in SecondaryNameNode. (Contributed by Bangtao Zhou)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561938 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:09:57 +00:00
Colin McCabe
07c004db06 HDFS-5830. WebHdfsFileSystem.getFileBlockLocations throws IllegalArgumentException when accessing another cluster. (Yongjun Zhang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561885 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 22:19:30 +00:00
Jing Zhao
4b61ff2283 HDFS-5781. Use an array to record the mapping between FSEditLogOpCode and the corresponding byte value. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561788 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:53:39 +00:00
Chris Nauroth
ad240d6b3a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561771 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:09:22 +00:00
Tsz-wo Sze
a9110e1788 Merge r1555021 through r1561510 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561516 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 16:34:30 +00:00
Todd Lipcon
edb6dc5f30 HDFS-5138. Support HDFS upgrade in HA. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561381 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 20:01:26 +00:00
Uma Maheswara Rao G
befb254e61 HDFS-5343. When cat command is issued on snapshot files, getting unexpected result. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561325 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 15:50:42 +00:00
Kihwal Lee
dd1bc7e1c7 HDFS-5728. Block recovery will fail if the metafile does not have crc for all chunks of the block. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561223 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 22:56:05 +00:00
Chris Nauroth
738b076cc6 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560768 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:49:24 +00:00
Chris Nauroth
cd7cd94e3f HDFS-5799. Make audit logging consistent across ACL APIs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560766 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:41:53 +00:00
Daryn Sharp
a4e66e09e9 HDFS-5241. Provide alternate queuing audit logger to reduce logging contention (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560761 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:15:27 +00:00
Kihwal Lee
ff43021946 HDFS-5788. listLocatedStatus response can be very large. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560750 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:01:30 +00:00
Uma Maheswara Rao G
824dcdbd42 HDFS-5789. Some of snapshot APIs missing checkOperation double check in fsn. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560731 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 16:35:05 +00:00
Andrew Wang
1c602f7198 HDFS-5806. Balancer should set soTimeout to avoid indefinite hangs. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560548 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:33:00 +00:00
Arpit Agarwal
83280a45de HDFS-5434. Change block placement policy constructors from package private to protected. (Buddy Taylor via Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560217 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 23:11:15 +00:00
Tsz-wo Sze
d8bc523754 HDFS-5753. Add new NN startup options for downgrade and rollback using upgrade marker.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1559907 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 02:38:46 +00:00
Chris Nauroth
2fbe8235dc Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559794 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 18:02:27 +00:00
Tsz-wo Sze
602f71a8da HDFS-5800. Fix a typo in DFSClient.renewLease(). Contributed by Kousuke Saruta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559701 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 14:08:00 +00:00
Chris Nauroth
8a9a6dbd7e Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559324 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 06:50:19 +00:00
Tsz-wo Sze
1025121874 Merge r1555021 through r1559304 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1559305 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 02:24:38 +00:00
Tsz-wo Sze
09b8ce5b44 HDFS-5786. Support QUERY and FINALIZE actions of rolling upgrade.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1559304 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 02:07:09 +00:00
Haohui Mai
6a52febfbd HDFS-5612. NameNode: change all permission checks to enforce ACLs in addition to permissions. Contributued by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559281 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 23:28:45 +00:00
Haohui Mai
5300294fbe HDFS-5758. NameNode: complete implementation of inode modifications for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559267 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 22:05:47 +00:00
Jing Zhao
fb01200153 HDFS-5794. Fix the inconsistency of layout version number of ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559209 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 18:18:36 +00:00
Colin McCabe
a7ec44d41b HDFS-5784. Reserve space in edit log header and fsimage header for feature flag section (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558974 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 01:32:05 +00:00
Jing Zhao
e02ded811f HDFS-5777. Update LayoutVersion for the new editlog op OP_ADD_BLOCK. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558675 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 02:28:10 +00:00
Brandon Li
a506df8e48 HDFS-5775. Consolidate the code for serialization in CacheManager. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558599 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:15:24 +00:00
Brandon Li
ca5d73d1ab HDFS-5768. Consolidate the serialization code in DelegationTokenSecretManager. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558598 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:11:01 +00:00
Colin McCabe
c3b236ce5d HDFS-5766. In DFSInputStream, do not add datanode to deadNodes after InvalidEncryptionKeyException in fetchBlockByteRange (Liang Xie via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558536 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:23:31 +00:00
Colin McCabe
037a89abc5 HDFS-5762. BlockReaderLocal does not return -1 on EOF when doing zero-length reads (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558526 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:17:50 +00:00
Tsz-wo Sze
4a1abe5a3d Merge r1555021 through r1558254 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1558303 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 06:06:31 +00:00
Tsz-wo Sze
5fe73a986e HDFS-5752. Add a new DFSAdmin command to query, start and finalize rolling upgrade.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1558299 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 05:56:17 +00:00
Jing Zhao
578dae9ef3 HDFS-5704. Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558255 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 01:06:53 +00:00
Konstantin Boudnik
4b16c2b65e HDFS-5677. Need error checking for HA cluster configuration. Contributed by Vincent Sheffer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558217 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:59:51 +00:00
Jing Zhao
e210519d32 HDFS-5579. Under construction files make DataNode decommission take very long hours. Contributed by zhaoyunjiong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557904 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 02:02:15 +00:00
Jing Zhao
e06ae2d567 HDFS-5710. FSDirectory#getFullPathName should check inodes against null. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557803 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:37:56 +00:00
Chris Nauroth
c90211af7a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1557294 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:37:23 +00:00
Arpit Agarwal
9d382a4174 HDFS-5747. Fix NPEs in BlockManager. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557289 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:05:55 +00:00
Tsz-wo Sze
1c7aa44d62 Merge r1555021 through r1557038 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1557039 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 06:07:24 +00:00
Tsz-wo Sze
4563ba08e7 HDFS-5645. Support upgrade marker in editlog streams.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1557038 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 06:06:10 +00:00
Kihwal Lee
b4d6c5823b HDFS-5449. WebHdfs compatibility broken between 2.2 and 1.x / 23.x. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556927 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 19:24:07 +00:00
Junping Du
7186000367 HDFS-5721. sharedEditsImage in Namenode#initializeSharedEdits() should be closed before method returns. (Ted Yu via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556803 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 13:33:08 +00:00
Chris Nauroth
17ab35314f Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556665 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 23:10:02 +00:00
Chris Nauroth
21d4167179 HDFS-5739. ACL RPC must allow null name or unspecified permissions in ACL entries. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556663 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 22:47:57 +00:00
Chris Nauroth
023c11ec7e HDFS-5737. Replacing only the default ACL can fail to copy unspecified base entries from the access ACL. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556652 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 22:02:53 +00:00
Tsz-wo Sze
f3ee35ab28 Merge r1555021 through r1556550 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1556552 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 14:36:09 +00:00
Jing Zhao
076ecf79ca HDFS-5726. Fix compilation error in AbstractINodeDiff for JDK7. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556433 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 03:19:41 +00:00
Colin McCabe
53b27fc60b HDFS-5724. modifyCacheDirective logging audit log command wrongly as addCacheDirective (Uma Maheswara Rao G via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556386 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 22:27:06 +00:00
Jing Zhao
70cff9e2f0 HDFS-5715. Use Snapshot ID to indicate the corresponding Snapshot for a FileDiff/DirectoryDiff. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556353 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 20:52:48 +00:00
Chris Nauroth
2fbb3d694e Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556097 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:07:33 +00:00
Chris Nauroth
c658567571 HDFS-5673. Implement logic for modification of ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556090 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:47:49 +00:00
Brandon Li
bfd227bf09 HDFS-5719. FSImage#doRollback() should close prevState before return. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556057 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 22:58:18 +00:00
Colin McCabe
8deb7a6057 HDFS-5589. Namenode loops caching and uncaching when data should be uncached. (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555996 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:45:02 +00:00
Colin McCabe
2a1ecd00da HDFS-5220. Expose group resolution time as metric (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555976 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:59:10 +00:00
Arpit Agarwal
f8a9329f2b HDFS-5667. Include DatanodeStorage in StorageReport. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555929 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 17:28:23 +00:00
Brandon Li
b80343a55f HDFS-5705. TestSecondaryNameNodeUpgrade#testChangeNsIDFails may fail due to ConcurrentModificationException. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555190 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 18:29:44 +00:00
Tsz-wo Sze
498f9674ff Merge r1550130 through r1555020 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1555021 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 07:26:52 +00:00