Commit Graph

1960 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 5d4d11400e HADOOP-11254. Changed visibility of AccessControlList to be public for consumption by ecosystem. Contributed by Zhijie Shen.
(cherry picked from commit b18e8a272e)
2014-11-01 11:11:43 -07:00
Zhijie Shen eb1718b71a HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. Contributed by Varun Vasudev.
(cherry picked from commit 260ab6d5f4)
2014-10-31 18:05:05 -07:00
Jian He a859adcc23 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen
(cherry picked from commit 1b4be91866)
2014-10-31 13:17:45 -07:00
Haohui Mai 2bb845de3c HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev. 2014-10-31 11:54:48 -07:00
cnauroth d3dd1ac1c2 HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth.
(cherry picked from commit 5573b3476a)
(cherry picked from commit 57fa43ab0a)
2014-10-30 22:55:45 -07:00
Haohui Mai 4e419b6ede HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li.
(cherry picked from commit c7d1db7495)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-10-30 12:08:50 -07:00
Tsz-Wo Nicholas Sze c3de2fc1eb HADOOP-11221. IdentityHashStore assumes System.identityHashCode() is non-negative. Contributed by Jinghui Wang 2014-10-30 11:01:03 -07:00
Colin Patrick Mccabe a4b54dfc84 HADOOP-11250. fix endmacro of set_find_shared_library_without_version in CMakeLists (Yi Liu via Colin P. McCabe)
(cherry picked from commit e488f0d93b)
(cherry picked from commit e107ea5177)
2014-10-30 10:38:39 -07:00
yliu 2f313cfaeb HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu) 2014-10-30 10:41:09 +08:00
Jason Lowe ba86f06cf7 HADOOP-9740. Fix FsShell '-text' command to be able to read Avro files stored in HDFS and other filesystems. Contributed by Allan Yan
(cherry picked from commit 0c15130db2)
2014-10-29 20:25:25 +00:00
cnauroth de1044f48d HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan.
(cherry picked from commit 5c900b522e)
(cherry picked from commit b4446cb370)
2014-10-29 11:24:34 -07:00
Brandon Li 19ec4212d6 HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang
(cherry picked from commit 72a556d3b0)
(cherry picked from commit 6caf36f9eb)
2014-10-29 11:10:10 -07:00
Kihwal Lee afbb279825 MAPREDUCE-6022. map_input_file is missing from streaming job
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114)
2014-10-29 12:30:51 -05:00
Karthik Kambatla d8212c0b7e HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha)
(cherry picked from commit 3c5f5af118)
2014-10-28 18:10:06 -07:00
Karthik Kambatla 3e901e63e4 HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha)
(cherry picked from commit 1a78082338)
2014-10-28 17:34:27 -07:00
cnauroth 905b339a3f HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao.
(cherry picked from commit c6f04f391b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit c2790932bd)
2014-10-28 14:18:24 -07:00
yliu 9465da32e8 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:19:26 +08:00
yliu fe4da80c76 HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) 2014-10-28 14:47:11 +08:00
cnauroth e8d77593fa HDFS-6934. Revert files accidentally committed.
(cherry picked from commit 5b1dfe78b8)
(cherry picked from commit 5dbd27f8b4)
2014-10-27 12:18:48 -07:00
cnauroth a9f31af29c HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth.
(cherry picked from commit 463aec1171)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java

(cherry picked from commit 3d67da502a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java
2014-10-27 12:01:47 -07:00
Jian He ba1e549145 YARN-2591. Fixed AHSWebServices to return FORBIDDEN(403) if the request user doesn't have access to the history data. Contributed by Zhijie Shen
(cherry picked from commit c05b581a55)
2014-10-27 10:46:59 -07:00
Vinod Kumar Vavilapalli 259db7a726 YARN-2743. Fixed a bug in ResourceManager that was causing RMDelegationToken identifiers to be tampered and thus causing app submission failures in secure mode. Contributed by Jian He.
(cherry picked from commit 0186645505)
2014-10-26 11:29:06 -07:00
Karthik Kambatla 7bb5071a9e HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha)
(cherry picked from commit db45f047ab)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-10-26 11:28:50 -07:00
Jian He f236e17216 HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu
(cherry picked from commit f7e89bb349)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit 299c9b456d)
2014-10-24 12:58:11 -07:00
Jian He 29d0164ee7 YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu
(cherry picked from commit 3b12fd6cfb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-10-22 16:22:08 -07:00
Vinod Kumar Vavilapalli e282805f1c YARN-1063. Augmented Hadoop common winutils to have the ability to create containers as domain users. Contributed by Remus Rusanu.
Committed as a YARN patch even though all the code changes are in common.
(cherry picked from commit 5ca97f1e60)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-10-22 16:10:49 -07:00
Karthik Kambatla 6064b9d02f HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. (Arun Suresh via kasha)
(cherry picked from commit 70719e5c62)
2014-10-22 14:36:06 -07:00
cnauroth 8727f9e1b0 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch.
(cherry picked from commit 6637e3cf95)
(cherry picked from commit a066134277)
2014-10-21 12:36:43 -07:00
Brandon Li 20108263fb HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li
(cherry picked from commit 4e134a02a4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit c800e058ea)
2014-10-21 11:56:26 -07:00
Brandon Li 3fa1ee2923 HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li
(cherry picked from commit 33e020cb19)
2014-10-21 11:05:50 -07:00
Karthik Kambatla cdf265de4f HADOOP-11194. Ignore .keep files (kasha)
(cherry picked from commit d5084b9fa3)
2014-10-20 11:30:13 -04:00
arp 9183dadb73 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
Conflicts:
	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/server/namenode/FSDirectory.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/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
2014-10-17 16:00:53 -07:00
cnauroth 2e98379bcb HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-17 16:00:53 -07:00
arp d61daff9bf HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.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/FSEditLogLoader.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/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
2014-10-17 16:00:52 -07:00
arp 7d168d9ff9 HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp d3ccbd8e65 HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp 2079d4b72e HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:49 -07:00
Vinod Kumar Vavilapalli db2bfed839 HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support proxy-users on Delegation-token management operations. Contributed by Zhijie Shen.
(cherry picked from commit 1137557816)
2014-10-17 15:57:39 -07:00
Ravi Prakash d4606bff3c HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) Fix CHANGES.txt 2014-10-16 16:54:21 -07:00
Ravi Prakash 7b53ab7b14 HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)
(cherry picked from commit 466f08792f)
2014-10-15 15:53:47 -07:00
Zhijie Shen eb055eadd7 YARN-2656. Made RM web services authentication filter support proxy user. Contributed by Varun Vasudev and Zhijie Shen.
(cherry picked from commit 1220bb72d4)
2014-10-14 21:58:12 -07:00
Zhijie Shen e71fa82ee5 HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all sub-classes of AbstractDelegationTokenIdentifier. Contributed by Zhijie Shen.
(cherry picked from commit cdce88376a)
2014-10-14 11:39:06 -07:00
Haohui Mai 21fa0f6c43 HADOOP-11198. Fix typo in javadoc for FileSystem#listStatus(). Contributed by Li Lu. 2014-10-13 20:44:23 -07:00
Aaron T. Myers 834533fdfc HADOOP-11176. KMSClientProvider authentication fails when both currentUgi and loginUgi are a proxied user. Contributed by Arun Suresh.
(cherry picked from commit 0e57aa3bf6)
(cherry picked from commit f3132eee10)
2014-10-13 18:10:40 -07:00
Karthik Kambatla e6102b1828 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha)
(cherry picked from commit cc93e7e683)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
2014-10-13 16:42:47 -07:00
Haohui Mai edf2497df7 HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao. 2014-10-10 23:04:19 -07:00
Uma Maheswara Rao G 157f86fca5 HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider (Yi Liu via umamahesh)
(cherry picked from commit 8d7c54967d)
2014-10-10 23:04:12 -07:00
Colin Patrick Mccabe 14080ea3d2 HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe)
(cherry picked from commit d8d628d1e0)
(cherry picked from commit 8addbe2b8e)
2014-10-09 17:12:48 -07:00
Andrew Wang 2ff182c890 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang)
(cherry picked from commit 8d94114495)
2014-10-09 13:21:34 -07:00
Andrew Wang e7b215dfa7 HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang)
(cherry picked from commit d7b647f0ee)
2014-10-09 11:59:15 -07:00
cnauroth 754718aed5 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth.
(cherry picked from commit 4e544c84e9)
2014-10-09 11:57:00 -07:00
cnauroth cf7eaf28e9 HADOOP-11175. Fix several issues of hadoop security configuration in user doc. Contributed by Yi Liu.
(cherry picked from commit 1123a06e36)
(cherry picked from commit 5af4c021cc)
2014-10-09 11:12:58 -07:00
Aaron T. Myers f86c9c6c71 HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh.
(cherry picked from commit d9556e873ef4d3e68c4f0c991f856d1faa747f07)
(cherry picked from commit 3a2565c7be80cf6e9cdfec0f5460ed8ed2252768)
2014-10-08 18:00:37 -07:00
Zhijie Shen ab448565c9 HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. Contributed by Craig Welch.
(cherry picked from commit a169051931)
2014-10-08 15:39:30 -07:00
Colin Patrick Mccabe 204148f0d4 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 2014-10-08 13:58:28 -07:00
Andrew Wang 2c27b7b26f HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection Configurator to the authenticator. (Arun Suresh via wang)
(cherry picked from commit b2f6197523)
2014-10-07 14:51:52 -07:00
Kihwal Lee 3f200fddfd HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be)
2014-10-07 16:24:23 -05:00
Haohui Mai 1bd45fa165 HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. 2014-10-06 22:08:01 -06:00
cnauroth 08ccd30063 HADOOP-11163. Correct CHANGES.txt.
(cherry picked from commit bbb3b1acc0)
(cherry picked from commit 1329d1e701)
2014-10-06 09:16:31 -07:00
cnauroth 29c203585e HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu.
(cherry picked from commit 69c9af9103)
(cherry picked from commit a828ef15b0)
2014-10-06 09:16:22 -07:00
Arun C. Murthy e65d8b750d HADOOP-10731. Sync-ing CHANGES.txt across branches.
(cherry picked from commit c5828c624f)
2014-10-05 07:51:56 -07:00
Arun C. Murthy c39f74d041 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan.
(cherry picked from commit 8f9ab998e2)
2014-10-05 07:47:28 -07:00
Andrew Wang ac510c3610 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh.
(cherry picked from commit 2d8e6e2c4a)
(cherry picked from commit 9ebff016c2)
2014-10-02 20:00:22 -07:00
Haohui Mai cfc5f8f684 HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. 2014-10-02 14:27:33 -07:00
Andrew Wang dea3f133ff HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)
(cherry picked from commit 6ac10516e7)
(cherry picked from commit 6dbba19469)
2014-10-02 14:01:30 -07:00
Haohui Mai 5d2f325483 HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. 2014-10-01 13:22:12 -07:00
Steve Loughran a19efe3b13 HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel) 2014-09-30 17:40:53 -07:00
Andrew Wang e2351e8512 HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang)
(cherry picked from commit e25a25c5343c889d8c9e45b65082ddb55cf36d52)
2014-09-30 16:48:27 -07:00
Arun C. Murthy d3e61c96b5 Branching for hadoop-2.6 2014-09-30 10:38:47 -07:00
Arun C. Murthy 6a60fa279a Preparing to branch hadoop-2.6 2014-09-30 10:37:03 -07:00
cnauroth 57b145c3ab HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA.
(cherry picked from commit b9158697a4)
2014-09-30 08:58:39 -07:00
cnauroth 781833f553 HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is required on Mac. Contributed by Chris Nauroth.
(cherry picked from commit 8dc4e9408f)
2014-09-30 08:35:35 -07:00
Brandon Li aa3d6d374d HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li
(cherry picked from commit c88c6c57aa)
2014-09-29 15:08:19 -07:00
Andrew Wang 758fb8465a HADOOP-11153. Make number of KMS threads configurable. (wang)
(cherry picked from commit 64aef18965)
2014-09-29 15:04:26 -07:00
Andrew Wang 47ddaee1db HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang)
(cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd)
2014-09-29 15:00:28 -07:00
Andrew Wang d551a95fc4 Move HDFS-7157 to HDFS CHANGES.txt
(cherry picked from commit a45b331cc9)
2014-09-29 13:17:28 -07:00
Andrew Wang 2028414ebe HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang)
(cherry picked from commit a78953c974)
2014-09-29 13:10:35 -07:00
Colin Patrick Mccabe c412652820 HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit b3d5d269a7)
2014-09-29 11:30:32 -07:00
Jason Lowe 0cfff28f57 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee
(cherry picked from commit cf4631d7c9)
2014-09-29 14:37:28 +00:00
Steve Loughran 7fabec3258 HADOOP-11143 NetUtils.wrapException loses inner stack trace on BindException 2014-09-27 21:06:31 +01:00
Jian He a6879b606e MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA
(cherry picked from commit 5f16c98ad6)
2014-09-26 18:06:19 -07:00
Allen Wittenauer 0341c65519 HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm (Kenji Kikushima via aw) 2014-09-26 14:57:20 -07:00
Allen Wittenauer f894d187ed HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry Saputra via aw) 2014-09-26 14:41:53 -07:00
Allen Wittenauer 67d6fc3f01 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:26:36 -07:00
Jason Lowe 50a5227dad HADOOP-11048. user/custom LogManager fails to load if the client classloader is enabled. Contributed by Sangjin Lee
(cherry picked from commit f154ebe8c4)
2014-09-26 19:51:18 +00:00
Allen Wittenauer 27f9edceed HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw) 2014-09-26 12:01:41 -07:00
Allen Wittenauer 424b1f6955 HADOOP-8808. Update FsShell documentation to mention deprecation of some of the commands, and mention alternatives (Akira AJISAKA via aw) 2014-09-26 11:11:30 -07:00
Colin Patrick Mccabe b5b4cb4d64 HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe)
(cherry picked from commit 55302ccfba)
2014-09-26 10:34:42 -07:00
Andrew Wang 0eaa4ba026 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu.
(cherry picked from commit 4ea77efa3a)
2014-09-25 21:56:35 -07:00
Andrew Wang 3f71a15813 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang)
(cherry picked from commit e96ce6f3e3)

Conflicts:
	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/namenode/FSNamesystem.java
2014-09-25 18:42:17 -07:00
Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk
Conflicts:
	hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
	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/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.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/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java
2014-09-26 04:47:25 +08:00
Colin Patrick Mccabe cb9283549f HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe)
(cherry picked from commit 1861b32eb5)
2014-09-25 13:22:35 -07:00
Vinayakumar B 1e097ba429 HADOOP-11101. How about inputstream close statement from catch block to finally block in FileContext#copy() ( Contributed by skrho )
(cherry picked from commit dff95f7af8)
2014-09-25 12:47:41 +05:30
Allen Wittenauer ea1fb1461a HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:39:55 -07:00
cnauroth 6e5194099c HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth.
(cherry picked from commit cbf0ae742a)
2014-09-24 15:33:18 -07:00
Andrew Wang 3cf28210ec HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) 2014-09-24 12:11:45 -07:00
Karthik Kambatla b34858c1f8 HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha)
(cherry picked from commit ef784a2e08)
2014-09-23 17:08:23 -07:00
Steve Loughran 273fb3a78c HADOOP-11111 MiniKDC to use locale EN_US for case conversions: hadoop-common/CHANGES.TXT 2014-09-23 10:56:55 +01:00
Steve Loughran 88792c1b29 HADOOP-11111 MiniKDC to use locale EN_US for case conversions 2014-09-23 10:54:58 +01:00
Vinayakumar B 1fe3086bdb HADOOP-10131. NetWorkTopology#countNumOfAvailableNodes() is returning wrong value if excluded nodes passed are not part of the cluster tree (Contributed by Vinayakumar B)
(cherry picked from commit eab15af12c)
2014-09-22 11:29:04 +05:30