Commit Graph

6333 Commits

Author SHA1 Message Date
Kihwal Lee fe0180dd6c svn merge -c 1594709 merging from trunk to branch-2 to fix:HDFS-2949. Add check to active state transition to prevent operator-induced split brain. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594710 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 20:46:38 +00:00
Christopher Douglas 28301a6b79 MAPREDUCE-5821. Avoid unintentional reallocation of byte arrays in segments
during merge. Contributed by Todd Lipcon


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594655 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 17:51:21 +00:00
Sanford Ryza 25118a97d8 YARN-2042. String shouldn't be compared using == in QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594486 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 06:56:00 +00:00
Sanford Ryza 6fcfde13f3 YARN-1986. In Fifo Scheduler, node heartbeat in between creating app and attempt causes NPE (Hong Zhiguo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594478 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 06:44:52 +00:00
Jing Zhao 08a1301381 HDFS-6381. Merge r1594447 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594448 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 02:52:41 +00:00
Kihwal Lee f4b4bf14d3 HDFS-6293. Issues with OIV processing PB-based fsimages. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594440 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 01:15:48 +00:00
Junping Du ffb0d24fef Merge r1594421 from trunk: YARN-1362. Distinguish between nodemanager shutdown for decommission vs shutdown for restart. (Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594422 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 00:25:08 +00:00
Christopher Douglas 2d932cb8aa YARN-1957. Consider the max capacity of the queue when computing the ideal
capacity for preemption. Contributed by Carlo Curino


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594415 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 23:15:41 +00:00
Chris Nauroth b989f9780a HDFS-6370. Merging change r1594362 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594365 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 20:11:40 +00:00
Jonathan Turner Eagles a943350eb9 YARN-1981. Nodemanager version is not updated when a node reconnects (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594361 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 20:08:18 +00:00
Vinod Kumar Vavilapalli 155e816bc2 YARN-1861. Fixed a bug in RM to reset leader-election on fencing that was causing both RMs to be stuck in standby mode when automatic failover is enabled. Contributed by Karthik Kambatla and Xuan Gong.
svn merge --ignore-ancestry -c 1594356 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594357 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 20:03:52 +00:00
Colin McCabe 7b27dcf4dc HDFS-6355. Fix divide-by-zero, improper use of wall-clock time in BlockPoolSliceScanner (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594339 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 19:25:23 +00:00
Karthik Kambatla 96d4036449 MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594332 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 19:14:07 +00:00
Jason Darrell Lowe 890cd33bf7 svn merge -c 1594326 FIXES: MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594328 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:59:56 +00:00
Jing Zhao 8fb3e34e74 HDFS-6186. Merge change r1594314 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594324 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:41:07 +00:00
Jonathan Turner Eagles f8dad8a751 MAPREDUCE-5888. Failed job leaves hung AM after it unregisters (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594318 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:28:07 +00:00
Brandon Li 090003221e HADOOP-10572. Merging change r1594289 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594291 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:12:03 +00:00
Suresh Srinivas 99025aacd6 Revert the commit r1594283
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594285 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:01:24 +00:00
Suresh Srinivas 196ee73e9a HADOOP-10566. Adding files missed in previous commit 1594280
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594283 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:00:01 +00:00
Jason Darrell Lowe e463efc4cb svn merge -c 1594275 FIXES: YARN-1751. Improve MiniYarnCluster for log aggregation testing. Contributed by Ming Ma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594276 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:44:58 +00:00
Jonathan Turner Eagles d389c8940e HDFS-6305. WebHdfs response decoding may throw RuntimeExceptions (Daryn Sharp via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594274 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:43:30 +00:00
Jonathan Turner Eagles 8379c0c944 HADOOP-10585. Retry polices ignore interrupted exceptions (Daryn Sharp via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594270 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:32:24 +00:00
Kihwal Lee a7e29582c3 svn merge -c 1594263 merging from trunk to branch-2 to fix:HDFS-6334. Client failover proxy provider for IP failover based NN HA. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594264 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:21:20 +00:00
Uma Maheswara Rao G 72763dbee9 Merge. HDFS-6367. EnumSetParam$Domain#parse fails for parameter containing more than one enum. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594151 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 07:36:22 +00:00
Jian He 77dc706480 Merge r1594123 from trunk. YARN-1976. Fix CHANGES.txt for YARN-1976.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594124 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 04:50:49 +00:00
Jian He 634485191e Merge r1594085 from trunk. YARN-2016. Fix a bug in GetApplicationsRequestPBImpl to add the missed fields to proto. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594086 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 20:48:23 +00:00
Kihwal Lee 5ee9c6f28a svn merge -c 1594055 merging from trunk to branch-2 to fix:HDFS-5522. Datanode disk error check may be incorrectly skipped. Contributed by Rushabh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594056 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 19:09:42 +00:00
Haohui Mai ab40d65107 HDFS-6230. Merge r1594040 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594041 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 18:04:01 +00:00
Andrew Wang c579bef2fc HDFS-6351. Command hdfs dfs -rm -r can't remove empty directory. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594037 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 17:55:23 +00:00
Karthik Kambatla 7fe885d83f MAPREDUCE-5774. Job overview in History UI should list reducer phases in chronological order. (Gera Shegalov via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593891 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 06:16:24 +00:00
Jian He d2314c583d Merge r1593874 from trunk. YARN-1975. Fix yarn application CLI to print the scheme of the tracking url of failed/killed applications. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593875 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 00:45:43 +00:00
Junping Du 62497eb64f Merge r1593804 from trunk: YARN-2011. Fix typo and warning in TestLeafQueue (Contributed by Chen He)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593805 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 15:16:32 +00:00
Karthik Kambatla 884ff10d48 YARN-1987. Wrapper for leveldb DBIterator to aid in handling database exceptions. (Jason Lowe via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593758 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 06:20:00 +00:00
Haohui Mai d7b201a16d HDFS-6328. Merge r1593755 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593756 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 05:08:03 +00:00
Vinod Kumar Vavilapalli a098b692f4 YARN-1962. Changed Timeline Service client configuration to be off by default given the non-readiness of the feature yet. Contributed by Mohammad Kamrul Islam.
svn merge --ignore-ancestry -c 1593750 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593751 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:15:48 +00:00
Vinod Kumar Vavilapalli 914c871296 YARN-1982. Renamed the daemon name to be TimelineServer instead of History Server and deprecated the old usage. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1593748 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593749 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:05:31 +00:00
Junping Du 4b27c6882a Merge r1593660 from trunk: YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format issue in trunk. (Contributed by Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593661 13f79535-47bb-0310-9956-ffa450edef68
2014-05-10 03:47:43 +00:00
Colin McCabe fea7cd3c12 HDFS-6294. Use INode IDs to avoid conflicts when a file open for write is renamed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593638 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 22:55:17 +00:00
Sanford Ryza 29a124d09d YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593632 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 22:19:14 +00:00
Haohui Mai 03b04fbe28 HDFS-6240. Merge r1593591 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593593 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 18:45:19 +00:00
Zhijie Shen cf42886750 YARN-1701. Improved default paths of the timeline store and the generic history store. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1593481 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593484 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 04:26:36 +00:00
Kihwal Lee d39b25b0e3 svn merge -c 1593475 merging from trunk to branch-2 to fix:HDFS-6313. WebHdfs may use the wrong NN when configured for multiple HA NNs. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593476 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 02:03:27 +00:00
Kihwal Lee 26601f37b0 Fix CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593474 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 01:52:49 +00:00
Kihwal Lee 93cc9f7e97 svn merge -c 1593470 merging from trunk to branch-2 to fix:HDFS-6329. WebHdfs does not work if HA is enabled on NN but logical URI is not configured. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593471 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 01:48:28 +00:00
Arpit Agarwal 92fdc7113f HDFS-6340: Merging r1593436 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593437 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 22:21:10 +00:00
Jason Darrell Lowe 3019b2c7f0 svn merge -c 1593422 FIXES: MAPREDUCE-5884. History server uses short user name when canceling tokens. Contributed by Mohammad Kamrul Islam
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593424 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 21:28:43 +00:00
Kihwal Lee 76bfc73cc9 svn merge -c 1593362 merging from trunk to branch-2 to fix:HADOOP-10158. SPNEGO should work with multiple interfaces/SPNs. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593363 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 18:28:22 +00:00
Kihwal Lee cf7d09e0a2 Correcting the check-in mistake for HADOOP-10581.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593361 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 18:24:29 +00:00
Kihwal Lee 559fcdc2a6 svn merge -c 1593357 merging from trunk to branch-2 to fix:HADOOP-10581. TestUserGroupInformation#testGetServerSideGroups fails. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593358 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 18:04:59 +00:00
Colin McCabe 0e76ba79d6 HDFS-5381. ExtendedBlock#hashCode should use both blockId and block pool ID (Benoy Antony via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593348 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 17:50:24 +00:00