Commit Graph

1530 Commits

Author SHA1 Message Date
Arun Murthy 418773f44e Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530128 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:03:29 +00:00
Arun Murthy 43c7a834dc Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529750 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:17:00 +00:00
Vinod Kumar Vavilapalli f0799c5536 MAPREDUCE-5562. Fixed MR App Master to perform pending tasks like staging-dir cleanup, sending job-end notification correctly when unregister with RM fails. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529682 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 20:53:28 +00:00
Vinod Kumar Vavilapalli 21181b6553 YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529662 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:43:36 +00:00
Vinod Kumar Vavilapalli d4324eef14 MAPREDUCE-5533. Fixed MR speculation code to track any TaskAttempts that aren't heart-beating for a while, so that we can aggressively speculate instead of waiting for task-timeout. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529229 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 17:26:56 +00:00
Chris Nauroth 65cd7bf6b1 MAPREDUCE-5442. $HADOOP_MAPRED_HOME/$HADOOP_CONF_DIR setting not working on Windows. Contributed by Yingda Chen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529077 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 05:37:54 +00:00
Hitesh Shah 6ff600d9e3 YARN-1131. logs command should return an appropriate error message if YARN application is still running. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529068 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 02:36:17 +00:00
Bikas Saha fb3f338c65 MAPREDUCE-5489. MR jobs hangs as it does not use the node-blacklisting feature in RM requests (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529005 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:14:35 +00:00
Jonathan Turner Eagles 7b687dda09 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529003 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:04:12 +00:00
Sanford Ryza 90a5dc34f7 MAPREDUCE-5554. hdfs-site.xml included in hadoop-mapreduce-client-jobclient tests jar is breaking tests for downstream components (Robert Kanter via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528643 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:53:57 +00:00
Arun Murthy 3c7813bbad MAPREDUCE-5459. Update documentation on how to run MRv1 examples on YARN. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528626 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:08:27 +00:00
Arun Murthy 07ee205038 MAPREDUCE-5530. Fix compat with hadoop-1 in mapred.lib.CombinFileInputFormat by re-introducing isSplittable(FileSystem, Path) api and ensuring semantic compatibility. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 16:08:45 +00:00
Vinod Kumar Vavilapalli 82f4348f27 MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528251 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:52:25 +00:00
Jason Darrell Lowe db06f1bcb9 MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528237 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:34:31 +00:00
Sanford Ryza cc8a0cab59 MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528196 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 20:01:20 +00:00
Arun Murthy 9c24615ae6 MAPREDUCE-5551. Fix compat with hadoop-1 in SequenceFileAsBinaryOutputFormat.WritableValueBytes by re-introducing missing constructors. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527848 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 01:24:27 +00:00
Vinod Kumar Vavilapalli aa12a7914f MAPREDUCE-5538. Fixed MR AppMaster to send job-notification URL only after the job is really done - a bug caused by MAPREDUCE-5505. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527219 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 19:14:16 +00:00
Arun Murthy a40810d267 MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527048 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:42:34 +00:00
Jason Darrell Lowe 711abc3827 MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow times out. Contributed by Robert Kanter
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527037 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:14:07 +00:00
Arun Murthy 58f40d3bf4 MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527033 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:08:28 +00:00
Jason Darrell Lowe 2627e352d6 MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527015 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 18:19:41 +00:00
Arun Murthy 96c11fe602 MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526735 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 23:02:51 +00:00
Jason Darrell Lowe cf3d8b2286 MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526688 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 21:10:05 +00:00
Chris Nauroth 7e73b9cde6 MAPREDUCE-5525. Increase timeout of TestDFSIO.testAppend and TestMRJobsWithHistoryService.testJobHistoryData. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526624 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:45:14 +00:00
Colin McCabe 8a66e493ba HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526567 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:30 +00:00
Vinod Kumar Vavilapalli 476eca47b5 MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526377 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:30:08 +00:00
Vinod Kumar Vavilapalli fb48b6cdc9 MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526362 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 03:00:28 +00:00
Bikas Saha 524dad1109 MAPREDUCE-5505. Clients should be notified job finished only after job successfully unregistered (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526071 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:46:48 +00:00
Siddharth Seth 10a4289ebf YARN-1229. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:35:03 +00:00
Vinod Kumar Vavilapalli 78e995a37d YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525947 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 17:20:18 +00:00
Robert Joseph Evans 743d8ae055 MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525670 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:33:12 +00:00
Vinod Kumar Vavilapalli 13420d01f2 YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524864 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:35:58 +00:00
Vinod Kumar Vavilapalli af78fd729c MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524856 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 22:35:12 +00:00
Thomas Graves 6b1f5073a7 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524841 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:58:18 +00:00
Sanford Ryza c09f00771e MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524408 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 13:44:33 +00:00
Arun Murthy 492ecd34c4 Preparing for hadoop-2.1.1-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523890 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:16:21 +00:00
Arun Murthy 59587d9fad MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523660 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:18:42 +00:00
Arun Murthy 60a1a70197 YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contibuted by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523652 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:04:04 +00:00
Alejandro Abdelnur e60b057c0a MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523605 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 12:17:17 +00:00
Bikas Saha ec010a2936 YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523376 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 01:01:06 +00:00
Bikas Saha f4951e0708 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523146 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:51:50 +00:00
Devarajulu K a202855af5 MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS. Contributed by Nemon Lou.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1522595 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 14:32:20 +00:00
Vinod Kumar Vavilapalli 1c1ebc1553 MAPREDUCE-5497. Changed MRAppMaster to sleep only after doing everything else but just before ClientService to avoid race conditions during RM restart. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1521699 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 00:38:49 +00:00
Thomas Graves 75c31df9dd MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1521576 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 18:31:50 +00:00
Devarajulu K b2af6c7024 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520964 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 06:42:42 +00:00
Jason Darrell Lowe 5540d77e2f MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520156 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 22:23:40 +00:00
Sanford Ryza 236b8530bd HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1519129 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:09:45 +00:00
Sanford Ryza 2cc851a66e MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518857 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 23:45:16 +00:00
Vinod Kumar Vavilapalli 5d4b684c02 MAPREDUCE-5441. Changed MR AM to return RUNNING state if exiting when RM commands to reboot, so that client can continue to track the overall job. Contributed by xJian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518821 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 21:07:57 +00:00
Alejandro Abdelnur a29714f077 MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518772 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 19:24:41 +00:00