Commit Graph

5262 Commits

Author SHA1 Message Date
Andrew Wang 7c9efe4095 HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538061 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 20:58:23 +00:00
Chris Nauroth 5b7f2a5a2d MAPREDUCE-5604. Merging change r1538035 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538038 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 19:12:36 +00:00
Sanford Ryza d023d52062 MAPREDUCE-5601. ShuffleHandler fadvises file regions as DONTNEED even when fetch fails (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 08:55:05 +00:00
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 7ff13102d5 YARN-1290. Let continuous scheduling achieve more balanced task assignment (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 22:07:09 +00:00
Andrew Wang 4dfa0bf99f HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537638 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:56:42 +00:00
Sanford Ryza 3c0ad2500d YARN-1381. Same relaxLocality appears twice in exception message of AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537636 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:53:56 +00:00
Vinod Kumar Vavilapalli ad46e707f4 YARN-891. Modified ResourceManager state-store to remember completed applications so that clients can get information about them post RM-restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1537560 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537561 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 17:25:37 +00:00
Alejandro Abdelnur 5ac97bbe25 YARN-1343. NodeManagers additions/restarts are not reported as node updates in AllocateResponse responses to AMs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537369 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 02:57:33 +00:00
Chris Nauroth 8992fecc1d HDFS-4633. Merging change r1461846 and r1537345 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537347 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 23:50:22 +00:00
Vinod Kumar Vavilapalli 924f0429b7 YARN-1321. Changed NMTokenCache to support both singleton and an instance usage. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1537334 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537335 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 22:38:38 +00:00
Chris Nauroth 52af62711f HDFS-5065. Merging change r1537319 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537320 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:53:23 +00:00
Chris Nauroth bbda888b57 YARN-1358. Merging change r1537305 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537307 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:16:13 +00:00
Chris Nauroth f6bb3ce621 YARN-1357. Merging change r1537293 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537296 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 20:53:16 +00:00
Chris Nauroth 3c9728b41e HDFS-5432. Merging change r1537230 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537232 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 18:40:36 +00:00
Andrew Wang ed3161c331 HDFS-5433. When reloading fsimage during checkpointing, we should clear existing snapshottable directories. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537194 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 17:29:14 +00:00
Sanford Ryza 6902aea705 YARN-1306. Clean up hadoop-sls sample-conf according to YARN-1228 (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536990 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 06:57:41 +00:00
Arpit Agarwal 57bdb564c7 HDFS-5436. Merging change r1536921 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536922 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:50:24 +00:00
Bikas Saha 330ada83eb Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:21:06 +00:00
Colin McCabe 11b73ddbcc move HDFS-4657 to branch-2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536886 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:01:51 +00:00
Jason Darrell Lowe 4b316b63c9 svn merge -c 1536724 FIXES: MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey. Contributed by Robert Kanter
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536725 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 14:07:33 +00:00
Jason Darrell Lowe 72d881132f svn merge -c 1536711 FIXES: MAPREDUCE-5596. Allow configuring the number of threads used to serve shuffle connections. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536720 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 13:53:55 +00:00
Sanford Ryza 67365f3172 YARN-1109. Demote NodeManager "Sending out status for container" logs to debug (haosdent via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536574 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 00:57:03 +00:00
Sanford Ryza dd3e38280a MAPREDUCE-4680. Job history cleaner should only check timestamps of files in old enough directories (Robert Kanter via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536561 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 23:54:52 +00:00
Chris Nauroth 011733b686 HDFS-5413. Merging change r1536448 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536450 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:58:14 +00:00
Chris Nauroth dc6d54e911 YARN-1349. Merging change r1536443 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536445 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:51:00 +00:00
Bikas Saha eab6a16ce6 Merge r1536248 from trunk to branch-2 for YARN-1022. Unnecessary INFO logs in AMRMClientAsync (haosdent via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536250 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 04:51:23 +00:00
Chris Nauroth abddbcd9bf HADOOP-10072. Merging change r1535918 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535919 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 04:32:25 +00:00
Sanford Ryza 2301e3a163 YARN-1333. Support blacklisting in the Fair Scheduler (Tsuyoshi Ozawa via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535902 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 00:34:14 +00:00
Jing Zhao 9c78f870d8 HDFS-5257. Merge change r1535811 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535813 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 18:46:57 +00:00
Brandon Li c86c303a62 HDFS-5171. Merging change r1535586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535588 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:52:16 +00:00
Sanford Ryza 81d6bead1e YARN-1335. Move duplicate code from FSSchedulerApp and FiCaSchedulerApp into SchedulerApplication (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535583 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:17:45 +00:00
Jonathan Turner Eagles 076e78d021 HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535267 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 02:40:49 +00:00
Kihwal Lee 82d08eb6d4 svn merge -c 1535188 merging from trunk to branch-2 to fix HDFS-5341.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535190 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:31:23 +00:00
Jing Zhao 9a3e05cc6c HDFS-5363. Merge change r1535169 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535183 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:04:58 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Aaron Myers 3e65694f2b HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535057 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 15:20:35 +00:00
Jonathan Turner Eagles d93e30e3a2 HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534906 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 04:15:16 +00:00
Bikas Saha 7f27c99a44 Merge r1534884 from trunk to branch-2 YARN-1305. RMHAProtocolService#serviceInit should handle HAUtil's IllegalArgumentException (Tsuyoshi Ozawa via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:16:05 +00:00
Sanford Ryza 6d2ef587d0 YARN-1330. Fair Scheduler: defaultQueueSchedulingPolicy does not take effect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534862 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:58:15 +00:00
Jason Darrell Lowe d480fb0cbb svn commit -c 1534832 FIXES: MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534835 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 22:44:25 +00:00
Jonathan Turner Eagles 2f8b662fc6 YARN-1183. MiniYARNCluster shutdown takes several minutes intermittently (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534806 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 21:37:03 +00:00
Colin McCabe f6aa656ff3 HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534656 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 15:13:12 +00:00
Sanford Ryza 0d445fe01f YARN-1315. TestQueueACLs should also test FairScheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534510 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 06:33:11 +00:00
Chris Nauroth c534b8f0ba YARN-1331. Merging change r1534499 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534500 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 05:41:33 +00:00
Jonathan Turner Eagles f64cb91d67 HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534476 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 03:48:37 +00:00
Tsz-wo Sze a5d967a4dc svn merge -c 1534426 from trunk for HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:21:24 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:20:35 +00:00
Jing Zhao 7a45ef2300 HDFS-5382. Merge change r1534368 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534374 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:10:57 +00:00
Sanford Ryza 829fc289cf YARN-1288. Make Fair Scheduler ACLs more user friendly (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534316 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:46:14 +00:00