Commit Graph

3969 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli dd3f9b38de HADOOP-8415. Add getDouble() and setDouble() in org.apache.hadoop.conf.Configuration (Jan van der Lugt via harsh)
Previous commit merges HADOOP-8415 into branch-2.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461722 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 17:19:39 +00:00
Vinod Kumar Vavilapalli 2b856f04e2 svn merge --ignore-ancestry -c 1342501 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461718 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 17:17:31 +00:00
Thomas White f26fa51029 YARN-496. Fair scheduler configs are refreshed inconsistently in reinitialize. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461667 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 15:51:20 +00:00
Thomas Graves 81299911b4 YARN-474. Revert since compilations fails: svn merge --change -1461403 .
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461626 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:57:43 +00:00
Kihwal Lee f0b9aeef47 svn merge -c 1461597 Merging from trunk to branch-2 to fix HDFS-4581.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461602 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:23:43 +00:00
Thomas White b1c781b2be MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:42:32 +00:00
Vinod Kumar Vavilapalli 8a21e3925c YARN-474. Fix CapacityScheduler to trigger application-activation when am-resource-percent configuration is refreshed. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1461402 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461403 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 03:46:20 +00:00
Suresh Srinivas 5a808d8c15 HDFS-4635. Merge 1461364 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461365 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 23:04:52 +00:00
Thomas Graves 0f66ba0b50 MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed. (Ravi Gummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461296 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 20:10:04 +00:00
Thomas Graves 257b263802 MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461289 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:54:51 +00:00
Thomas Graves 922c8ff997 MAPREDUCE-4356. [Rumen] Provide access to the method ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461277 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:26:36 +00:00
Thomas Graves 291a20960b MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map only jobs. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:21:43 +00:00
Thomas Graves 8f43934e99 MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461272 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:08:26 +00:00
Suresh Srinivas b854b245ed HDFS-9430. Merge change 1461268 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461271 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:06:33 +00:00
Thomas Graves e9440d688e MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running tasks in Gridmix. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461269 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:00:53 +00:00
Siddharth Seth 340c65b9f0 merge YARN-440 from trunk. Flatten RegisterNodeManagerResponse. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461257 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:21:43 +00:00
Siddharth Seth 6e9e2f0c7f MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:18:44 +00:00
Thomas Graves 57f91f9541 MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461243 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:00:30 +00:00
Thomas Graves 288393399a MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the trace contains null taskStatus for a task. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461242 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:52:40 +00:00
Thomas Graves 67b93ebb23 MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter is wrong when compressed input is used.(ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461236 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:42:29 +00:00
Thomas Graves 1f988b777c MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input data directory already exists and -generate opton is erate opton is
+    given.(ravi

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461233 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:29:26 +00:00
Thomas Graves 9a217a56dc MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster job submission. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461212 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:35:58 +00:00
Thomas Graves 603eff7e8b HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken. (Andrew Wang via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461205 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:27:25 +00:00
Robert Joseph Evans 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
Tsz-wo Sze 17a304973c svn merge -c 1461040 from trunk for HDFS-4598. Fix the default value of ConcatSourcesParam and the WebHDFS doc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461042 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 09:57:19 +00:00
Alejandro Abdelnur 13aa009480 YARN-469. Make scheduling mode in FS pluggable. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460962 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 03:27:26 +00:00
Bikas Saha ab3c4b7e68 Merge -c 1460954 from trunk to branch-2 for YARN-498. Unmanaged AM launcher does not set various constants in env for an AM, also does not handle failed AMs properly (Hitesh Shah via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460955 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 02:37:17 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 8ce818a836 YARN-378. Fix RM to make the AM max attempts/retries to be configurable per application by clients. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1460895 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460897 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 21:14:42 +00:00
Bikas Saha 6d784e9be0 merge -c r1460846 from trunk to branch-2 for YARN-497. Yarn unmanaged-am launcher jar does not define a main class in its manifest (Hitesh Shah via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460847 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:59:05 +00:00
Siddharth Seth 4410861077 merge YARN-439 from trunk. Flatten NodeHeartbeatResponse. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460812 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:30:15 +00:00
Siddharth Seth a427b71a25 merge YARN-71 from trunk. Fix the NodeManager to clean up local-dirs on restart. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460809 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:25:13 +00:00
Suresh Srinivas 13017132fa HADOOP-9408. Merge change r1457015 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460800 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:08:36 +00:00
Siddharth Seth 98fcb9eb89 reverting r1459593. HDFS-4584.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460795 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 17:57:35 +00:00
Siddharth Seth 3c2c6e4247 reverting r1459588. HDFS-4615.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460785 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 17:54:53 +00:00
Robert Joseph Evans c553e0ed7c svn merge -c 1460723 FIXES: YARN-109. .tmp file is not deleted for localized archives (Mayank Bansal via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460728 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 15:48:46 +00:00
Bikas Saha 67250d7a00 merge -c r1460064 from trunk to branch-2 for YARN-417. Addendum patch (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460065 13f79535-47bb-0310-9956-ffa450edef68
2013-03-23 00:11:04 +00:00
Hitesh Shah 9fbf4dedb4 merge -c 1460001 from trunk to branch-2 to fix YARN-470. Support a way to disable resource monitoring on the NodeManager. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460002 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 21:29:45 +00:00
Hitesh Shah c983b07753 MAPREDUCE-5083. 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@1459935 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 19:14:07 +00:00
Tsz-wo Sze 6af4449beb svn merge -c 1459592 from trunk for HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459593 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:57:30 +00:00
Tsz-wo Sze 21210295d6 svn merge -c 1459586 from trunk for HDFS-4615. Fix TestDFSShell failures on Windows.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459588 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:50:31 +00:00
Tsz-wo Sze 66dbdfeaf4 svn merge -c 1459576 from trunk for HDFS-4609. TestAuditLogs should release log handles between tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459577 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:19:45 +00:00
Tsz-wo Sze b005b46a95 svn merge -c 1459573 from trunk for HDFS-4607. In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459574 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:12:24 +00:00
Bikas Saha 4b1556e846 merge -c r1459555 from trunk to branch-2 for YARN-417. Create AMRMClient wrapper that provides asynchronous callbacks. (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459557 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 22:30:10 +00:00
Aaron Myers cbc30537d1 HDFS-4620. Documentation for dfs.namenode.rpc-address specifies wrong format. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459550 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 22:00:05 +00:00
Siddharth Seth 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
Aaron Myers 92af1b7d8d HDFS-4246. The exclude node list should be more forgiving, for each output stream. Contributed by Harsh J. Chouraria.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459495 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 19:48:41 +00:00
Hitesh Shah b53ed760a0 merge -c 1459054 from trunk to branch-2 to fix YARN-297. Improve hashCode implementations for PB records. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459055 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 21:11:16 +00:00
Hitesh Shah 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
Robert Joseph Evans 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