Commit Graph

879 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
Andrew Wang
47e5e19831 HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang) 2014-09-17 17:58:56 -07:00
arp
a186d514bd Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
2014-09-17 15:03:55 -07:00
Colin Patrick Mccabe
e3803d002c HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) 2014-09-17 12:55:35 -07:00
arp
24f8156886 Merge branch 'trunk' into HDFS-6581 2014-09-17 12:10:50 -07:00
Alejandro Abdelnur
c0c7e6fabd HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) 2014-09-16 23:36:36 -07:00
Alejandro Abdelnur
e14e71d5fe HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:20:35 -07:00
arp
ebdd5e50d5 Merge branch 'trunk' into HDFS-6581 2014-09-12 20:53:18 -07:00
cnauroth
957414d4cb HADOOP-11088. Unittest TestKeyShell, TestCredShell and TestKMS assume UNIX path separator for JECKS key store path. Contributed by Xiaoyu Yao. 2014-09-12 14:50:07 -07:00
arp
7aeda47bd9 Merge branch 'trunk' into HDFS-6581 2014-09-12 11:45:11 -07:00
Alejandro Abdelnur
c656d7d6e5 HADOOP-11083. After refactoring of HTTP proxyuser to common, doAs param is case sensitive. (tucu) 2014-09-11 13:53:31 -07:00
Colin Patrick Mccabe
5ec7fcd9dd HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) 2014-09-10 16:14:53 -07:00
Alejandro Abdelnur
b100949404 HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) 2014-09-09 22:19:42 -07:00
Alejandro Abdelnur
9ee891aa90 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) 2014-09-09 22:18:03 -07:00
cnauroth
6dae4b430c HADOOP-11057. checknative command to probe for winutils.exe on windows. Contributed by Xiaoyu Yao. 2014-09-09 21:38:29 -07:00
arp
4ff128af12 Merge branch 'trunk' into HDFS-6581 2014-09-08 15:00:01 -07:00
Allen Wittenauer
d989ac0444 MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw) 2014-09-08 13:15:46 -07:00
Alejandro Abdelnur
df8c84cba8 HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) 2014-09-08 11:31:30 -07:00
arp
6e5f780d1d Merge branch 'trunk' into HDFS-6581 2014-09-08 10:37:26 -07:00
cnauroth
302d9a0a0d Credential Provider related Unit Test Failure on Windows. Contributed by Xiaoyu Yao. 2014-09-08 09:29:19 -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
Alejandro Abdelnur
b69a48c988 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) 2014-09-04 09:22:00 -07:00
Alejandro Abdelnur
70b218748b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:11:10 -07:00
Alejandro Abdelnur
41f1662d46 HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) 2014-09-04 09:09:39 -07:00
Colin Patrick Mccabe
8f1a668575 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. 2014-09-03 19:35:39 -07:00
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Jason Lowe
01e8f056d9 HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne 2014-09-02 18:15:38 +00:00
arp
217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -07:00
Alejandro Abdelnur
c60da4d3b3 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) 2014-08-29 14:21:58 -07:00
Alejandro Abdelnur
6bf16d1156 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 19:05:57 -07:00
arp
bbaa7dc28d HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 2014-08-28 15:53:12 -07:00
Alejandro Abdelnur
d1ae479aa5 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:45:40 -07:00
Arpit Agarwal
4b3a6b8722 HADOOP-10282. Create a FairCallQueue: a multi-level call queue which schedules incoming calls and multiplexes outgoing calls. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619938 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 22:16:15 +00:00
Jason Darrell Lowe
da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:38:16 +00:00
Andrew Wang
0cc08f6da4 Merge from trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:41:31 +00:00
Colin McCabe
e446497cd1 HDFS-6561. org.apache.hadoop.util.DataChecksum should support native checksumming (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618680 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:02:37 +00:00
Jason Darrell Lowe
4a978bff3e HADOOP-10059. RPC authentication and authorization metrics overflow to negative values on busy clusters. Contributed by Tsuyoshi OZAWA and Akira AJISAKA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618659 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 16:31:38 +00:00
Arpit Agarwal
86840834ed HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618503 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 19:02:45 +00:00
Arpit Agarwal
48505679c0 HADOOP-10335. Undo checkin to resolve test build issue.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618487 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:47:18 +00:00
Arpit Agarwal
b47ad1ccba HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618484 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:43:20 +00:00
Arpit Agarwal
c1cd41cc49 HADOOP-10650. Add ability to specify a reverse ACL (black list) of users and groups. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618482 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:06:01 +00:00
Allen Wittenauer
6ab25dfcd9 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) (continued)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617802 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:10:24 +00:00
Allen Wittenauer
a34dafe325 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617775 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 17:30:26 +00:00
Arpit Agarwal
e0a9e1bfb7 HADOOP-10281. Create a scheduler, which assigns schedulables a priority level. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617643 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 00:54:29 +00:00
Arpit Agarwal
d687f6f689 HADOOP-10851. NetgroupCache does not remove group memberships. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617612 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 22:30:48 +00:00
Andrew Wang
0a2ee2fd53 HADOOP-10820. Throw an exception in GenericOptionsParser when passed an empty Path. Contributed by Alex Holmes and Zhihai Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617542 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:46:31 +00:00
Charles Lamb
74f7be0887 merge from trunk r1617527
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:02:07 +00:00
Charles Lamb
acc3d73a45 HDFS-6839. Fix TestCLI to expect new output. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617526 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 16:50:18 +00:00