Commit Graph

256 Commits

Author SHA1 Message Date
Aaron Myers
f216303598 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 18:25:48 +00:00
Arun Murthy
f025652fda MAPREDUCE-3547. Added a bunch of unit tests for the the RM/NM webservices. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225463 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:06:04 +00:00
Aaron Myers
d619dee4ed Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225264 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:37:22 +00:00
Vinod Kumar Vavilapalli
cd90b82227 MAPREDUCE-3399. Modifying ContainerLocalizer to send a heartbeat to NM immediately after downloading a resource instead of always waiting for a second. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224970 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:26:21 +00:00
Aaron Myers
a500ba50c2 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1224965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:18:36 +00:00
Siddharth Seth
8fa0a3c737 MAPREDUCE-3567. Extraneous JobConf objects in AM heap. Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1222498 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 22:34:40 +00:00
Vinod Kumar Vavilapalli
ef9b974879 MAPREDUCE-3586. Modified CompositeService to avoid duplicate stop operations thereby solving race conditions in MR AM shutdown. (vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221950 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 23:47:54 +00:00
Vinod Kumar Vavilapalli
8626f1bc6c MAPREDUCE-3588. Fixed bin/yarn which was broken by MAPREDUCE-3366 so that yarn daemons can start. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221533 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 00:06:06 +00:00
Vinod Kumar Vavilapalli
e7543b944c MAPREDUCE-3339. Fixed MR AM to stop considering node blacklisting after the number of nodes blacklisted crosses a threshold. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221523 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:27:02 +00:00
Vinod Kumar Vavilapalli
4e1d5a0d71 MAPREDUCE-3391. Making a trivial change to correct a log message in DistributedShell app's AM. Contributed by Subroto Sanyal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:13:15 +00:00
Todd Lipcon
8ff28f4549 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:34:51 +00:00
Harsh J
2cf4aca02e MAPREDUCE-3579. ConverterUtils shouldn't include a port in a path from a url without a port (Contributed by atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215528 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:10:12 +00:00
Aaron Myers
08c9dc3780 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:31:46 +00:00
Vinod Kumar Vavilapalli
feb3a23c71 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215345 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:41:36 +00:00
Mahadev Konar
6d551b83de MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215065 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:09:28 +00:00
Aaron Myers
d937abd434 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214944 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 20:05:38 +00:00
Mahadev Konar
227fb568b8 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214668 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:11:18 +00:00
Mahadev Konar
beec374542 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster (Anupam Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214662 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 08:58:51 +00:00
Siddharth Seth
14ba2e65c9 MAPREDUCE-3531. Fixed a race in ContainerTokenSecretManager. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214593 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:09:16 +00:00
Todd Lipcon
b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:34:04 +00:00
Vinod Kumar Vavilapalli
c32ca00a75 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214476 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:22:32 +00:00
Vinod Kumar Vavilapalli
50fa9b89f4 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214429 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:55:22 +00:00
Suresh Srinivas
f7f5e51431 Missed deleting the files in r1214066
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:30:37 +00:00
Suresh Srinivas
ec4971a280 MAPREDUCE-3545. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 06:57:00 +00:00
Vinod Kumar Vavilapalli
0ea8570be5 MAPREDUCE-2863. Support web services for YARN and MR components. (Thomas Graves via vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213975 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:05:56 +00:00
Aaron Myers
a0fe4f476a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213867 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 19:02:37 +00:00
Arun Murthy
f611e1d1b1 MAPREDUCE-3537. Fix race condition in DefaultContainerExecutor which led to container localization occuring in wrong directories.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213575 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:33:30 +00:00
Mahadev Konar
e52291ea88 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213511 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:20:01 +00:00
Aaron Myers
89379bc1a3 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213389 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 19:41:20 +00:00
Vinod Kumar Vavilapalli
b0d3781b64 MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212680 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 23:16:15 +00:00
Tsz-wo Sze
9b1f47226b HDFS-2594. Support getDelegationTokens and createSymlink in WebHDFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212299 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:26:33 +00:00
Mahadev Konar
066cddb44e MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory. (chackaravarthy via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212215 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:58:29 +00:00
Mahadev Konar
224fc101fd MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value for queues (Anupam Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212212 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:38:35 +00:00
Aaron Myers
d9ea5bb489 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1211749 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 02:57:47 +00:00
Mahadev Konar
ec87e163d4 MAPREDUCE-3147. Handle leaf queues with the same name properly. (Ravi Prakash via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211243 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 00:29:45 +00:00
Aaron Myers
8a4db4d331 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1210547 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 18:00:44 +00:00
Sanjay Radia
65200998c0 HADOOP-7862 Move the support for multiple protocols to lower layer so that Writable, PB and Avro can all use it (includes HDFS and MR changes to match) (Sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210208 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:44:36 +00:00
Mahadev Konar
e948247715 MAPREDUCE-3485. DISKS_FAILED -101 error code should be defined in same location as ABORTED_CONTAINER_EXIT_STATUS. (Ravi Gummadi via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210192 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:11:08 +00:00
Mahadev Konar
bb2b8f565c MAPREDUCE-3456. /bin/yarn should set defaults for *_HOME (Eric Payne via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209825 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 03:38:05 +00:00
Siddharth Seth
6b2cbe1198 MAPREDUCE-3453. RM web ui application details page shows RM cluster about information. (Contributed by Jonathan Eagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209759 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:51:01 +00:00
Siddharth Seth
a3f37e15f7 MAPREDUCE-3460. MR AM can hang if containers are allocated on a node blacklisted by the AM. (Contributed by Hitesh Shah and Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209737 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:18:38 +00:00
Aaron Myers
2033b52673 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1209169 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 18:15:46 +00:00
Mahadev Konar
6a9624dcec MAPREDUCE-3452. fifoscheduler web ui page always shows 0% used for the queue (Jonathan Eagles via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208999 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:29 +00:00
Mahadev Konar
08da8ea5db MAPREDUCE-3463. Second AM fails to recover properly when first AM is killed with java.lang.IllegalArgumentException causing lost job. (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208994 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:35:20 +00:00
Alejandro Abdelnur
ff9bae6b7d MAREDUCE-3477. Hadoop site documentation cannot be built anymore. (jeagles via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208768 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:48:47 +00:00
Aaron Myers
0eec2218a1 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1208644 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 18:27:04 +00:00
Mahadev Konar
ea17da82f7 MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208131 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:17:54 +00:00
Aaron Myers
ee97365f58 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1208002 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 17:55:28 +00:00
Siddharth Seth
784a4a3084 MAPREDUCE-3045. Fixed UI filters to not filter on hidden title-numeric sort fields. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207714 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:10:56 +00:00
Aaron Myers
73b3de6204 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1207490 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 18:21:46 +00:00