Commit Graph

3356 Commits

Author SHA1 Message Date
Suresh Srinivas 8b0db38ec8 HDFS-4046. Merging changes 1406011 and 1406012 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406013 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 23:56:01 +00:00
Robert Joseph Evans cb0f68cc3f svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 22:16:51 +00:00
Robert Joseph Evans 32c70d9ac1 svn merge -c 1405910 FIXES: HADOOP-9010. Map UGI authenticationMethod to RPC authMethod (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405911 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 18:40:39 +00:00
Robert Joseph Evans 310e59acd5 svn merge -c 1405904 FIXES: HADOOP-9009. Add SecurityUtil methods to get/set authentication method (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405905 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 18:32:33 +00:00
Robert Joseph Evans 63824dc88a svn merge -c 1405846. Localization Update
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405849 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 15:49:23 +00:00
Tsz-wo Sze 4dabf4874a svn merge -c 1405237 from trunk for HDFS-4143. Change blocks to private in INodeFile and renames isLink() to isSymlink() in INode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405241 13f79535-47bb-0310-9956-ffa450edef68
2012-11-03 00:27:42 +00:00
Todd Lipcon aa12dd4f77 HDFS-4132. When libwebhdfs is not enabled, nativeMiniDfsClient frees uninitialized memory. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405150 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 20:35:54 +00:00
Robert Joseph Evans 11822fb8ab svn merge -c 1404988 FIXES: MAPREDUCE-4763 repair test TestUmbilicalProtocolWithJobToken (Ivan A. Veselovsky via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404991 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 15:05:06 +00:00
Daryn Sharp 330562868f svn merge -c 1404985 FIXES: HDFS-3804. TestHftpFileSystem fails intermittently with JDK7 (Trevor Robinson via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404986 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 14:59:31 +00:00
Jason Darrell Lowe a280cd5567 svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 23:05:53 +00:00
Robert Joseph Evans d9e5740ce7 svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 17:07:24 +00:00
Vinod Kumar Vavilapalli 4722d76b4c YARN-189. Fixed a deadlock between RM's ApplicationMasterService and the dispatcher. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1404431 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404432 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 00:33:32 +00:00
Robert Joseph Evans 9d689a9db9 svn merge -c 1404305 FIXES: MAPREDUCE-4724. job history web ui applications page should be sorted to display last app first (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404306 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 19:13:59 +00:00
Robert Joseph Evans aaa448f9dd svn merge -c 1404247 FIXES: YARN-166. capacity scheduler doesn't allow capacity < 1.0 (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404249 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 17:00:01 +00:00
Robert Joseph Evans 08bae96f5c svn merge -c 1404228 FIXES: YARN-159. RM web ui applications page should be sorted to display last app first (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404230 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 16:24:25 +00:00
Robert Joseph Evans 763c672ba2 svn merge -c 1404211 FIXES: YARN-165. RM should point tracking URL to RM web page for app when AM fails (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404213 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:50:53 +00:00
Thomas Graves b958fa85a5 merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:02:59 +00:00
Suresh Srinivas c092ee4c4c HDFS-3916. Merge 1403922 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403925 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 23:19:40 +00:00
Uma Maheswara Rao G ef6b842f0e Removed .org files added in previous commit HDFS-3809
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403847 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 19:57:54 +00:00
Uma Maheswara Rao G d640907599 HDFS-3809. Make BKJM use protobufs for all serialization with ZK. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403846 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 19:56:02 +00:00
Uma Maheswara Rao G ff362d8fca Revert HDFS-3809 from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403806 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 18:00:08 +00:00
Robert Joseph Evans d1d1165a7d svn merge -c 1403745 FIXES: HADOOP-8986. Server$Call object is never released after it is sent (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403747 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:51:29 +00:00
Daryn Sharp bf335b6124 svn merge -c 1403714 FIXES: HADOOP-8994. TestDFSShell creates file named "noFileHere", making further tests hard to understand (Andy Isaacson via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403717 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 14:23:18 +00:00
Suresh Srinivas 4fbfe304bc HDFS-4127. Merge change 1403616 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403619 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 05:56:24 +00:00
Alejandro Abdelnur d3e2e2cb68 MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 05:52:17 +00:00
Uma Maheswara Rao G f1cf299d02 removed unnecessary .org files added as part of previous commit. HDFS-3809
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403607 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 02:28:58 +00:00
Uma Maheswara Rao G 1cc0b55c68 HDFS-3809. Make BKJM use protobufs for all serialization with ZK. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403606 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 02:25:31 +00:00
Uma Maheswara Rao G 59df5eb19f HDFS-3789. JournalManager#format() should be able to throw IOException. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403603 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 01:55:39 +00:00
Uma Maheswara Rao G 394d07c6a2 HDFS-3695. Genericize format() to non-file JournalManagers. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403600 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 01:32:07 +00:00
Uma Maheswara Rao G c44e61588f HDFS-3573. Supply NamespaceInfo when instantiating JournalManagers. Contributed by Todd Lipcon and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403594 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 01:09:58 +00:00
Suresh Srinivas 7634ab0bef HDFS-4122. Merging change r1403120 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403579 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 23:42:50 +00:00
Suresh Srinivas 17fc6ed3b8 HDFS-3920. Merging change 1403173 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403174 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 05:15:11 +00:00
Suresh Srinivas 35e59f0475 HDFS-4121. Merging change r1402836 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402841 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 18:36:22 +00:00
Jason Darrell Lowe 58c43cc8cb svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:05:33 +00:00
Thomas Graves dc4f199708 merge -r 1402659:1402660 from trunk. FIXES: HADOOP-8713
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402662 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:04:57 +00:00
Thomas White 348faf8f36 Merge -r 1402656:1402657 from trunk to branch-2. Fixes: YARN-145. Add a Web UI to the fair share scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402659 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:03:20 +00:00
Tsz-wo Sze 7692aa392b svn merge -c 1402608 from trunk for HDFS-3616. Fix a ConcurrentModificationException bug that BP actor threads
may not be shutdown properly in DataNode.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402609 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 18:24:09 +00:00
Tsz-wo Sze d1c730d716 svn merge -c 1402599 from trunk for HDFS-4112. A few improvements on INodeDirectory include adding a utility method for casting; avoiding creation of new empty lists; cleaning up some code and rewriting some javadoc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402602 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 18:13:59 +00:00
Tsz-wo Sze 6f91542707 svn merge -c 1402270 from trunk for HDFS-3948. Do not use hflush in TestWebHDFS.testNamenodeRestart() since the out stream returned by WebHdfsFileSystem does not support it.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402273 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 18:58:35 +00:00
Tsz-wo Sze 1711ef5bfb svn merge -c 1402265 from trunk for HDFS-4107. Add utility methods for casting INode to INodeFile and INodeFileUnderConstruction.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402271 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 18:53:50 +00:00
Vinod Kumar Vavilapalli 79a14bb25f MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1401941 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 01:27:17 +00:00
Jason Darrell Lowe 33cb0be07c svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:47:01 +00:00
Jason Darrell Lowe b702473f5c svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:25:22 +00:00
Robert Joseph Evans c4defd0cff svn merge -c 1401703 FIXES: YARN-180. Capacity scheduler - containers that get reserved create container token to early (acmurthy and bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401705 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:20:09 +00:00
Robert Joseph Evans bc6fbf8b74 svn merge -c 1401698 FIXES: YARN-178. Fix custom ProcessTree instance creation (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401700 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:08:28 +00:00
Thomas Graves 1ef0ff3af5 merge -r 1401667:1401668 from trunk. FIXES: YARN-177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401669 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 13:25:19 +00:00
Vinod Kumar Vavilapalli e49fb14997 YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
Daryn Sharp d647f98cb8 Updating credits for MAPREDUCE-4229.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401491 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:19:02 +00:00
Daryn Sharp 7b36e659c1 svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:10:17 +00:00
Siddharth Seth 243966374b merge YARN-179 from trunk. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401482 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:07:42 +00:00