Commit Graph

4232 Commits

Author SHA1 Message Date
Siddharth Seth 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
Alejandro Abdelnur fc570c127a HADOOP-9471. hadoop-client wrongfully excludes jetty-util JAR, breaking webhdfs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466764 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 04:06:11 +00:00
Vinod Kumar Vavilapalli d6f8a7f7ee YARN-539. Addressed memory leak of LocalResource objects NM when a resource localization fails. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466756 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466757 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:08:49 +00:00
Vinod Kumar Vavilapalli 81a684ebd3 YARN-495. Changed NM reboot behaviour to be a simple resync - kill all containers and re-register with RM. Contributed by Jian He.
svn merge --ignore-ancestry -c 1466752 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466753 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:01:44 +00:00
Suresh Srinivas 71a4677b36 HDFS-4679. Merge 1466721 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466729 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 23:17:23 +00:00
Luke Lu 9be0d30af4 HADOOP-9467. Metrics2 record filter should check name as well as tags. (Ganeshan Iyler via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466381 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 08:34:29 +00:00
Arun Murthy 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
Todd Lipcon a27b04e11a HDFS-4643. Fix flakiness in TestQuorumJournalManager. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466252 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 21:34:03 +00:00
Vinod Kumar Vavilapalli fd5224e62c YARN-534. Change RM restart recovery to also account for AM max-attempts configuration after the restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1466208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466209 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 20:16:56 +00:00
Vinod Kumar Vavilapalli 76d72db5eb YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:57:10 +00:00
Suresh Srinivas 4f82642185 HDFS-4669. Merge change 1466176 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466181 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:09:01 +00:00
Suresh Srinivas 4167aed789 HDFS-4676. Merging change 1466099 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466102 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 16:21:41 +00:00
Suresh Srinivas 97b95fb3a0 HDFS-3940. Merging change r1465851 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466101 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 16:20:58 +00:00
Vinod Kumar Vavilapalli 335e02124b YARN-99. Modify private distributed cache to localize files such that no local directory hits unix file count limits and thus prevent job failures. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1465853 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465854 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 01:35:05 +00:00
Todd Lipcon b287d8de6d HDFS-3981. Fix handling of FSN lock in getBlockLocations. Contributed by Xiaobo Peng and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465752 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 19:57:24 +00:00
Bikas Saha 0aa44dc7ac Merge -c 1465731 from trunk to branch-2 for YARN-479. NM retry behavior for connection to RM should be similar for lost heartbeats (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465733 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 19:19:33 +00:00
Jason Darrell Lowe 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
Uma Maheswara Rao G d208e6a15e Merge HDFS-4525. Provide an API for knowing that whether file is closed or not. Contributed by SreeHari.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465435 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 18:04:33 +00:00
Arun Murthy 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
Aaron Myers 85c29d073c HDFS-1804. Add a new block-volume device choosing policy that looks at free space. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465184 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 04:11:18 +00:00
Konstantin Boudnik e4d027c3a2 svn merge -c1465121
HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value.
Contributed by Jagane Sundar


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465123 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 20:45:13 +00:00
Bikas Saha e97e0eaec7 Merge -c 1465067 from trunk to branch-2 for YARN-193. Scheduler.normalizeRequest does not account for allocation requests that exceed maximumAllocation limits (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 17:48:35 +00:00
Thomas Graves 003ecf8137 MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465016 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 15:43:38 +00:00
Jason Darrell Lowe d002c038b2 svn merge -c 1465009 FIXES: YARN-525. make CS node-locality-delay refreshable. Contributed by Thomas Graves
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465012 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 15:34:40 +00:00
Vinod Kumar Vavilapalli 53b3dd18a5 YARN-532. Change RMAdmin and Localization client protocol PB implementations to implement closeable so that they can be stopped when needed via RPC.stopProxy(). Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1464788 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464789 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 23:31:12 +00:00
Siddharth Seth c1f5313b11 Updated CHANGES.txt to reflect YARN-470 being merged into branch-2.0.4-alpha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464773 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 21:25:33 +00:00
Suresh Srinivas 5dda325714 HADOOP-9429. Merging change 1464725 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464728 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:29:32 +00:00
Hitesh Shah 43ad7efb4c Porting fix for MAPREDUCE-5083 to 2.0.4-alpha. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464634 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 17:02:41 +00:00
Kihwal Lee c6f70e7072 svn merge -c 1464548 Merging from trunk to branch-2 to fix HDFS-4548.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464553 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 14:03:51 +00:00
Vinod Kumar Vavilapalli 2190ac6fd9 YARN-536. Removed the unused objects ContainerStatus and ContainerStatus from Container which also don't belong to the container. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1464271 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464272 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 03:43:04 +00:00
Alejandro Abdelnur b36a96aea2 HADOOP-9401. CodecPool: Add counters for number of (de)compressors leased out. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464220 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 22:27:38 +00:00
Alejandro Abdelnur c4f940ccaf YARN-458. YARN daemon addresses must be placed in many different configs. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464205 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 21:04:45 +00:00
Alejandro Abdelnur d1509d9501 YARN-538. RM address DNS lookup can cause unnecessary slowness on every JHS page load. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464198 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 20:44:12 +00:00
Konstantin Boudnik 347d9f6b98 MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464147 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 18:35:31 +00:00
Thomas White a8848aebe7 Merge -r 1464129:1464130 from trunk to branch-2. Fixes: YARN-381. Improve fair scheduler docs. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464131 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 18:03:21 +00:00
Vinod Kumar Vavilapalli c582c13c30 YARN-101. Fix NodeManager heartbeat processing to not lose track of completed containers in case of dropped heartbeats. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1464105 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464106 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 16:57:40 +00:00
Vinod Kumar Vavilapalli 523e98d914 MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1463828 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:40:21 +00:00
Vinod Kumar Vavilapalli 8565f5f81d YARN-467. Modify public distributed cache to localize files such that no local directory hits unix file count limits and thus prevent job failures. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1463823 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463824 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:01:35 +00:00
Thomas Graves e9e576409c MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463808 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 01:47:31 +00:00
Kihwal Lee a7cdea51fa svn merge -c 1463698 Merging from trunk to branch-2 to fix HDFS-4649.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463699 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 19:13:46 +00:00
Bikas Saha 379f6e9085 Merge -c 1463653 from trunk to branch-2 for YARN-382. SchedulerUtils improve way normalizeRequest sets the resource capabilities (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463656 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 18:09:40 +00:00
Aaron Myers 1d2b7cea58 HDFS-4658. Standby NN will log that it has received a block report "after becoming active". Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463644 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 17:50:56 +00:00
Vinod Kumar Vavilapalli a0bccf2586 YARN-447. Move ApplicationComparator in CapacityScheduler to use comparator in ApplicationId. Contributed by Nemon Lou.
svn merge --ignore-ancestry -c 1463405 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463406 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 06:59:51 +00:00
Vinod Kumar Vavilapalli e6608ce1c0 YARN-516. Fix failure in TestContainerLocalizer caused by HADOOP-9357. Contributed by Andrew Wang.
svn merge --ignore-ancestry -c 1463362 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463363 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:17:14 +00:00
Robert Joseph Evans ca4b6ee8c6 Reverted MAPREDUCE-4974 because of test failures.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:15:08 +00:00
Aaron Myers 831d18a422 HDFS-4656. DN heartbeat loop can be briefly tight. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463358 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:13:10 +00:00
Aaron Myers b05024a03a HDFS-4655. DNA_FINALIZE is logged as being an unknown command by the DN when received from the standby NN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463356 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:08:03 +00:00
Vinod Kumar Vavilapalli 9baac1676a YARN-309. Changed NodeManager to obtain heart-beat interval from the ResourceManager. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1463346 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463347 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 01:05:19 +00:00
Robert Joseph Evans f47bdbded7 svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 17:47:19 +00:00
Vinod Kumar Vavilapalli db7b5e12d0 YARN-475. Remove a unused constant in the public API - ApplicationConstants.AM_APP_ATTEMPT_ID_ENV. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1463033 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463034 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 19:18:42 +00:00