Commit Graph

6310 Commits

Author SHA1 Message Date
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
Sanford Ryza 4518a0db27 YARN-1864. Fair Scheduler Dynamic Hierarchical User Queues (Ashwin Shankar via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593192 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 07:23:19 +00:00
Arpit Agarwal 868e9b6431 HADOOP-10467: Merging r1593162 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593164 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 00:46:14 +00:00
Alejandro Abdelnur c278e40239 HADOOP-10556. [FIXING JIRA NUMBER TYPO] Add toLowerCase support to auth_to_local rules for service name. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593108 13f79535-47bb-0310-9956-ffa450edef68
2014-05-07 18:24:40 +00:00
Alejandro Abdelnur 2d683525d2 HADOOP-10566. Add toLowerCase support to auth_to_local rules for service name. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593106 13f79535-47bb-0310-9956-ffa450edef68
2014-05-07 18:22:12 +00:00
Haohui Mai caa1107813 HADOOP-10471. Merge r1592915 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592917 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 22:45:03 +00:00
Chris Nauroth 7a0d71916d HADOOP-10517. Merging change r1592855 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592856 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 19:54:12 +00:00
Chris Nauroth bfe689c00b HADOOP-10541. Merging change r1592803 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592804 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:56:24 +00:00
Jonathan Turner Eagles 7ac359f389 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592796 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:18:13 +00:00
Jonathan Turner Eagles 72feaf0436 MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592792 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:05:37 +00:00
Arpit Agarwal c03108299b YARN-2018: Merging r1592783 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 15:47:01 +00:00
Tsz-wo Sze 6b7d074a54 svn merge -c 1592703 from trunk for MAPREDUCE-5402. In DynamicInputFormat, change MAX_CHUNKS_TOLERABLE, MAX_CHUNKS_IDEAL, MIN_RECORDS_PER_CHUNK and SPLIT_RATIO to be configurable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592704 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 10:25:10 +00:00
Uma Maheswara Rao G 9f54a6f230 Merge. HDFS-6337. Setfacl testcase is failing due to dash character in username in TestAclCLI. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592491 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 11:56:53 +00:00
Andrew Wang 4abbc157e1 HDFS-6295. Add decommissioning state and node state filtering to dfsadmin. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592439 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 03:40:00 +00:00
Junping Du ffb4fc03c2 Merge r1592197 from trunk: YARN-1201. TestAMAuthorization fails with local hostname cannot be resolved. (Wangda Tan via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592198 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 13:06:32 +00:00
Tsz-wo Sze 75955e7c50 svn merge -c 1592179 from trunk for HDFS-5168. Add cross node dependency support to BlockPlacementPolicy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592181 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 11:04:35 +00:00
Aaron Myers 775b27a6fe HADOOP-10568. Add s3 server-side encryption. Contributed by David S. Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592134 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 00:26:23 +00:00
Chris Nauroth dcf7c356ce HADOOP-10549. Merging change r1592011 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592012 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 19:15:39 +00:00
Arpit Agarwal cb889486aa HADOOP-10562: Merging r1592002 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592003 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 18:39:07 +00:00
Arpit Agarwal 86e5a7f96d HADOOP-10562. Undo previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-01 21:19:58 +00:00
Arpit Agarwal 21c1b0cba4 HADOOP-10562: Merging r1591782 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591783 13f79535-47bb-0310-9956-ffa450edef68
2014-05-01 21:15:25 +00:00
Vinod Kumar Vavilapalli 0a914b61e0 YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1591416 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591417 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 18:01:05 +00:00
Aaron Myers fdf685576e HDFS-6289. HA failover can fail if there are pending DN messages for DNs which no longer exist. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591414 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 17:48:17 +00:00
Haohui Mai 915b7bc3a6 HDFS-6304. Merge r1591411 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591412 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 17:45:57 +00:00