Jian He
5c47b8d78a
Merge r1556318 from trunk. YARN-1293. Fixed TestContainerLaunch#testInvalidEnvSyntaxDiagnostics failure caused by non-English system locale. Contributed by Tsuyoshi OZAWA.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 19:03:50 +00:00
Jason Darrell Lowe
b8f59ebeaa
svn merge -c 1556282 FIXES: YARN-1409. NonAggregatingLogHandler can throw RejectedExecutionException. Contributed by Tsuyoshi OZAWA
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556284 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 17:23:50 +00:00
Jing Zhao
88d09130e8
HDFS-5545. Merge change r1546151 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
Vinod Kumar Vavilapalli
f7f79f93ab
YARN-1145. Fixed a potential file-handle leak in the web interface for displaying aggregated logs. Contributed by Rohith Sharma.
...
svn merge --ignore-ancestry -c 1551326 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551327 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 19:28:20 +00:00
Arun Murthy
2c217482e8
Merge -c 1548336 from trunk to branch-2 to fix YARN-1438. Ensure container diagnostics includes exception from container launch. Contributed by Steve Loughran.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548337 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 00:26:03 +00:00
Arun Murthy
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
Bikas Saha
eb97badbcd
Merge r1543973 from trunk to branch-2 for YARN-1053. Diagnostic message from ContainerExitEvent is ignored in ContainerImpl (Omkar Vinit Joshi via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543974 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:29:16 +00:00
Vinod Kumar Vavilapalli
8613e7ef3d
YARN-1210. Changed RM to start new app-attempts on RM restart only after ensuring that previous AM exited or after expiry time. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1543310 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543311 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:17:56 +00:00
Sanford Ryza
cfcb4a716f
YARN-1401. With zero sleep-delay-before-sigkill.ms, no signal is ever sent (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542047 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 19:59:05 +00:00
Jonathan Turner Eagles
1884c3a0b9
YARN-1386. NodeManager mistakenly loses resources and relocalizes them (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541376 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 03:26:20 +00:00
Chris Nauroth
f6bb3ce621
YARN-1357. Merging change r1537293 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537296 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 20:53:16 +00:00
Sanford Ryza
67365f3172
YARN-1109. Demote NodeManager "Sending out status for container" logs to debug (haosdent via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536574 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 00:57:03 +00:00
Sanford Ryza
3b0a6e6edd
YARN-1295. In UnixLocalWrapperScriptBuilder, using bash -c can cause Text file busy errors. (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:15:38 +00:00
Sanford Ryza
86bacb6b43
Add missing file TestCgroupsLCEResourcesHandler for YARN-1284.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530495 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:12:26 +00:00
Sanford Ryza
b57b4252bf
YARN-1284. LCE: Race condition leaves dangling cgroups entries for killed containers. (Alejandro Abdelnur via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530494 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:08:17 +00:00
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
763521305d
YARN-1278. Fixed NodeManager to not delete local resources for apps on resync command from RM - a bug caused by YARN-1149. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1529657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529658 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:33:37 +00:00
Vinod Kumar Vavilapalli
85bed752d5
YARN-1274. Fixed NodeManager's LinuxContainerExecutor to create user, app-dir and log-dirs correctly even when there are no resources to localize for the container. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1529555 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529556 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 00:15:51 +00:00
Vinod Kumar Vavilapalli
c91addb743
YARN-1271. Addendum patch to remove unused method in ContainerExecutor. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529386 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 05:14:05 +00:00
Vinod Kumar Vavilapalli
ea3c2d28f7
YARN-1254. Fixed NodeManager to not pollute container's credentials. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1529382 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529383 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 04:26:37 +00:00
Alejandro Abdelnur
4de1616b82
YARN-1253. Changes to LinuxContainerExecutor to run containers as a single dedicated user in non-secure mode. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529326 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 22:00:01 +00:00
Sanford Ryza
c03521fd86
YARN-1271. Text file busy errors launching containers again (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529060 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:31:26 +00:00
Bikas Saha
7b2cd4b411
Merge r1529039 and r1529048 from trunk to branch-2 for YARN-1256. NM silently ignores non-existent service in StartContainerRequest (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529049 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:04:26 +00:00
Hitesh Shah
75aeb6070a
Merge 1529043 from trunk to branch-2 for YARN-1149. NM throws InvalidStateTransitonException: Invalid event: APPLICATION_LOG_HANDLING_FINISHED at RUNNING. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529044 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 00:46:18 +00:00
Vinod Kumar Vavilapalli
80dd306450
YARN-1070. Fixed race conditions in NodeManager during container-kill. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1527827 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527828 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 00:18:42 +00:00
Alejandro Abdelnur
15ee08ef6c
YARN-1247. test-container-executor has gotten out of sync with the changes to container-executor. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527814 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:55:51 +00:00
Jonathan Turner Eagles
e33f5dc85d
YARN-819. ResourceManager and NodeManager should check for a minimum allowed version (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526665 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:06:47 +00:00
Siddharth Seth
e23d5672a7
merge YARN-1229 from trunk. 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/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
Vinod Kumar Vavilapalli
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
Arun Murthy
c061a0da55
Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:06:27 +00:00
Alejandro Abdelnur
460fd2053b
YARN-1137. Add support whitelist for system users to Yarn container-executor.c. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523589 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:02:13 +00:00
Jason Darrell Lowe
d5b84644f0
svn merge -c 1523158 FIXES: YARN-1189. NMTokenSecretManagerInNM is not being told when applications have finished. Contributed by Omkar Vinit Joshi
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523159 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:23:20 +00:00
Jason Darrell Lowe
039c10e0d9
svn merge -c 1522968 FIXES: YARN-1194. TestContainerLogsPage fails with native builds. Contributed by Roman Shaposhnik
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522971 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 15:20:38 +00:00
Chris Nauroth
399df2cb08
YARN-1078. Merging change r1522644 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522645 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 16:04:41 +00:00
Vinod Kumar Vavilapalli
e5ee67cbea
YARN-910. Augmented auxiliary services to listen for container starts and completions in addition to application events. Contributed by Alejandro Abdelnur.
...
svn merge --ignore-ancestry -c 1521298 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521299 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 21:49:00 +00:00
Bikas Saha
a84e9321c4
Merge 1520135 from trunk to branch-2 for YARN-1065. NM should provide AuxillaryService data to the container (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520137 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 20:51:35 +00:00
Vinod Kumar Vavilapalli
57220dd1d0
YARN-1077. Fixed TestContainerLaunch test failure on Windows. Contributed by Chuan Liu.
...
svn merge --ignore-ancestry -c 1519333 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519334 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 03:11:06 +00:00
Vinod Kumar Vavilapalli
0246b60e93
YARN-649. Added a new NM web-service to serve container logs in plain text over HTTP. Contributed by Sandy Ryza.
...
svn merge --ignore-ancestry -c 1519326 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519327 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 00:09:53 +00:00
Sanford Ryza
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
Vinod Kumar Vavilapalli
0fb55f1aec
YARN-602. Fixed NodeManager to not let users override some mandatory environmental variables. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1518077 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518078 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 05:14:15 +00:00
Vinod Kumar Vavilapalli
a42a5e153c
YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1517101 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 02:48:17 +00:00
Arun Murthy
77a60701c1
Merge -c 1514135 from trunk to branch-2 to fix YARN-1056. Remove dual use of string 'resourcemanager' in yarn.resourcemanager.connect.{max.wait.secs|retry_interval.secs}. Contributed by Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514136 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 02:36:58 +00:00
Alejandro Abdelnur
eee2b37a3a
HADOOP-9872. Improve protoc version handling and detection. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:29:46 +00:00
Alejandro Abdelnur
677bbd336d
HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:25:26 +00:00
Jonathan Turner Eagles
75e9f9f3ed
YARN-985. Nodemanager should log where a resource was localized (Ravi Prakash via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511105 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 19:55:07 +00:00
Vinod Kumar Vavilapalli
9b05d132bf
YARN-906. Fixed a bug in NodeManager where cancelling ContainerLaunch at KILLING state causes that the container to hang. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1509924 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509925 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 00:49:32 +00:00
Vinod Kumar Vavilapalli
a416371e7d
YARN-903. Changed ContainerManager to suppress unnecessary warnings when stopping already stopped containers. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1509560 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509561 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 06:55:21 +00:00
Jason Darrell Lowe
83a09512a4
svn merge -c 1509389 FIXES: YARN-573. Shared data structures in Public Localizer and Private Localizer are not Thread safe. Contributed by Omkar Vinit Joshi
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509393 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 19:40:09 +00:00
Vinod Kumar Vavilapalli
4120e3b4ef
YARN-966. Fixed ContainerLaunch to not fail quietly when there are no localized resources due to some other failure. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1508688 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508689 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 00:00:28 +00:00
Vinod Kumar Vavilapalli
22e0a210b6
Reverting YARN-245 to fix a critical bug.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508278 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 03:07:26 +00:00