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

7273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsz-Wo Nicholas Sze
80bd4d88eb Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after 
merge.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-09-26 04:57:45 +08: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
cnauroth
fd3aa38231 HDFS-7119. Split error checks in AtomicFileOutputStream#close into separate conditions to improve diagnostics. Contributed by Chris Nauroth. 
(cherry picked from commit 9f9a2222a2e142a47537bc57ca98fb07a7a78ad4)
 2014-09-25 13:35:40 -07: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 1861b32eb551a07d748afc6205ea9573f9503eda)
 2014-09-25 13:22:35 -07:00
Allen Wittenauer
7ffb636a54 MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) 2014-09-25 11:33:01 -07:00
cnauroth
6bace90b29 HDFS-7127. TestLeaseRecovery leaks MiniDFSCluster instances. Contributed by Chris Nauroth. 
(cherry picked from commit b607c3c3636064c28202cb71887a77e74b1168f2)
 2014-09-25 11:29:15 -07:00
Allen Wittenauer
afde00a0f5 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) 2014-09-25 11:28:50 -07:00
cnauroth
94517982a9 HDFS-7111. TestSafeMode assumes Unix line endings in safe mode tip. Contributed by Chris Nauroth. 
(cherry picked from commit dc2ebf88a8e6fdf752b3f67933ff6c276ab90921)
 2014-09-25 11:21:07 -07:00
cnauroth
707a7dbd24 HDFS-7118. Improve diagnostics on storage directory rename operations by using NativeIO#renameTo in Storage#rename. Contributed by Chris Nauroth. 
(cherry picked from commit e0b1dc514f1b9e26b21d97ece0d94cd9c827fc59)
 2014-09-25 10:06:09 -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 dff95f7af899a4f2add791afbd20c8a1e33c7a36)
 2014-09-25 12:47:41 +05:30
Zhijie Shen
83926b3c57 YARN-2546. Made REST API for application creation/submission use numeric and boolean types instead of the string of them. Contributed by Varun Vasudev. 
(cherry picked from commit 72b0881ca641fa830c907823f674a5c5e39aa15a)
 2014-09-24 17:58:48 -07:00
Zhijie Shen
3a2e400377 YARN-2581. Passed LogAggregationContext to NM via ContainerTokenIdentifier. Contributed by Xuan Gong. 
(cherry picked from commit c86674a3a4d99aa56bb8ed3f6df51e3fef215eba)
 2014-09-24 17:51:54 -07:00
Andrew Wang
835ade7064 HDFS-7138. Fix hftp to work with encryption. (clamb via wang) 2014-09-24 16:45:29 -07:00
Andrew Wang
a17544e5e3 HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang) 
(cherry picked from commit 63198bfba7b899b33f26c079bc8241dad1bdbc57)
 2014-09-24 16:40:40 -07:00
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 cbf0ae742ae3db964550df11c4044d3e16013959)
 2014-09-24 15:33:18 -07:00
Karthik Kambatla
30165d4cdd YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha) 
(cherry picked from commit 39c87344e16a08ab69e25345b3bce92aec92db47)
 2014-09-24 15:24:17 -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
Haohui Mai
53c2288dc6 HDFS-7049. TestByteRangeInputStream.testPropagatedClose fails and throw NPE on branch-2. Contributed by Juan Yu. 2014-09-24 12:07:26 -07:00
Vinod Kumar Vavilapalli
5d251d99d6 YARN-2102. Added the concept of a Timeline Domain to handle read/write ACLs on Timeline service event data. Contributed by Zhijie Shen. 
(cherry picked from commit d78b452a4f413c6931a494c33df0666ce9b44973)
 2014-09-24 11:29:01 -07:00
Jason Lowe
d5d9fd3255 MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai 
(cherry picked from commit 7af4c3888bf7be0822dc880170e5e3d09e9280f1)
 2014-09-24 16:10:28 +00:00
Allen Wittenauer
e5a531a8a7 YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) 2014-09-24 08:48:42 -07:00
Allen Wittenauer
151281bfca HDFS-6534. Fix build on macosx: HDFS parts (Binglin Chang via aw) 2014-09-24 08:35:31 -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 ef784a2e08c2452026a85ae382a956ff7deecbd0)
 2014-09-23 17:08:23 -07:00
cnauroth
fd3003d63b HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows. Contributed by Chris Nauroth. 
(cherry picked from commit b93d9603a25b6b93f67c69503130164eef047876)
 2014-09-23 14:44:26 -07:00
Andrew Wang
0d116b18de HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb. 
(cherry picked from commit f48686a1ad81823000534665a76264bba51182f4)
 2014-09-23 14:10:40 -07:00
Zhijie Shen
19cfe2f800 YARN-2569. Added the log handling APIs for the long running services. Contributed by Xuan Gong. 
(cherry picked from commit 5338ac416ab8ab3e7e0a7bfb4a53151fc457f673)
 2014-09-23 10:38:27 -07:00
cnauroth
ac3b62dae7 HDFS-7126. TestEncryptionZonesWithHA assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 
(cherry picked from commit a1fd804a314481065c849cb8e1d7c75494e24660)
 2014-09-23 08:22:04 -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
Karthik Kambatla
024bcfdc0d YARN-2252. Intermittent failure of TestFairScheduler.testContinuousScheduling. (Ratandeep Ratti and kasha via kasha) 
(cherry picked from commit f5578207d2d20aa71adf12aa9f6c37b00ee9b8dc)
 2014-09-23 00:03:47 -07:00
Karthik Kambatla
8ba8521de5 YARN-1959. Fix headroom calculation in FairScheduler. (Anubhav Dhoot via kasha) 
(cherry picked from commit 568d3dc2bbe43b7d2833d5da2b0e6d75eb86e5dd)
 2014-09-22 23:51:45 -07:00
junping_du
34ee084c3d YARN-2584. TestContainerManagerSecurity fails on trunk. (Contributed by Jian He) 
(cherry picked from commit a9a55db0650b5e6b7d88afb883b88aba7a13cd44)
 2014-09-22 22:47:59 -07:00
Colin Patrick Mccabe
cac7063b31 HDFS-7001. Tests in TestTracing should not depend on the order of execution. (iwasakims via cmccabe) 
(cherry picked from commit 7b8df93ce1b7204a247e64b394d57eef748e73aa)
 2014-09-22 17:22:42 -07:00
Karthik Kambatla
3984435661 YARN-2539. FairScheduler: Set the default value for maxAMShare to 0.5. (Wei Yan via kasha) 
(cherry picked from commit 43efdd30b52f4ee8967a03dac4d548095d6cafdb)
 2014-09-22 16:10:20 -07:00
Karthik Kambatla
24a814771e YARN-2540. FairScheduler: Queue filters not working on scheduler page in RM UI. (Ashwin Shankar via kasha) 
(cherry picked from commit 23e17ce0ffba11a08c033b753573a756532cd1c2)
 2014-09-22 15:42:36 -07:00
Colin Patrick Mccabe
d7b0e9382d HDFS-7106. Reconfiguring DataNode volumes does not release the lock files in removed volumes. (cnauroth via cmccabe) 
(cherry picked from commit 912ad32b03c1e023ab88918bfa8cb356d1851545)
 2014-09-22 11:52:01 -07:00
Zhijie Shen
b8d645539d MAPREDUCE-5279. Made MR headroom calculation honor cpu dimension when YARN scheduler resource type is memory plus cpu. Contributed by Peng Zhang and Varun Vasudev. 2014-09-22 10:41:55 -07:00
Jian He
3ce97a9efd YARN-1372. Ensure all completed containers are reported to the AMs across RM restart. Contributed by Anubhav Dhoot 
(cherry picked from commit 0a641496c706fc175e7bf66d69ebf71c7d078e84)
 2014-09-22 10:32:44 -07:00
cnauroth
39bcc57c3e HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 
(cherry picked from commit 26cba7f35ff24262afa5d8f9ed22f3a7f01d9a71)
 2014-09-22 09:07:41 -07:00
Jason Lowe
f4534746fb MAPREDUCE-6095. Enable DistributedCache for uber-mode Jobs. Contributed by Gera Shegalov 
(cherry picked from commit 7039b98e1c459e9e0d8caa28cdaa2868e2bde2eb)
 2014-09-22 15:22:58 +00:00
Karthik Kambatla
c1a3819a4d YARN-2453. TestProportionalCapacityPreemptionPolicy fails with FairScheduler. (Zhihai Xu via kasha) 
(cherry picked from commit 9721e2c1feb5aecea3a6dab5bda96af1cd0f8de3)
 2014-09-21 23:14:27 -07: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 eab15af12c114eef4e9abd9af2ba03b0ab2cc441)
 2014-09-22 11:29:04 +05:30
Karthik Kambatla
1714af0618 YARN-2452. TestRMApplicationHistoryWriter fails with FairScheduler. (Zhihai Xu via kasha) 
(cherry picked from commit c50fc92502934aa2a8f84ea2466d4da1e3eace9d)
 2014-09-21 13:15:45 -07:00
cnauroth
4a77729a1c HDFS-7110. Skip tests related to short-circuit read on platforms that do not currently implement short-circuit read. Contributed by Chris Nauroth. 
(cherry picked from commit b6fd5ccbce25f390c0e348d296b4fe1f8b9b738f)
 2014-09-21 12:37:37 -07:00
cnauroth
465ba7fe31 HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth. 
(cherry picked from commit 0795fe3721cf86ed89d5e9058c977a1113247d08)
 2014-09-20 21:01:52 -07:00
cnauroth
3ad3f034bb HDFS-7107. Avoid Findbugs warning for synchronization on AbstractNNFailoverProxyProvider#fallbackToSimpleAuth. Contributed by Chris Nauroth. 
(cherry picked from commit 47491f9a119faf75abaa56f676ae93460583bd3f)
 2014-09-20 20:53:38 -07:00
Alejandro Abdelnur
897ced1a20 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 
(cherry picked from commit db890eef3208cc557476fa510f7a253ba22bc68a)

Conflicts:
	hadoop-project/pom.xml
 2014-09-20 08:24:34 -07:00
cnauroth
cadba3067f HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 
(cherry picked from commit f85cc14eb49a46e81d2edcdc1ffe4d0852f193a5)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.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
 2014-09-19 22:04:13 -07:00
cnauroth
9ee5e26cbb HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang. 
(cherry picked from commit 332e2e23ba6f0748a46c0bda76f426d9cad73edd)
 2014-09-19 21:06:04 -07:00