Commit Graph

384 Commits

Author SHA1 Message Date
Robert Joseph Evans 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
Thomas Graves 1769fd46e2 merge -r 1327262:1327263 from trunk. FIXES: MAPREDUCE-4151
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327265 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:06:49 +00:00
Siddharth Seth ab8ea1db58 Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:55:53 +00:00
Thomas Graves e1aa56712c merge -r 1326706:1326707 from trunk. FIXES: MAPREDUCE-4008
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326709 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 18:04:25 +00:00
Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:26:07 +00:00
Thomas White f537469c7e Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 00:11:53 +00:00
Thomas White cb3d6c3d98 Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
Robert Joseph Evans 3cf79f4c7e svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 21:31:41 +00:00
Siddharth Seth 5f535af454 Merge MAPREDUCE-3869 from trunk. Fix classpath for DistributedShell application. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311524 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:02:57 +00:00
Thomas White de5069a6a1 Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311521 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 23:35:21 +00:00
Arun Murthy 9562831e74 Added toString to ContainerToken. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310538 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:41:51 +00:00
Robert Joseph Evans 401d4b3584 svn merge -c 1310056 from trunk. FIXES: MAPREDUCE-4073. CS assigns multiple off-switch containers when using multi-level-queues (Siddharth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310057 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:29:01 +00:00
Thomas Graves 0d388cd1f4 merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:13:11 +00:00
Todd Lipcon 3c7d74132b MAPREDUCE-4103. Fix HA docs for changes to shell command fencer args. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309535 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 18:46:28 +00:00
Thomas Graves 4a3e9514c3 merge -r 1309132:1309133 from trunk. FIXES: MAPREDUCE-4020
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309134 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 20:41:22 +00:00
Robert Joseph Evans 18a6e47b98 svn merge -c 1309108 from trunk. FIXES MAPREDUCE-3999. Tracking link gives an error if the AppMaster hasn't started yet (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:38:43 +00:00
Robert Joseph Evans e76f7b7330 svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:03:18 +00:00
Robert Joseph Evans 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
Thomas Graves ef5ca103f6 merge -r 1308975:1308976 from trunk. FIXES: MAPREDUCE-4012
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308985 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 15:39:35 +00:00
Robert Joseph Evans 97f328dc40 svn merge -c 1308566 from trunk. FIXES MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308568 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 21:07:47 +00:00
Alejandro Abdelnur cf5dc702c9 Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307414 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 13:41:40 +00:00
Eli Collins 55d9276dd9 MAPREDUCE-3989. svn merge -c 1307102 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307103 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 20:55:21 +00:00
Siddharth Seth 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
Arun Murthy 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
Robert Joseph Evans 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
Arun Murthy efe3382159 Merge -c 1305230 from trunk to branch-0.23 to fix MAPREDUCE-3533. Add a channel between RM and AM to get information on nodes. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305231 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 05:46:55 +00:00
Arun Murthy 708795ba15 Removed some logs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304100 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 22:21:11 +00:00
Robert Joseph Evans 21bd7c348d svn merge -c 1302980 from trunk to branch 0.23 FIXES MAPREDUCE-4034. Unable to view task logs on history server with mapreduce.job.acl-view-job=* (Jason Lowe and Siddarth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302982 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 16:30:56 +00:00
Devaraj Das 94249757ee merge -r1301819:1301820 from trunk onto branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301821 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 23:23:13 +00:00
Thomas Graves eb0311aedc merge -r 1301730:1301731 from trunk to branch-0.23. FIXES: MAPREDUCE-4006
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301734 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 20:14:45 +00:00
Siddharth Seth 1514466b7a merge MAPREDUCE-4005 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301693 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 18:48:57 +00:00
Steve Loughran 04abe3a9fe MAPREDUCE-3431
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301502 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 13:37:26 +00:00
Steve Loughran 8e5862e342 MAPREDUCE-3970 ServiceOperations class
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300901 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 10:45:35 +00:00
Steve Loughran 27dc31c103 MAPREDUCE-3970 ServiceOperations class
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300891 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 10:38:54 +00:00
Suresh Srinivas 40276d7f78 HDFS-1623. Merging change r1296534 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299412 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 17:55:58 +00:00
Arun Murthy cac1864734 Merge -c 1299100 from trunk to branch-0.23 to fix MAPREDUCE-3773. Add queue metrics with buckets for job run times. Contributed by Owen O'Malley.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299101 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 23:36:41 +00:00
Vinod Kumar Vavilapalli c383843732 MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1298978 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 18:55:02 +00:00
Thomas White 4a151380c7 Merge -r 1298940:1298941 from trunk to branch-0.23. Fixes: MAPREDUCE-3578
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298942 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 17:38:10 +00:00
Robert Joseph Evans 9b32863cb8 svn merge -c 1297796 from trunk to branch-0.23 FIXES: MAPREDUCE-3977. LogAggregationService leaks log aggregator objects (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297797 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:46:02 +00:00
Robert Joseph Evans 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
Siddharth Seth 084f085b5f merge MAPREDUCE-3944 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297673 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 19:53:09 +00:00
Robert Joseph Evans 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
Arun Murthy 3d48d8cf6e Merge -c 1297310 from trunk to branch-0.23 to fix MAPREDUCE-3034. Ensure NodeManager reboots itself on direction from ResourceManager. Contributed by Devaraj K & Eric Payne.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297311 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 00:52:58 +00:00
Robert Joseph Evans 68e54b192d svn merge -c 1297248 from trunk to branch-0.23 FIXES MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297250 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 22:05:00 +00:00
Vinod Kumar Vavilapalli c0ecbbc7b4 MAPREDUCE-3954. Added new envs to separate heap size for different daemons started via bin scripts. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1297174 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297176 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 19:06:43 +00:00
Arun Murthy 2d9f9c2d44 Merge -c 1296902 from trunk to branch-0.23 to fix MAPREDUCE-3497. Added docs for YARN CLI.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296903 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 23:51:48 +00:00
Arun Murthy e11ab3382d Merge -c 1296898 from trunk to branch-0.23 to fix MAPREDUCE-3897. Fixed computation of maxActiveAppsPerUser for queues by using capacity and not max-capacity since we are already scaling it by userLimitFactor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296899 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 23:47:36 +00:00
Arun Murthy 991b24ea34 Merge -c 1296878 from trunk to branch-0.23 to fix MAPREDUCE-3960. Fix web-proxy to forward request to AM with configured hostname or IP.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296880 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 21:15:54 +00:00
Arun Murthy 83e260f273 Merge -c 1296835 from trunk to branch-0.23 to fix MAPREDUCE-3929. Fixed output of 'bin/mapred queue -showacl' command to clarify ACLs for users.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296836 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 17:16:19 +00:00
Vinod Kumar Vavilapalli f942f395c1 MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1296721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 23:42:39 +00:00