58b397a05b
svn merge -c 1548197 FIXES: MAPREDUCE-5409. MRAppMaster throws InvalidStateTransitonException: Invalid event: TA_TOO_MANY_FETCH_FAILURE at KILLED for TaskAttemptImpl. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548198 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 16:32:44 +00:00
644750fc7d
MAPREDUCE-5632. TestRMContainerAllocator#testUpdatedNodes fails (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547932 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 22:18:21 +00:00
439a690ad1
Setting version to 2.4.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
6d57c95003
svn merge -c 1544266 FIXES: MAPREDUCE-5631. TestJobEndNotifier.testNotifyRetries fails with Should have taken more than 5 seconds in jdk7. Contributed by Jonathan Eagles
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544267 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 17:55:40 +00:00
1bbeb539e6
MAPREDUCE-5373. TestFetchFailure.testFetchFailureMultipleReduces could fail intermittently (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542459 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 03:34:10 +00:00
71ce967380
MAPREDUCE-5481. Enable uber jobs to have multiple reducers (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541846 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 08:06:50 +00:00
5653892571
MAPREDUCE-5613. DefaultSpeculator holds and checks hashmap that is alway empty (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541435 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 09:26:30 +00:00
d480fb0cbb
svn commit -c 1534832 FIXES: MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534835 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 22:44:25 +00:00
5ff9f8bed2
merge MAPREDUCE-5329. Allow MR applications to use additional AuxServices, which are compatible with the default MapReduce shuffle. Contributed by Avner BenHanoch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531742 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 20:19:06 +00:00
ad9515fa9b
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.
...
svn merge --ignore-ancestry -c 1529682 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529683 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 20:54:10 +00:00
4b32d6ad9a
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.
svn merge --ignore-ancestry -c 1529662 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529663 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:44:27 +00:00
856907b8db
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.
...
svn merge --ignore-ancestry -c 1529229 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529230 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 17:29:21 +00:00
53df9bdb14
Merge r1529005 from trunk to branch-2 for 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/branches/branch-2@1529007 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:06 +00:00
6daca6a93d
MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1528251 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528253 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:54:35 +00:00
3c3b52b80b
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.
...
svn merge --ignore-ancestry -c 1527219 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527221 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 19:14:46 +00:00
d36dec185e
svn commit -c 1527037 FIXES: 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/branches/branch-2@1527039 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:17:24 +00:00
78045b7abc
Merge -c 1526735 from trunk to branch-2 to fix MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526736 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 23:03:25 +00:00
a5ecb4de41
Merge r1526071 from trunk to branch-2 for 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/branches/branch-2@1526072 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:53:10 +00:00
2daddb610e
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.
svn merge --ignore-ancestry -c 1525947 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 17:20:48 +00:00
d71bb8385b
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.
svn merge --ignore-ancestry -c 1524864 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:51:14 +00:00
f0e79b8157
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/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 13:58:37 +00:00
c5ef30971e
Merge r1523376 from trunk to branch-2 for 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/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 01:07:11 +00:00
87d09e5ebe
Merge r1523146 from trunk to branch-2 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/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:57:56 +00:00
90f492e532
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.
...
svn merge --ignore-ancestry -c 1521699 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521700 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 00:39:21 +00:00
d997ca22f9
MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou.
...
svn merge --ignore-ancestry -c 1520964 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520965 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 06:46:16 +00:00
5ddee655e4
svn merge -c 1520156 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520157 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 22:32:35 +00:00
ab02296741
HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:13:11 +00:00
997e2f4fd3
MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518858 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 23:53:29 +00:00
7b8795012e
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 Jian He.
...
svn merge --ignore-ancestry -c 1518821 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518824 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 21:10:54 +00:00
35f60e71de
svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 01:23:39 +00:00
25595863d3
svn merge -c 1517085 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517086 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:55:45 +00:00
91d8768381
MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516660 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516662 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 23:17:57 +00:00
8d1cd8ddb7
svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516596 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 20:38:06 +00:00
b9cee48717
Merge -c 1516361 from trunk to branch-2 to fix MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516362 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 02:00:29 +00:00
e8268b8a5d
Merge -c 1516358 from trunk to branch-2 to fix MAPREDUCE-5468. Fix MR AM recovery for map-only jobs. Contributed by Vinod K. V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516359 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 01:53:18 +00:00
83c4906a2e
MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516238 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:18:13 +00:00
7d36680e73
svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510583 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 16:05:04 +00:00
3c08e71316
svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507586 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 07:01:51 +00:00
f487f4eb19
YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He.
...
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 03:42:52 +00:00
673b762364
svn merge -c 1506154 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506157 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 16:58:41 +00:00
83c776c85d
Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
f7080007ad
Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 00:58:33 +00:00
d82a3cd227
Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 19:04:37 +00:00
41c05101e7
Merge r1503934 from trunk to branch-2 for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503936 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:56:54 +00:00
2386e127b8
svn merge -c 1503744 to revert MAPREDUCE-5317. Stale files left behind for failed jobs
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503747 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 15:06:42 +00:00
293d42edf0
svn merge -c 1503499 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503505 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 22:30:39 +00:00
afeff43d7a
svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 14:46:54 +00:00
34dfd27833
YARN-851. Share NMTokens using NMTokenCache (api-based) between AMRMClient and NMClient instead of memory based approach which is used currently. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1495247 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495248 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 00:09:45 +00:00
aa1eba9930
merge MAPREDUCE-5334 from trunk. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494821 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 00:36:28 +00:00
d8203c0ae9
MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494687 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 16:40:20 +00:00
368c7ae735
YARN-694. Starting to use NMTokens to authenticate all communication with NodeManagers. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1494369 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494370 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 23:20:34 +00:00
af90aa5265
YARN-841. Move Auxiliary service to yarn-api, annotate and document it. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1494031 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494032 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 06:23:54 +00:00
8ac6ecc7d4
Merge -c 1494027 from trunk to branch-2 to fix YARN-840. Moved ProtoUtils to yarn.api.records.pb.impl. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494029 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 05:59:54 +00:00
5e257b8925
merge YARN-805 from trunk. Fix javadoc and annotations on classes in the yarn-api package. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493993 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 03:14:38 +00:00
c01d820c18
YARN-610. ClientToken is no longer set in the environment of the Containers. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1493968 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493969 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 23:14:15 +00:00
a601f15ebe
YARN-822. Renamed ApplicationToken to be AMRMToken, and similarly the corresponding TokenSelector and SecretManager. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1493889 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493890 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 19:12:12 +00:00
ce23eea57f
YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1493676 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493677 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 08:15:05 +00:00
04bea5f2fd
YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1493654 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493655 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:52:39 +00:00
e40b5a3eb9
HADOOP-9649. Promoted YARN service life-cycle libraries into Hadoop Common for usage across all Hadoop projects. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1493650 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493651 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:41:49 +00:00
39aaf79717
YARN-826. Moved Clock and SystemClock into yarn.util package. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1493639 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493640 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 04:50:30 +00:00
68807a65c2
Merge -c 1493623 from trunk to branch-2 to fix YARN-387. Renamed YARN protocols for consistency. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493624 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 02:29:56 +00:00
c71d86cd7c
MAPREDUCE-5171. Expose blacklisted nodes from the MR AM REST API. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493603 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 22:20:45 +00:00
ae5df3d869
Merge -c 1493509 from trunk to branch-2 to fix YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. Contributed by Alejandro Abdelnur.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493510 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 14:00:36 +00:00
dc8d2412fe
YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1493315 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493316 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 04:58:45 +00:00
77ae68f84e
MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493211 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 19:09:15 +00:00
da2a0ea3ce
YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1493138 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493139 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 16:11:36 +00:00
6418929696
YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1492903 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492904 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 23:26:20 +00:00
027f71eb05
MAPREDUCE-5199. Removing ApplicationTokens file as it is no longer needed. Contributed by Daryn Sharp.
...
svn merge --ignore-ancestry -c 1492848 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492849 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 20:21:03 +00:00
903f0fea8e
YARN-530. Defined Service model strictly, implemented AbstractService for robust subclassing and migrated yarn-common services. Contributed by Steve Loughran.
...
YARN-117. Migrated rest of YARN to the new service model. Contributed by Steve Louhran.
MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. Contributed by Steve Loughran.
svn merge --ignore-ancestry -c 1492718 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492720 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 15:56:44 +00:00
485c04d0a4
Merge r1490470 from trunk to branch-2 for YARN-759. Create Command enum in AllocateResponse (bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490473 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 23:43:38 +00:00
09c12434a2
Merge r1490392 from trunk to branch-2 for YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490396 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 19:03:27 +00:00
27ed92a3fb
Set version in branch-2 to 2.2.0-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
377f3ef85b
YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1489295 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489296 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 05:55:22 +00:00
5f20c37919
YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth.
...
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 04:50:16 +00:00
3b6035ba83
svn merge -c 1489271 FIXES: MAPREDUCE-5283. Over 10 different tests have near identical implementations of AppContext. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489272 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 01:55:15 +00:00
cafa5d8bb5
YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He.
...
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489257 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489262 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:56:26 +00:00
f42fc8f958
merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:36:44 +00:00
7246cf9b41
Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 22:55:31 +00:00
41ed12124c
YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He.
...
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 21:45:24 +00:00
6e0b55c5b7
Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
cdab92d0c3
merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 00:15:53 +00:00
36ef457902
merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:18:50 +00:00
d95c5a23d9
MAPREDUCE-5261. Reverting the patch as it is no longer needed.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 21:54:28 +00:00
a099537780
YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth.
...
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 20:19:53 +00:00
0fb465cbc4
merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 05:01:40 +00:00
a2303831b4
MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1486271 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 22:38:14 +00:00
6c5055fe92
YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:11:25 +00:00
02205fa797
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
a1235b5ba9
HADOOP-8562. Merge r1453486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
c28a0860e2
MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1485079 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485080 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:25:03 +00:00
543bab20ed
MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1484349 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484351 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 21:15:54 +00:00
759e518509
svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483976 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 20:26:13 +00:00
f0bd8da38b
YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi.
...
Merge from trunk revision 1483667 with little test modifications for proper merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 06:38:03 +00:00
1f922d3c51
merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 04:13:00 +00:00
6706e58f61
MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1482175 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 02:50:27 +00:00
99275f172a
MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv)
...
svn merge --ignore-ancestry -c 1481695 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 03:36:15 +00:00
2594db460f
YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth.
...
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1481205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:51:32 +00:00
6aa0edc793
YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480529 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 05:32:52 +00:00
fb8d3fb0e4
MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1479016 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479018 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 00:29:34 +00:00
868362c9b1
MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1477889 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 00:44:13 +00:00
ffe3368d94
YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He.
...
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 19:08:44 +00:00
b392a65e2e
merge MAPREDUCE-5181 from trunk. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471817 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:51:08 +00:00
2dfecb78e5
YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong.
...
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:01:08 +00:00
d53afdb144
Merge -r 1470693:1470694 from trunk to branch-2. Fixes: MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470696 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 20:09:44 +00:00
b65a090174
Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 19:19:16 +00:00
d5a1fb4663
MAPREDUCE-5147. Maven build should create hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470038 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 20:55:05 +00:00
1bfb6af49f
YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong.
...
MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1469657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 01:34:04 +00:00
0df869e1f7
MAPREDUCE-5152. Make MR App to simply pass through the container from RM instead of extracting and populating information itself to start any container. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1469544 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469545 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:14:22 +00:00
8cc3b081fa
YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza.
...
MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1468276 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 23:55:26 +00:00
a84c8bcbd4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:04:09 +00:00
74880e24c5
svn merge -c 1467061 FIXES: MAPREDUCE-5136. TestJobImpl->testJobNoTasks fails with IBM JAVA. Contributed by Amir Sanjar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 19:18:55 +00:00
9f3feed745
MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error. Contributed by Thomas Graves
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466952 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 16:29:34 +00:00
422133edf7
merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 05:02:45 +00:00
91a676fc41
Setting version in branch-2 to be 2.0.5-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
45fa8302f4
MAPREDUCE-5086. MR app master deletes staging dir when sent a reboot command from the RM. Contributed by Jian He
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465674 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 16:12:32 +00:00
b66abebca2
Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 05:33:41 +00:00
ad1695cb1e
Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 19:48:52 +00:00
4bc46b766d
svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 14:17:59 +00:00
7410551629
MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1460923 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 22:34:45 +00:00
7892e1aabd
merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 21:57:12 +00:00
1de797794e
merge -c 1459040 from trunk to branch-2 to fix YARN-396. Rationalize AllocateResponse in RM Scheduler API. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459044 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 20:46:22 +00:00
05fabc2013
svn merge -c 1458906 FIXES: MAPREDUCE-4972. Coverage fixing for org.apache.hadoop.mapreduce.jobhistory (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458915 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 16:11:58 +00:00
9a9d40200f
svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 21:11:45 +00:00
3508e8e7dd
svn merge -c 1456536 FIXES: YARN-237. Refreshing the RM page forgets how many rows I had in my Datatables (jian he via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 16:57:10 +00:00
d46bbdd43f
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454157 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 23:03:10 +00:00
611d6d543e
svn merge -c 1452372 FIXES: MAPREDUCE-5043. Fetch failure processing can cause AM event queue to backup and eventually OOM (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452451 13f79535-47bb-0310-9956-ffa450edef68
2013-03-04 19:06:26 +00:00
a5985e4b0e
MAPREDUCE-4794. DefaultSpeculator generates error messages on normal shutdown (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451831 13f79535-47bb-0310-9956-ffa450edef68
2013-03-02 03:45:21 +00:00
b775d49f35
merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 21:04:29 +00:00
96b3905afd
Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448618 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 12:04:46 +00:00
e3afdf5aa9
MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear the value from the Task commitAttempt member (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1447969 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 23:42:40 +00:00
d53d4cbca3
merge MAPREDUCE-5000 from trunk. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445873 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:23:50 +00:00
e3924c623f
svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 02:17:24 +00:00
a6f31c1d91
svn merge -c 1445448 FIXES: MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445450 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 01:21:58 +00:00
288dd9b025
merge MAPREDUCE-4671 from trunk. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443324 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 07:08:30 +00:00
196341fc09
Setting version to 2.0.4-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
6eead06fa2
merge -c 1441668 from trunk to branch-2 to fix YARN-372. Move InlineDispatcher from hadoop-yarn-server-resourcemanager to hadoop-yarn-common. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441669 13f79535-47bb-0310-9956-ffa450edef68
2013-02-02 00:45:37 +00:00
a11e8bef64
MAPREDUCE-4893. Fixed MR ApplicationMaster to do optimal assignment of containers to get maximum locality. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1440749 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440752 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 00:29:36 +00:00
6f146b15d3
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 00:23:27 +00:00
b981b59c06
merge MAPREDUCE-4946 from trunk. Fix a performance problem for large jobs by reducing the number of map completion event type conversions. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437104 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 19:08:06 +00:00
44b3be14bc
merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 18:35:10 +00:00
3943008b07
svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 14:49:14 +00:00
fdc4c61101
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:35 +00:00
fb0a8ff926
svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 23:01:11 +00:00
98cb5344eb
Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:22:55 +00:00
122cd0fb5b
Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:31:53 +00:00
b412841745
Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:17:31 +00:00
b035a444e1
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68
2013-01-05 20:19:18 +00:00
199df2b770
svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:38:36 +00:00
2cb090a075
MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:31:22 +00:00
ec4fc07c52
svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 19:27:56 +00:00
52742c9a65
svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 15:06:15 +00:00
5b6115e3bb
svn merge -c 1425223 FIXES: MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425224 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 01:46:05 +00:00
043fd00a30
svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 22:34:41 +00:00
77933c6327
MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 21:51:38 +00:00
b432cf076e
merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414876 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 19:24:27 +00:00
3e0d0cf08f
svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 17:54:10 +00:00
fa6b7fca7a
merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. (Contributed by Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411293 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 16:44:28 +00:00
db8545d924
Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:16:57 +00:00
19748556f8
svn merge -c 1410498 FIXES: MAPREDUCE-4802. Takes a long time to load the task list on the AM for large jobs (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410502 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 17:32:31 +00:00
3bc91c97cb
MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:17:17 +00:00
3b9bb65473
svn merge -c 1409525 FIXES: MAPREDUCE-4797. LocalContainerAllocator can loop forever trying to contact the RM (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409528 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 23:06:48 +00:00
8ca6059743
svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 19:26:54 +00:00
6a743f3f5b
merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:49:04 +00:00
32850b486b
svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 20:38:55 +00:00
ec861244a2
svn merge -c 1408360 FIXES: MAPREDUCE-4425. Speculation + Fetch failures can lead to a hung job (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408361 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 17:19:58 +00:00
74656788e5
svn merge -c 1408314 FIXES: MAPREDUCE-4751. AM stuck in KILL_WAIT for days (vinodkv via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408316 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 15:19:41 +00:00
b8f37b3b36
svn merge -c 1407679 FIXES: MAPREDUCE-4774. JobImpl does not handle asynchronous task events in FAILED state (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407682 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 23:00:57 +00:00
6b3db6eabd
svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:21:36 +00:00
a280cd5567
svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 23:05:53 +00:00
b958fa85a5
merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:02:59 +00:00
58c43cc8cb
svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:05:33 +00:00
33cb0be07c
svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:47:01 +00:00
b702473f5c
svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:25:22 +00:00
5d200b2ab3
merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:03:17 +00:00
3d8fa1d6c4
MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1400264 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:20:03 +00:00
5944b1c703
MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1399976 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:59:25 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
66d468eece
merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:53:45 +00:00
6fe821a14a
svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:09:49 +00:00
ca7732aae9
merge -r 1367538:1367539 from trunk. FIXES: MAPREDUCE-4375
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367540 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:40:39 +00:00
f00a592fe9
Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
0d1867fa9d
svn merge -c 1362209 FIXES: MAPREDUCE-4437. Race in MR ApplicationMaster can cause reducers to never be scheduled (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362213 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 19:13:10 +00:00
60ad1056af
MAPREDUCE-3940. ContainerTokens should have an expiry interval. Contributed by Siddharth Seth and Vinod Kumar Vavilapalli.
...
svn merge -c 1359910 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359912 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:33:04 +00:00
aaea868826
svn merge -c 1359747. FIXES: MAPREDUCE-4252. MR2 job never completes with 1 pending task (Tom White via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359749 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:11:23 +00:00
5ecf46efb6
merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 21:10:09 +00:00
b38f46e73c
svn merge -c 1355124 FIXES: MAPREDUCE-4376. TestClusterMRNotification times out (Kihwal Lee via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355125 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 19:30:22 +00:00
4bb61ecbd7
svn merge -c 1354181 FIXES: MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354182 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 19:18:49 +00:00
2846979f16
Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
4159a21d28
merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
d1607ba557
merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
ed20ba2e49
svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:52:39 +00:00
1f804b5d20
svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
00875b37f6
HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
a1ce7813e9
merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
4bc2774d79
svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:10:03 +00:00
13acee63d3
svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:04:08 +00:00
9a04fc6caf
Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
c9aac0a1d1
svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 18:37:01 +00:00
bb9cfbb052
merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
f8f390b83d
merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
88d736ce2b
svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
1fca6cfe03
svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
1ea39ddc3c
svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
a18ad09c94
svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:23:35 +00:00
461b330ebf
svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
be7e487ef3
Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 02:01:02 +00:00
8ca897dea2
svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
d550503dbb
Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
462f9a5249
MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
50c13a44af
merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00
b04f23fc96
svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
07321a677c
svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +00:00
98f0abb721
Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:25:18 +00:00
378ed9b673
merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:12:24 +00:00
93af1a43be
merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:18:55 +00:00
8b39213000
svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:30:38 +00:00
c6c7055c83
MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 17:03:53 +00:00
ad9f93f7b5
merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 20:24:46 +00:00
54a0b26231
svn merge -c 1308507 from trunk FIXES: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308509 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 19:54:46 +00:00
c1ccd60f74
Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:31:34 +00:00
4805df8366
Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 21:50:30 +00:00
55639bea52
Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:04:21 +00:00
3e8925aa92
Changed version in branch-2 to 2.0.0-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
e7ec8a44b6
svn merge -c 1305607 trunk to branch-0.23 FIXES: MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:25:16 +00:00
1f3e5ebc0b
svn merge -c 1304587 from trunk to branch-0.23 FIXES: MAPREDUCE-4043. Secret keys set in Credentials are not seen by tasks (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304593 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 20:52:42 +00:00
c02c9218d9
svn merge -c 1302645 from trunk to branch-0.23 FIXES MAPREDUCE-4025. AM can crash if task attempt reports bogus progress value (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302646 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 20:32:54 +00:00
fbae7714cf
Merge -r 1300749:1300750 from trunk to branch. FIXES: MAPREDUCE-4007
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300751 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 22:03:32 +00:00
b6d9e6b5f7
svn merge -c 1297825 from trunk to branch-0.23 FIXES: MAPREDUCE-3975. Default value not set for Configuration parameter mapreduce.job.local.dir (Eric Payne via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297826 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 01:28:34 +00:00
de89bbcb88
svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:23:25 +00:00
74360b15d3
HADOOP-8142. Update versions from 0.23.2 to 0.23.3 in the build files.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297650 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 18:53:46 +00:00
a7a9d16d63
svn merge -c 1297557 from trunk to branch-0.23 FIXES: MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297558 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 16:19:10 +00:00
526f466d0c
MAPREDUCE-3614. Fixed MR AM to close history file quickly and send a correct final state to the RM when it is killed. Contributed by Ravi Prakash.
...
svn merge --ignore-ancestry -c 1296747 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296748 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 05:25:07 +00:00
90c6dd8468
merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 15:51:55 +00:00
def75f7560
Merge r1293501 through r1293896 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 17:58:14 +00:00
2b28bb962a
MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1293517 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:07:19 +00:00
Jason Darrell Lowe
Jonathan Turner Eagles
Arun Murthy
Sanford Ryza
Siddharth Seth
Vinod Kumar Vavilapalli
Bikas Saha
Devarajulu K
Kihwal Lee
Tsz-wo Sze
Alejandro Abdelnur
Konstantin Boudnik
Suresh Srinivas
Thomas White
Thomas Graves
Robert Joseph Evans
Hitesh Shah
Eli Collins
Harsh J