Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,764 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1966 Commits

Author SHA1 Message Date
Kihwal Lee 45b6dea95f 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:08 -05:00
Karthik Kambatla 160aebcae2 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) 
(cherry picked from commit 3c5f5af118)
 2014-10-28 18:08:00 -07:00
Karthik Kambatla 0aec884704 HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha) 
(cherry picked from commit 1a78082338)
 2014-10-28 17:31:55 -07:00
cnauroth c2790932bd 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
 2014-10-28 14:17:35 -07:00
yliu 8b812a35b8 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:16:34 +08:00
yliu 2e156f01a2 HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) 2014-10-28 14:44:13 +08:00
cnauroth 5dbd27f8b4 HDFS-6934. Revert files accidentally committed. 
(cherry picked from commit 5b1dfe78b8)
 2014-10-27 12:15:47 -07:00
cnauroth 3d67da502a 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
 2014-10-27 11:50:47 -07:00
Jian He 2d3c64943d 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:37 -07:00
Harsh J c88ac8a738 HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java. Contributed by Abhiraj Butala. (harsh) 2014-10-27 19:13:50 +05:30
Vinod Kumar Vavilapalli b1e17d2dab HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt. 
(cherry picked from commit 9ada9284d8)
 2014-10-26 11:26:18 -07:00
Vinod Kumar Vavilapalli 36d3f1fcca 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:15:45 -07:00
Byron Wong d991cd52d8 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. 2014-10-25 12:39:03 -07:00
Jian He 299c9b456d 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
 2014-10-24 12:54:00 -07:00
Colin Patrick Mccabe caa658a015 HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe) 
(cherry picked from commit 5b56ac4c72)
 2014-10-23 19:15:08 -07:00
Karthik Kambatla c99d89f2c6 HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha) 
(cherry picked from commit db45f047ab)
 2014-10-23 17:06:36 -07:00
Colin Patrick Mccabe a36fd88671 HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in SpanReceiverHost (cmccabe) 
(cherry picked from commit 7ab754545d)
 2014-10-23 13:26:10 -07:00
Jian He 1c235a4448 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)
 2014-10-22 15:58:26 -07:00
Karthik Kambatla b3bb4fdc7c HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. (Arun Suresh via kasha) 
(cherry picked from commit 70719e5c62)
 2014-10-22 14:33:56 -07:00
Haohui Mai 3476b9630f HADOOP-10748. HttpServer2 should not load JspServlet. Contributed by Haohui Mai. 2014-10-22 14:26:57 -07:00
cnauroth a066134277 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch. 
(cherry picked from commit 6637e3cf95)
 2014-10-21 12:34:58 -07:00
Brandon Li c800e058ea HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li 
(cherry picked from commit 4e134a02a4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-21 11:55:18 -07:00
Brandon Li 33e020cb19 HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li 2014-10-21 11:01:27 -07:00
Karthik Kambatla f8e4cec08a HADOOP-11194. Ignore .keep files (kasha) 
(cherry picked from commit d5084b9fa3)
 2014-10-20 11:29:49 -04:00
Vinod Kumar Vavilapalli 5e239640f9 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:08 -07:00
arp 0ee251ea26 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 13:42:04 -07:00
cnauroth a181daf458 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 13:42:03 -07:00
arp 6916d41fe6 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 13:42:03 -07:00
arp e4ef0023b8 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 13:42:02 -07:00
arp 5f86ce7ea9 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 13:42:02 -07:00
arp 08cc08adb3 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 13:42:01 -07:00
Ravi Prakash a85767f376 HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) Fix CHANGES.txt 2014-10-16 16:53:38 -07:00
Ravi Prakash 08eeb3e5b6 HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) 
(cherry picked from commit 466f08792f)
 2014-10-15 15:52:46 -07:00
Zhijie Shen bec165e163 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:56:44 -07:00
Zhijie Shen 8aeda20b25 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:37:28 -07:00
Haohui Mai 262fef119e HADOOP-11198. Fix typo in javadoc for FileSystem#listStatus(). Contributed by Li Lu. 2014-10-13 20:43:17 -07:00
Aaron T. Myers f3132eee10 HADOOP-11176. KMSClientProvider authentication fails when both currentUgi and loginUgi are a proxied user. Contributed by Arun Suresh. 
(cherry picked from commit 0e57aa3bf6)
 2014-10-13 18:10:23 -07:00
Karthik Kambatla 88455173e8 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) 
(cherry picked from commit cc93e7e683)
 2014-10-13 16:32:42 -07:00
Haohui Mai 16710758f1 HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao. 2014-10-10 23:02:41 -07:00
Haohui Mai f11c8eb096 HDFS-6252. Phase out the old web UI in HDFS. Contributed by Haohui Mai. 2014-10-10 17:10:54 -07:00
Andrew Wang 217c0405d9 HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) 
(cherry picked from commit d3d3d47202)
 2014-10-10 13:40:53 -07:00
Colin Patrick Mccabe 4c0bc45978 HDFS-7198. Fix "unchecked conversion" warning in DFSClient#getPathTraceScope (cmccabe) 
(cherry picked from commit 1ceb326933)
 2014-10-10 13:04:16 -07:00
Aaron T. Myers 8cbacb37e9 HDFS-7026. Introduce a string constant for "Failed to obtain user group info...". Contributed by Yongjun Zhang. 
(cherry picked from commit cbd21fd13b)
 2014-10-09 18:53:03 -07:00
Colin Patrick Mccabe 8addbe2b8e HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe) 
(cherry picked from commit d8d628d1e0)
 2014-10-09 17:12:24 -07:00
Andrew Wang 6cc8ec980c 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:32 -07:00
Andrew Wang 971eb31d28 HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang) 
(cherry picked from commit d7b647f0ee)
 2014-10-09 11:58:51 -07:00
cnauroth 4e544c84e9 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth. 2014-10-09 11:55:59 -07:00
cnauroth 5af4c021cc HADOOP-11175. Fix several issues of hadoop security configuration in user doc. Contributed by Yi Liu. 
(cherry picked from commit 1123a06e36)
 2014-10-09 11:11:13 -07:00
Uma Maheswara Rao G 7d63b4f273 HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider (Yi Liu via umamahesh) 
(cherry picked from commit 8d7c54967d)
 2014-10-09 20:20:27 +05:30
Aaron T. Myers afaadd6535 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)
 2014-10-08 18:02:00 -07:00
Colin Patrick Mccabe f1feaae1dd HDFS-7202. Should be able to omit package name of SpanReceiver on "hadoop trace -add" (iwasakims via cmccabe) 
(cherry picked from commit d996235285)
 2014-10-08 18:01:22 -07:00
Zhijie Shen f27a88562e 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:37:57 -07:00
Colin Patrick Mccabe 19c307f36a CHANGES.txt: move HADOOP-10404 underneath branch 2.6 2014-10-08 14:01:50 -07:00
Andrew Wang d9aa0f8333 HADOOP-11166. Remove ulimit from test-patch.sh. 
(cherry picked from commit 60f0f6fcde)
 2014-10-07 17:30:16 -07:00
Andrew Wang 6546c59745 Fixup for CHANGES.txt 
(cherry picked from commit 0263656247)
 2014-10-07 14:59:17 -07:00
Andrew Wang 52c8ac90ea HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang via wang) 
(cherry picked from commit 4b2834898c)
 2014-10-07 14:57:09 -07:00
Andrew Wang 3e897da5fc 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:47:14 -07:00
Kihwal Lee 7910c6d035 HADOOP-11007. Reinstate building of ant tasks support. Contributed by 
Jason Lowe.
(cherry picked from commit 99d7a452be)
 2014-10-07 16:23:52 -05:00
Colin Patrick Mccabe 2a8f824fb7 HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 9196db9a08)
 2014-10-07 11:57:09 -07:00
Haohui Mai 70c8cb5614 HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. 2014-10-06 22:07:29 -06:00
Colin Patrick Mccabe b5158c8d24 HADOOP-10404. Commit correct version of patch (cmccabe) 
(cherry picked from commit 687d83c9e1)
 2014-10-06 14:45:04 -07:00
Colin Patrick Mccabe c97134d054 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 
(cherry picked from commit 8099de259f)
 2014-10-06 14:41:14 -07:00
Arun C. Murthy c5828c624f HADOOP-10731. Sync-ing CHANGES.txt across branches. 2014-10-05 07:51:27 -07:00
Arun C. Murthy 7dd508b880 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan. 
(cherry picked from commit 8f9ab998e2)
 2014-10-05 07:42:10 -07:00
cnauroth 1329d1e701 HADOOP-11163. Correct CHANGES.txt. 
(cherry picked from commit bbb3b1acc0)
 2014-10-03 21:07:40 -07:00
cnauroth a828ef15b0 HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu. 
(cherry picked from commit 69c9af9103)
 2014-10-03 21:05:05 -07:00
Colin Patrick Mccabe b335df9a9b HDFS-7055. Add tracing to DFSInputStream (cmccabe) 
(cherry picked from commit 7f6ed7fe36)
 2014-10-03 13:38:15 -07:00
Andrew Wang 9ebff016c2 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh. 
(cherry picked from commit 2d8e6e2c4a)
 2014-10-02 19:59:56 -07:00
Haohui Mai ebeb9da80c HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. 2014-10-02 14:08:01 -07:00
Andrew Wang 6dbba19469 HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang) 
(cherry picked from commit 6ac10516e7)
 2014-10-02 13:54:56 -07:00
Haohui Mai 63ad22be48 HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. 2014-10-01 13:19:05 -07:00
Vinod Kumar Vavilapalli 64bed0460e 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)
 2014-10-01 09:55:57 -07:00
Steve Loughran 49be85005e HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel) 2014-09-30 17:28:56 -07:00
Andrew Wang 489b4008df 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:17 -07:00
Andrew Wang d4c5a39270 HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). Contributed by Zhihai Xu. 
(cherry picked from commit d7075ada5d)
 2014-09-30 16:40:00 -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