Commit Graph

2346 Commits

Author SHA1 Message Date
arp
b1000fbba4 Merge branch 'trunk' into HDFS-6581
Conflicts:
	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/INodeFile.java
2014-09-24 20:08:32 -07:00
Allen Wittenauer
3cde37c991 HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:38:30 -07:00
cnauroth
cbf0ae742a HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth. 2014-09-24 15:30:13 -07:00
Karthik Kambatla
ef784a2e08 HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha) 2014-09-23 17:07:48 -07:00
arp
bfc7b7e6a0 Merge branch 'trunk' into HDFS-6581 2014-09-23 16:40:35 -07:00
Allen Wittenauer
3dc28e2052 HADOOP-11092. hadoop shell commands should print usage if not given a class (aw) 2014-09-23 12:24:23 -07:00
Steve Loughran
7aa667eefa HADOOP-11111 MiniKDC to use locale EN_US for case conversions: hadoop-common/CHANGES.TXT 2014-09-23 10:57:15 +01:00
arp
889122bd55 Merge branch 'trunk' into HDFS-6581 2014-09-22 18:00:58 -07:00
Vinayakumar B
eab15af12c HADOOP-10131. NetWorkTopology#countNumOfAvailableNodes() is returning wrong value if excluded nodes passed are not part of the cluster tree (Contributed by Vinayakumar B) 2014-09-22 11:25:56 +05:30
Andrew Wang
1737950d0f HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. Contributed by Zhe Zhang. 2014-09-21 21:29:46 -07:00
arp
09dab88d3e Merge branch 'trunk' into HDFS-6581 2014-09-20 10:34:45 -07:00
Alejandro Abdelnur
db890eef32 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 2014-09-20 08:21:44 -07:00
cnauroth
f85cc14eb4 HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 2014-09-19 21:23:26 -07:00
Andrew Wang
b6ceef90e5 HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) 2014-09-19 17:42:00 -07:00
Andrew Wang
adf0b67a71 HADOOP-10970. Cleanup KMS configuration keys. (wang) 2014-09-19 14:59:25 -07:00
Allen Wittenauer
9f03a7c018 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:33:07 -07:00
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
Aaron T. Myers
6434572297 HADOOP-11109. Site build is broken. Contributed by Jian He. 2014-09-18 18:00:39 -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
Tsz-Wo Nicholas Sze
98f7bfe993 Merge branch 'HDFS-6584' into trunk 2014-09-19 07:11:19 +08:00
Alejandro Abdelnur
fad4cd85b3 KMS: Support for multiple Kerberos principals. (tucu) 2014-09-18 16:03:38 -07:00
arp
22295b4783 Merge branch 'trunk' into HDFS-6581 2014-09-18 15:59:37 -07:00
cnauroth
1b4b46004a HADOOP-11105. Update CHANGES.txt. 2014-09-18 15:41:19 -07:00
cnauroth
1942364ef1 HADOOP-11105. MetricsSystemImpl could leak memory in registered callbacks. Contributed by Chuan Liu. 2014-09-18 15:36:43 -07:00
Andrew Wang
fe2f54d4cb HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) 2014-09-18 14:51:08 -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
bf38793ce1 Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:34 -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
Alejandro Abdelnur
123f20d42f HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) 2014-09-17 15:29:17 -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
f230248525 HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe) 2014-09-17 14:27:32 -07:00
Colin Patrick Mccabe
f24ac429d1 HDFS-6843. Add to CHANGES.txt 2014-09-17 13:38:11 -07:00
Jing Zhao
911979c8ab Merge changes from trunk 2014-09-17 13:12:45 -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
3f8f860cc6 Revert "HADOOP-10982"
This reverts commit d9a86031a0.
2014-09-17 11:11:15 -07:00
Alejandro Abdelnur
d9a86031a0 HADOOP-10982 2014-09-17 11:08:00 -07:00
Alejandro Abdelnur
e4ddb6da15 HADOOP-11099. KMS return HTTP UNAUTHORIZED 401 on ACL failure. (tucu) 2014-09-17 11:07:56 -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
8cf1052beb HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) 2014-09-16 23:20:35 -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
dcbc467301 HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal) 2014-09-16 18:19:57 -07:00
arp
a24a9331d4 Merge branch 'trunk' into HDFS-6581 2014-09-16 18:18:09 -07:00
Jing Zhao
432b863719 Merge changes from trunk 2014-09-16 17:58:39 -07:00
Jing Zhao
2e4033e872 HDFS-7052. Archival Storage: Add Mover into hdfs script. Contributed by Jing Zhao. 2014-09-16 17:52:28 -07:00
Andrew Wang
b6d3230e41 HADOOP-10922. User documentation for CredentialShell. Contributed by Larry McCay. 2014-09-16 17:15:23 -07:00
Allen Wittenauer
7971c97ec1 HADOOP-11022. User replaced functions get lost 2-3 levels deep (e.g., sbin) (aw) 2014-09-16 16:06:23 -07:00
arp
4603e4481f HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 2014-09-16 15:45:07 -07:00
arp
e0d7fb48fb Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
2014-09-16 14:32:57 -07:00