Commit Graph

3104 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli e591c4f4dc MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1379146 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:04:05 +00:00
Robert Joseph Evans 0fb6e7626f HADOOP-8726. The Secrets in Credentials are not available to MR tasks (daryn and Benoy Antony via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379105 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:59:53 +00:00
Daryn Sharp fb2d784ef9 merge -r 1379092:1379093 from trunk. FIXES: HDFS-3861
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379096 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:50:24 +00:00
Thomas White 9f94b89742 Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 17:14:07 +00:00
Tsz-wo Sze e80fffcf66 svn merge -c 1378969 from trunk for HADOOP-8748. Refactor DFSClient retry utility methods to a new class in org.apache.hadoop.io.retry.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378972 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 14:53:45 +00:00
Thomas White ebbb304022 Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:02:31 +00:00
Alejandro Abdelnur c38e558397 HADOOP-8747. Syntax error on cmake version 2.6 patch 2 in JNIFlags.cmake. (cmccabe via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378771 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 23:41:21 +00:00
Eli Collins 7b6592a459 HADOOP-8737. cmake: always use JAVA_HOME to find libjvm.so, jni.h, jni_md.h. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378445 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 05:31:50 +00:00
Aaron Myers a210679c9a HDFS-3864. NN does not update internal file mtime for OP_CLOSE when reading from the edit log. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378414 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 01:22:38 +00:00
Aaron Myers 3880b0dff3 HDFS-3849. When re-loading the FSImage, we should clear the existing genStamp and leases. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378365 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:12:10 +00:00
Robert Joseph Evans a88454abb7 MAPREDUCE-4600. TestTokenCache.java from MRV1 no longer compiles (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378267 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 18:53:53 +00:00
Aaron Myers a12b8e3d6c HDFS-3860. HeartbeatManager#Monitor may wrongly hold the writelock of namesystem. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378229 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 17:02:33 +00:00
Alejandro Abdelnur 5d74838376 HADOOP-8738. junit JAR is showing up in the distro (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378177 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 15:32:28 +00:00
Suresh Srinivas d7d3c48b06 HDFS-8619. Merging change from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378127 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 13:31:10 +00:00
Vinod Kumar Vavilapalli 57c4f237e2 YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377961 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377963 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 03:33:20 +00:00
Vinod Kumar Vavilapalli 14b1cf459b MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 02:05:25 +00:00
Eli Collins aa92e2ab65 Fixup CHANGELOG for HDFS-3856.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377937 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:45:58 +00:00
Eli Collins 7abd25795b HDFS-3856. TestHDFSServerPorts failure is causing surefire fork failure. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377935 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:42:52 +00:00
Siddharth Seth a1c556ca19 merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:41:03 +00:00
Siddharth Seth d2b4457eaf merge YARN-37 from trunk. Change TestRMAppTransitions to use the DrainDispatcher. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377805 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 19:38:24 +00:00
Siddharth Seth 00874120d2 merge YARN-29 from trunk. Add a yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377782 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:30:42 +00:00
Eli Collins 0e5d96e3ee HDFS-3731. Release upgrade must handle blocks being written from 1.0. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377548 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 01:07:04 +00:00
Eli Collins 804c45867a HDFS-3853. Port MiniDFSCluster enableManagedDfsDirsRedundancy. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377545 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 00:11:39 +00:00
Aaron Myers 6cac9aa7f9 HDFS-3683. Edit log replay progress indicator shows >100% complete. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377368 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 00:32:08 +00:00
Siddharth Seth bf08346d3c merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 02:25:12 +00:00
Suresh Srinivas 5998a179b4 HDFS-3844. Merge change 1377168 from trunk. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377176 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 01:23:52 +00:00
Alejandro Abdelnur 2ff2b79e33 MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 23:38:21 +00:00
Tsz-wo Sze a26cfc347f svn merge -c 1376928 from trunk for HDFS-3177. Update DFSClient and DataXceiver to handle different checkum types in file checksum computation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376937 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:24:59 +00:00
Robert Joseph Evans 6175155cf4 svn merge -c 1376929 FIXES: HADOOP-8725. MR is broken when security is off (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376931 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:17:45 +00:00
Alejandro Abdelnur 76755a9374 HADOOP-8031. Configuration class fails to find embedded .jar resources; should use URL.openStream() (genman via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376775 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 23:28:50 +00:00
Alejandro Abdelnur eb04620e43 HADOOP-4572. Can not access user logs - Jetty is not configured by default to serve aliases/symlinks (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376755 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 22:54:24 +00:00
Eli Collins f068e8db4b Revert HDFS-3837. Fix DataNode.recoverBlock findbugs warning.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376702 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 21:09:23 +00:00
Eli Collins 7f16809a3b Amend previous commit to remove TestFileCreationNamenodeRestart.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376699 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 21:03:25 +00:00
Eli Collins 7138f2b44f HDFS-3715. Fix TestFileCreation#testFileCreationNamenodeRestart. Contributed by Andrew Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376692 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 20:52:30 +00:00
Robert Joseph Evans dc0376d6c5 svn merge -c 1376653 FIXES: HADOOP-8709. globStatus changed behavior from 0.20/1.x (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376655 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 19:19:19 +00:00
Aaron Myers 6b62c018e3 MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376634 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:25:10 +00:00
Robert Joseph Evans bc5f02bac0 svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:07:59 +00:00
Robert Joseph Evans 16ca767f0f svn merge -c 1376592 FIXES: HADOOP-8655. Fix TextInputFormat for large deliminators. (Gelesh via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376594 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 16:59:26 +00:00
Robert Joseph Evans 4219f17597 svn merge -c 1376543 FIXES: HADOOP-8632. Configuration leaking class-loaders (Costin Leau via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376546 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 15:26:42 +00:00
Jitendra Nath Pandey 041a1e0a52 Merged from trunk for HDFS-3819.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376360 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 04:05:12 +00:00
Alejandro Abdelnur 6e831b0f5e MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 00:24:36 +00:00
Eli Collins 135a721b0f HADOOP-8075. Lower native-hadoop library log from info to debug. Contributed by Hızır Sefa İrken
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376323 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 00:01:35 +00:00
Aaron Myers 0490537635 MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 22:45:30 +00:00
Alejandro Abdelnur d7a90bc552 MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:23:09 +00:00
Aaron Myers e6bb7bf1a8 HADOOP-8721. ZKFC should not retry 45 times when attempting a graceful fence during a failover. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376195 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:56:02 +00:00
Aaron Myers 4e75deb4e7 HDFS-3835. Long-lived 2NN cannot perform a checkpoint if security is enabled and the NN restarts with outstanding delegation tokens. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376189 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:48:32 +00:00
Suresh Srinivas 8c28ebabcd HDFS-3832. Merging change 1376139 from trunk to branch-2. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376145 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 17:05:38 +00:00
Eli Collins 8340bb151e HDFS-3837. Fix DataNode.recoverBlock findbugs warning. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376130 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:28:22 +00:00
Eli Collins 1a6cb06197 HADOOP-8720. TestLocalFileSystem should use test root subdirectory. Contributed by Vlad Rozov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376124 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:22:55 +00:00
Eli Collins 095553e7a6 HDFS-3830. test_libhdfs_threaded: use forceNewInstance. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376122 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:19:43 +00:00