Commit Graph

504 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
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
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 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
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
Robert Joseph Evans 81b14fae80 svn merge -c 1391679 FIXES: MAPREDUCE-4689. JobClient.getMapTaskReports on failed job results in NPE (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391680 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:18:32 +00:00
Jason Darrell Lowe f40997309e svn merge -c 1391671 FIXES: MAPREDUCE-4691. Historyserver can report "Unknown job" after RM says job has completed. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391675 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:00:42 +00:00
Arun Murthy e619da2136 Reverted MAPREDUCE-4253 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 18:43:17 +00:00
Thomas Graves e5e1887092 merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:25:05 +00:00
Arun Murthy 6667d885bb Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390226 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 23:50:03 +00:00
Konstantin Shvachko 1aba4503cf MAPREDUCE-4651. Benchmarking random reads with DFSIO. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390161 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 21:36:30 +00:00
Konstantin Shvachko 7cf9362055 MAPREDUCE-4645. Provide a random seed to Slive to make the sequence of file names deterministic. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389595 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 21:17:29 +00:00
Thomas White 9e1860bfbf Merge -r 1384832:1384833 from trunk to branch-2. Fixes: HADOOP-8780. Update DeprecatedProperties apt file.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384835 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 16:15:20 +00:00
Aaron Myers ac103a4314 HADOOP-8755. Print thread dump when tests fail due to timeout. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384628 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 01:50:35 +00:00
Vinod Kumar Vavilapalli a5e50dfae9 MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1383709 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:59:59 +00:00
Eli Collins 8644881db7 HDFS-3910. DFSTestUtil#waitReplication should timeout. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383619 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 21:28:53 +00:00
Thomas White 803905eb5a Merge -r 1383421:1383422 from trunk to branch-2. Fixes: MAPREDUCE-4607. Race condition in ReduceTask completion can result in Task being incorrectly failed. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383425 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 14:13:58 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Alejandro Abdelnur 2cdffe63d5 MAPREDUCE-4642. MiniMRClientClusterFactory should not use job.setJar() (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382094 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 17:06:55 +00:00
Robert Joseph Evans ebb1a16f62 svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:47:04 +00:00
Arun Murthy b9a3f51dcd Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 04:59:20 +00:00
Robert Joseph Evans 928e6864d3 svn merge -c 1381784 FIXES: MAPREDUCE-4641. Exception in commitJob marks job as successful in job history (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381786 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 22:22:01 +00:00
Robert Joseph Evans 2616974383 svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:22:04 +00:00
Eli Collins 515dfba075 Fix MAPREDUCE-4580 build breakage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381316 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 19:36:28 +00:00
Konstantin Shvachko 54ca8b837c MAPREDUCE-2786. Add compression option for TestDFSIO. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380308 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 18:50:28 +00:00
Jonathan Turner Eagles a64a30ce6c svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:31:23 +00:00
Thomas Graves c54a74a2cc merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:45:34 +00:00
Robert Joseph Evans 8ef7e47241 svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:39:03 +00:00
Robert Joseph Evans b2382b0cd4 svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:26:26 +00:00
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
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
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
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
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 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
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
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
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
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
Robert Joseph Evans 1ee0c23b39 svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 17:47:08 +00:00
Robert Joseph Evans f3f8edbd10 svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 15:21:30 +00:00
Thomas Graves e94632c765 merge -r 1374423:1374424 from trunk. FIXES: YARN-25
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374425 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 20:31:09 +00:00
Daryn Sharp a8f10869a8 svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 16:26:01 +00:00
Thomas White 832e7c6dc3 Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 13:27:24 +00:00
Tsz-wo Sze 1294ad1df7 svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 01:42:16 +00:00
Alejandro Abdelnur fc783dcc1e MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 23:11:00 +00:00
Alejandro Abdelnur b344870bdd HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:56:31 +00:00