Commit Graph

3497 Commits

Author SHA1 Message Date
Suresh Srinivas 3a9aadc3c7 HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 04:48:40 +00:00
Suresh Srinivas 5fa60ed91f HDFS-4041. Merging partial of change r1397362 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397420 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 02:29:54 +00:00
Suresh Srinivas c4bfcf4478 HADOOP-8909. Merging change 1397338 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397339 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 22:25:38 +00:00
Suresh Srinivas caf5213a50 HDFS-3912. Merging change 1397211 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397219 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 18:30:36 +00:00
Arun Murthy 267bfc5ff2 Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 17:22:27 +00:00
Thomas White 0aad6f2dac Merge -r 1396971:1396972 from trunk to branch-2. Fixes: YARN-146. Add unit tests for computing fair share in the fair scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 10:30:53 +00:00
Suresh Srinivas b14cec5cc1 HADOOP-8878. Merge change 1396922 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396923 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 06:33:33 +00:00
Suresh Srinivas 93a18b3cd6 HADOOP-8913. Merging change 1396904 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396907 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 05:20:21 +00:00
Aaron Myers 98c80d3ec5 HDFS-4021. Misleading error message when resources are low on the NameNode. Contributed by Christopher Conner.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396882 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 00:34:58 +00:00
Jason Darrell Lowe eb50c308b8 svn merge -c 1396798 FIXES: HDFS-3224. Bug in check for DN re-registration with different storage ID. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396807 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 21:25:10 +00:00
Eli Collins 70e7ec1f47 HDFS-4020. TestRBWBlockInvalidation may time out. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396727 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 18:43:13 +00:00
Thomas Graves 1f4ba537fa merge -r 1396704:1396705 from trunk. FIXES: HDFS-3824
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396706 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 17:37:54 +00:00
Siddharth Seth 13fe2bd483 merge YARN-150 from trunk. Fixes AppRejectedTransition does not unregister a rejected app-attempt from the ApplicationMasterService (Contributed by Bikas Saha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396430 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 00:09:29 +00:00
Vinod Kumar Vavilapalli 9d7c8f5d89 YARN-30. Fixed tests verifying web-services to work on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1396391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396392 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 22:55:11 +00:00
Vinod Kumar Vavilapalli 011046e778 YARN-94. Modify DistributedShell to point to main-class by default, clean up the help message, and hard-code the AM class. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1396226 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396253 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 19:56:32 +00:00
Thomas White 4a63906756 Merge -r 1396046:1396047 from trunk to branch-2. Fixes: MAPREDUCE-4654. TestDistCp is ignored. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396051 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 14:49:51 +00:00
Harsh J 9a0f100130 MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 13:41:45 +00:00
Siddharth Seth 7e55280b5b merge MAPREDUCE-4705 from trunk. Fix a bug in job history lookup, which makes older jobs inaccessible despite the presence of a valid history file. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395851 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 03:24:43 +00:00
Siddharth Seth 9f60339854 merge YARN-33 from trunk. Change LocalDirsHandlerService to validate the configured local and log dirs. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395845 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 02:27:18 +00:00
Siddharth Seth b98a3a3787 merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 01:58:07 +00:00
Todd Lipcon 5a5fd34169 HADOOP-8894. GenericTestUtils.waitFor should dump thread stacks on timeout. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395826 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 00:34:04 +00:00
Eli Collins 2715385c4e HDFS-4018. TestDataNodeMultipleRegistrations#testMiniDFSClusterWithMultipleNN is missing some cluster cleanup. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395822 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 00:22:37 +00:00
Vinod Kumar Vavilapalli 1b099a7cbf YARN-40. Fixed CHANGES.txt from previous commit.
svn merge --ignore-ancestry -c 1395799 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395800 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 22:36:47 +00:00
Vinod Kumar Vavilapalli 8792f157a4 YARN-40. Provided support for missing YARN commands Contributed by Devaraj K and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1395793 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395794 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 22:19:43 +00:00
Aaron Myers c5fc614266 Revert initial commit of HADOOP-8884 per feedback from Todd.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395784 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:26:43 +00:00
Vinod Kumar Vavilapalli 59da1ac1fc YARN-127. Move RMAdmin tool to its correct location - the client module. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1395781 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:24:37 +00:00
Robert Joseph Evans 09f0aee7f8 svn merge -c 1395769 FIXES: MAPREDUCE-4554. Job Credentials are not transmitted if security is turned off (Benoy Antony via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395772 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 20:55:21 +00:00
Todd Lipcon 88a3f46ddb HDFS-4007. Rehabilitate bit-rotted unit tests under hadoop-hdfs-project/hadoop-hdfs/src/test/unit/. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395730 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 19:19:13 +00:00
Thomas Graves 279d3cc66a merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395726 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 19:04:43 +00:00
Aaron Myers 35ee354a81 HADOOP-8884. DEBUG should be WARN for DEBUG util.NativeCodeLoader: Failed to load native-hadoop with error: java.lang.UnsatisfiedLinkError. Contributed by Anthony Rojas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395718 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 18:46:15 +00:00
Eli Collins 67360e4545 HADOOP-8804. Improve Web UIs when the wildcard address is used. Contributed by Senthil Kumar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395704 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 18:21:09 +00:00
Eli Collins 2a2fec7128 HDFS-4008. TestBalancerWithEncryptedTransfer needs a timeout. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395701 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 18:12:29 +00:00
Eli Collins 99e7354cd5 HDFS-4006. TestCheckpoint#testSecondaryHasVeryOutOfDateImage occasionally fails due to unexpected exit. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395388 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 21:50:14 +00:00
Eli Collins d61d75abe5 HDFS-3682. MiniDFSCluster#init should provide more info when it fails. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395386 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 21:22:31 +00:00
Todd Lipcon 029f68bd96 HADOOP-8889. Upgrade to Surefire 2.12.3. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394880 13f79535-47bb-0310-9956-ffa450edef68
2012-10-06 00:58:29 +00:00
Aaron Myers 9a69c2d501 HDFS-3483. Better error message when hdfs fsck is run against a ViewFS config. Contributed by Stephen Fritz.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394866 13f79535-47bb-0310-9956-ffa450edef68
2012-10-06 00:16:08 +00:00
Thomas Graves 6827ab09c3 merge -r 1394608:1394609 from trunk. FIXES: HDFS-3829
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394610 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 15:52:18 +00:00
Aaron Myers 49959f95ff HDFS-3813. Log error message if security and WebHDFS are enabled but principal/keytab are not configured. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394341 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 00:56:09 +00:00
Alejandro Abdelnur ae68ae6919 YARN-23. FairScheduler: FSQueueSchedulable#updateDemand() - potential redundant aggregation. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394322 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 23:02:28 +00:00
Alejandro Abdelnur 437ce1aff0 HDFS-3999. HttpFS OPEN operation expects len parameter, it should be length. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394170 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 17:46:39 +00:00
Alejandro Abdelnur 241c528166 HADOOP-8881. FileBasedKeyStoresFactory initialization logging should be debug not info. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394166 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 17:40:54 +00:00
Eli Collins 3be0d367f4 HDFS-3916. libwebhdfs (C client) code cleanups. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393896 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 03:03:17 +00:00
Eli Collins 5705cffc35 HDFS-4000. TestParallelLocalRead fails with "input ByteBuffers must be direct buffers". Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393885 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 02:42:19 +00:00
Eli Collins 3bb5fb6f08 Amend HDFS-3753 to ignore TestHdfsNativeCodeLoader. To be fixed in HDFS-4003.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393831 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 23:38:28 +00:00
Eli Collins dd16390e9c HDFS-3996. Add debug log removed in HDFS-3873 back. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393778 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:31:04 +00:00
Siddharth Seth aa53f366c8 merge MAPREDUCE-4123 from trunk. Remove the 'mapred groups' command, which is no longer supported. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393776 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:28:49 +00:00
Siddharth Seth 60a5f6b520 merge YARN-102 from trunk. Move the apache header to the top of the file in MemStore.java. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393771 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:20:10 +00:00
Daryn Sharp 594176ed04 HADOOP-8783. Improve RPC.Server's digest auth (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393498 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 14:08:15 +00:00
Siddharth Seth 9f3f66375e merge YARN-131 from trunk. Fix incorrect ACL properties in capacity scheduler documentation. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393263 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 02:57:25 +00:00
Eli Collins 47f60c4951 HADOOP-8756. Fix SEGV when libsnappy is in java.library.path but not LD_LIBRARY_PATH. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393244 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 00:10:22 +00:00