Commit Graph

4142 Commits

Author SHA1 Message Date
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
Tsz-wo Sze aa874f3952 svn merge -c 1458749 from trunk for moving MAPREDUCE-5075 to 2.0.5-beta in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458753 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:49:54 +00:00
Tsz-wo Sze 84664ccde2 svn merge -c 1458741 from trunk for MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream does not close the wrapped InputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458747 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:43:21 +00:00
Aaron Myers e25308f415 HDFS-4614. FSNamesystem#getContentSummary should use getPermissionChecker helper method. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458595 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 00:38:26 +00:00
Jason Darrell Lowe f854b9863b svn merge -c 1458466 FIXES: YARN-200. yarn log does not output all needed information, and is in a binary format. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458473 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 19:39:31 +00:00
Alejandro Abdelnur 35bc29813f Reverting MAPREDUCE-5028 (commit 1457919)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 18:00:38 +00:00
Jonathan Turner Eagles 3fdeec0bd3 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 15:48:36 +00:00
Bikas Saha 9f7823656b merge -c r1458065 from trunk to branch-2 for YARN-481. Add AM Host and RPC Port to ApplicationCLI Status Output (Chris Riccomini via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458067 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 00:00:12 +00:00
Konstantin Boudnik 43015559ed Fixing CHANGES.txt: moving HADOOP-9299 to 2.0.4-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457976 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 20:29:28 +00:00
Alejandro Abdelnur d311bf9c24 YARN-485. TestProcfsProcessTree#testProcessTree() doesn't wait long enough for the process to die. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457938 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 19:44:23 +00:00
Alejandro Abdelnur 1036f637cc MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 18:59:22 +00:00
Alejandro Abdelnur 60fcbe2e05 MAPREDUCE-4990. Construct debug strings conditionally in ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457916 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 18:46:36 +00:00
Aaron Myers eb6a563194 HDFS-4521. Invalid network toploogies should not be cached. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457883 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 17:26:45 +00:00
Daryn Sharp 8e2098fd2f svn merge -c 1457763 FIXES: HADOOP-9299. kerberos name resolution is kicking in even when kerberos is not configured (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457770 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 14:05:09 +00:00
Aaron Myers 7319e42239 HADOOP-9318. When exiting on a signal, print the signal name first. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457124 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 21:21:10 +00:00
Robert Joseph Evans 9a9d40200f svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 21:11:45 +00:00
Alejandro Abdelnur 3eeb720b2f MAPREDUCE-4716. TestHsWebServicesJobsQuery.testJobsQueryStateInvalid fails with jdk7. (tgraves via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457068 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:58:21 +00:00
Alejandro Abdelnur 1a00fa6e3a MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457063 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:51:22 +00:00
Hitesh Shah a21de508a1 merge -c 1457038 from trunk to branch-2 to fix YARN-196. Nodemanager should be more robust in handling connection failure to ResourceManager when a cluster is started. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457041 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:07:04 +00:00
Alejandro Abdelnur 5f0e779663 HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating conflicts in Oozie & HttpFS. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457001 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 16:17:41 +00:00
Alejandro Abdelnur a29d7b00c9 HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456730 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 00:28:27 +00:00
Suresh Srinivas 434388ff63 HADOOP-9407. Merge 1456704 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456705 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 22:35:12 +00:00
Aaron Myers 7a02bc2bac HDFS-4596. Shutting down namenode during checkpointing can lead to md5sum error. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456633 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 20:05:49 +00:00
Aaron Myers 600af6a60f HDFS-3277. fail over to loading a different FSImage if the first one we try to load is corrupt. Contributed by Colin Patrick McCabe and Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456585 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 18:17:56 +00:00
Robert Joseph Evans 3508e8e7dd svn merge -c 1456536 FIXES: YARN-237. Refreshing the RM page forgets how many rows I had in my Datatables (jian he via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 16:57:10 +00:00
Daryn Sharp daa634aa00 svn merge -c 1456469 FIXES: HDFS-3367. WebHDFS doesn't use the logged in user when opening connections (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456470 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 15:16:13 +00:00
Robert Joseph Evans a74edd5178 svn merge -c 1456458 FIXES: YARN-468. coverage fix for org.apache.hadoop.yarn.server.webproxy.amfilter (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456459 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 14:55:04 +00:00
Kihwal Lee 3a4e568e42 svn merge -c 1456172 Merging from trunk to branch-2 to fix HDFS-3344.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456176 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 22:00:15 +00:00