Commit Graph

163 Commits

Author SHA1 Message Date
arp
f8bbf80067 Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
2014-09-18 22:26:42 -07:00
Andrew Wang
8e73084491 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) 2014-09-18 17:49:17 -07:00
arp
849ccfa699 Merge branch 'trunk' into HDFS-6581 2014-09-18 11:06:40 -07:00
Tsz-Wo Nicholas Sze
2d2b0009e6 Merge branch 'trunk' into HDFS-6584
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
2014-09-18 13:00:29 +08:00
Andrew Wang
10e8602f32 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang) 2014-09-17 20:14:40 -07:00
Jing Zhao
6997c1c658 Merge remote-tracking branch 'origin/trunk' into HDFS-6584 2014-09-08 15:15:34 -07:00
arp
4ff128af12 Merge branch 'trunk' into HDFS-6581 2014-09-08 15:00:01 -07:00
Colin Patrick Mccabe
cad14aa916 HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe) 2014-09-08 12:51:56 -07:00
arp
339d21f273 Merge trunk into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
2014-09-05 21:36:25 -07:00
Jing Zhao
300cb12bef Merge trunk into HDFS-6584 2014-09-05 11:37:22 -07:00
Jing Zhao
c6107f566f HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai. 2014-09-05 10:40:02 -07:00
Colin Patrick Mccabe
f4caedfcbf HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang 2014-09-03 19:30:30 -07:00
Jing Zhao
45d5b13256 Merge changes from trunk 2014-09-03 15:36:47 -07:00
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Colin Patrick Mccabe
727331becc HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo. 2014-09-02 15:14:33 -07:00
Andrew Wang
faa4455be5 HDFS-6634. inotify in HDFS. Contributed by James Thomas. 2014-09-02 14:02:29 -07:00
arp
2e987148e0 HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal) 2014-08-27 21:47:19 -07:00
Tsz-wo Sze
c92d869d02 Merge r1609845 through r1619277 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619293 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 05:22:10 +00:00
Chris Nauroth
8304001861 HDFS-6858. Allow dfs.data.transfer.saslproperties.resolver.class default to hadoop.security.saslproperties.resolver.class. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619256 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:46:35 +00:00
Tsz-wo Sze
b50cb5e056 Merge r1609845 through r1616427 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616428 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:38:23 +00:00
Andrew Wang
ac73d416f3 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 02:30:54 +00:00
Uma Maheswara Rao G
6e421f78b3 HDFS-6814. Mistakenly dfs.namenode.list.encryption.zones.num.responses configured as boolean. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615525 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 10:04:33 +00:00
Colin McCabe
1ba3f89714 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 20:41:05 +00:00
Andrew Wang
70c99278a9 HDFS-6780. Batch the encryption zones listing API. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615189 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 18:47:01 +00:00
Andrew Wang
552b4fb9f9 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612928 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 19:26:29 +00:00
Tsz-wo Sze
48dc486672 Merge r1609845 through r1612880 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612883 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 17:30:06 +00:00
Andrew Wang
c83c5b868e HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612625 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 17:47:49 +00:00
Andrew Wang
7b466b3b70 HDFS-6716. Update usage of KeyProviderCryptoExtension APIs on NameNode. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612438 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 00:27:51 +00:00
Tsz-wo Sze
38af6101d8 HDFS-6671. Change BlockPlacementPolicy to consider block storage policy in replicaiton.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1611334 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 11:56:22 +00:00
Andrew Wang
56c0bd4d37 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 21:10:24 +00:00
Tsz-wo Sze
395c763aef Merge r1609845 through r1610532 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1610533 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 21:23:20 +00:00
Tsz-wo Sze
4f1fae88f8 HDFS-6670. Add block storage policy support with default HOT, WARM and COLD policies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1610529 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 21:11:22 +00:00
Chris Nauroth
3b54223c0f HDFS-2856. Fix block protocol so that Datanodes don't require root or jsvc. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610474 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 18:10:03 +00:00
Andrew Wang
d79f27b429 HDFS-6474. Namenode needs to get the actual keys and iv from the KeyProvider. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609833 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 20:54:47 +00:00
Andrew Wang
f881f0e923 HDFS-6493. Change dfs.namenode.startup.delay.block.deletion to second instead of millisecond. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607732 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 20:02:14 +00:00
Chris Nauroth
0c51289695 HDFS-6222. Remove background token renewer from webhdfs. Contributed by Rushabh Shah and Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604300 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 23:58:23 +00:00
Brandon Li
42391d260d HDFS-6056. Clean up NFS config settings. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598782 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 23:53:00 +00:00
Michael Stack
1228f8f6fb HBASE-6110 adding more slow action log in critical write path (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1597633 13f79535-47bb-0310-9956-ffa450edef68
2014-05-26 19:38:05 +00:00
Uma Maheswara Rao G
ac23a55547 Merge HDFS-2006 HDFS XAttrs branch to Trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596575 13f79535-47bb-0310-9956-ffa450edef68
2014-05-21 13:57:33 +00:00
Aaron Myers
da3992b4e3 HDFS-6406. Add capability for NFS gateway to reject connections from unprivileged ports. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595351 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 21:23:03 +00:00
Arpit Agarwal
cf4bc7fdd4 HDFS-6273. Config options to allow wildcard endpoints for namenode HTTP and HTTPS servers. (Contributed by Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589803 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 17:40:30 +00:00
Haohui Mai
fb1d7fb596 HDFS-5570. Deprecate hftp / hsftp and replace them with webhdfs / swebhdfs. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584100 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 17:28:08 +00:00
Arpit Agarwal
1fbb04e367 HDFS-5910. Enhance DataTransferProtocol to allow per-connection choice of encryption/plain-text. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581688 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 04:11:18 +00:00
Chris Nauroth
328fc86bdb HDFS-5846. Shuffle phase is slow in Windows - FadviseFileRegion::transferTo does not read disks efficiently. Contributed by Nikola Vujic.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581091 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 22:16:48 +00:00
Colin McCabe
bd98fa152d HDFS-6007. Update documentation about short-circuit local reads (iwasakims via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578994 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 18:14:04 +00:00
Colin McCabe
9a65a9aadc HDFS-6106. Reduce default for dfs.namenode.path.based.cache.refresh.interval.ms (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-15 07:52:19 +00:00
Andrew Wang
d37c31a2db HDFS-6102. Lower the default maximum items per directory to fix PB fsimage loading. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577426 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 04:52:03 +00:00
Chris Nauroth
5bb794566e HDFS-6055. Change default configuration to limit file name length in HDFS. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576095 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 21:41:38 +00:00
Andrew Wang
94a1632fcb HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575611 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 21:25:13 +00:00
Andrew Wang
dbd22b23c2 Revert HDFS-3405 for recommit with correct renamed files
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575610 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 21:15:41 +00:00