Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,447 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

4447 Commits

Author SHA1 Message Date
Arun Murthy 75747321b7 Merge -c 1489234 from trunk to branch-2 to fix YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489235 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:50:54 +00:00
Arun Murthy f67731cc03 MAPREDUCE-5300. Moved to INCOMPATIBLE CHANGES section in CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489233 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:47:19 +00:00
Arun Murthy 5e0f224234 MAPREDUCE-5299. Changed jira number for the commit in CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489230 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:45:37 +00:00
Arun Murthy 6edd290758 Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:43:14 +00:00
Arun Murthy 1d77b6c417 Merge -c 1489219 from trunk to branch-2 to fix MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489220 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 22:55:22 +00:00
Arun Murthy 89a1e48cd7 Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489188 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 21:35:33 +00:00
Jonathan Turner Eagles f14bc7934e HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi Prakash via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489153 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 20:25:11 +00:00
Arun Murthy 59d44bb72c Merge -c 1489087 from trunk to branch-2 to fix YARN-398. Make it possible to specify hard locality constraints in resource requests for CapacityScheduler. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489088 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 18:15:04 +00:00
Alejandro Abdelnur 7854b322d4 YARN-326. Add multi-resource scheduling to the fair scheduler. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489072 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 17:36:20 +00:00
Thomas White f3c4f2b3e2 Merge -r 1489059:1489060 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489061 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 16:55:51 +00:00
Jason Darrell Lowe f09946bd47 svn merge -c 1489012 FIXES: MAPREDUCE-5268. Improve history server startup performance. Contributed by Karthik Kambatla 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489015 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 14:51:37 +00:00
Tsz-wo Sze 6bd7b27abf svn merge -c 1431726 from trunk for HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488856 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 06:13:53 +00:00
Tsz-wo Sze 4519131f77 svn merge -c 1430917 from trunk for HDFS-4261. Fix bugs in Balaner causing infinite loop and TestBalancerWithNodeGroup timeing out. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488855 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 06:11:22 +00:00
Tsz-wo Sze 8dd8c00fbb svn merge -c 1416691 from trunk for HDFS-4240. For nodegroup-aware block placement, when a node is excluded, he nodes in the same nodegroup should also be excluded. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488851 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:50:16 +00:00
Tsz-wo Sze 9b8d329e65 svn merge -c 1417130 from trunk for HDFS-4234. Use generic code for choosing datanode in Balancer. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488850 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:39:04 +00:00
Tsz-wo Sze 16995501d3 Merge r1414874 and r1414878 from trunk for HDFS-3495. Update Balancer to support new NetworkTopology with NodeGroup. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488848 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:28:34 +00:00
Tsz-wo Sze f8bb18770b svn merge -c 1357442 from trunk for HDFS-3601. Add BlockPlacementPolicyWithNodeGroup to support block placement with 4-layer network topology. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488845 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:59:48 +00:00
Tsz-wo Sze 4c734a8ee8 svn merge -c 1353807 from trunk for HDFS-3498. Support replica removal in BlockPlacementPolicy and make BlockPlacementPolicyDefault extensible for reusing code in subclasses. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488844 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:35:04 +00:00
Arun Murthy 62ab1db78b Merge -c 1488840 from trunk to branch-2 to fix YARN-730. Fix NMClientAsync to remove completed containers. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488841 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:12:45 +00:00
Tsz-wo Sze 8ecc0ba26f svn merge -c 1351445 from trunk for HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation of NetworkTopology. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488839 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:05:41 +00:00
Tsz-wo Sze 1d520009e3 svn merge -c 1347867 from trunk for HADOOP-8469. Make NetworkTopology class pluggable. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488838 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 03:57:32 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 02:36:44 +00:00
Arun Murthy 7246cf9b41 Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-02 22:55:31 +00:00
Tsz-wo Sze 332cf8faeb svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488631 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 23:02:10 +00:00
Vinod Kumar Vavilapalli 17476d2fa7 MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488625 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488626 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:22:27 +00:00
Vinod Kumar Vavilapalli 3de04e6401 MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488621 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488623 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:12:25 +00:00
Vinod Kumar Vavilapalli 404b3896c9 YARN-733. Fixed TestNMClient from failing occasionally. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488618 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488619 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:02:44 +00:00
Vinod Kumar Vavilapalli 41ed12124c YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He. 
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 21:45:24 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Konstantin Boudnik 44a72a119a Adding 2.0.5-alpha release to CHANGES.txt files of branch-2 
Also updating current version to 2.1.0-beta in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:32 +00:00
Bikas Saha 395afc7b94 Merge r1488485 from trunk for YARN-660. Improve AMRMClient with matching requests (bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488487 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 08:31:50 +00:00
Vinod Kumar Vavilapalli 4e0ac70cea MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488458 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488459 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 03:59:23 +00:00
Vinod Kumar Vavilapalli 089b3edd0e MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488442 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488443 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:34:24 +00:00
Siddharth Seth cdab92d0c3 merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:15:53 +00:00
Vinod Kumar Vavilapalli 75a96a140a MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488436 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488437 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 23:57:42 +00:00
Vinod Kumar Vavilapalli 297e916f41 MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488370 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 19:48:30 +00:00
Alejandro Abdelnur ab4b602ca6 YARN-392. Make it possible to specify hard locality constraints in resource requests. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488328 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 17:28:10 +00:00
Christopher Douglas 1711348e48 MAPREDUCE-5176. Add annotation for tagging tasks as responsive to 
preemption. Contributed by Carlo Curino, cdouglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 06:07:37 +00:00
Tsz-wo Sze 360fa0c6f5 svn merge -c 1487942 from trunk for HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output hat ".snapshot" is a reserved name. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488097 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:16:05 +00:00
Tsz-wo Sze 6428612f35 svn merge -c 1487698 from trunk for HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488096 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:13:32 +00:00
Tsz-wo Sze 74fa2f1de8 svn merge -c 1487655 from trunk for HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488094 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:10:06 +00:00
Tsz-wo Sze 387b7af02f svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488093 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:07:52 +00:00
Tsz-wo Sze ab2588a78b svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488091 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:03:27 +00:00
Tsz-wo Sze 1b594395da svn merge -c 1483150 from trunk for HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488090 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:50:10 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:29:20 +00:00
Siddharth Seth 36ef457902 merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:18:50 +00:00
Siddharth Seth e6a9c87a11 YARN-684. ContainerManager.startContainer should use ContainerTokenIdentifier instead of the entire Container. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488086 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:14:27 +00:00
Sanjay Radia 5f96f3a0c3 Merged HADOOP-7391 svn merge -c 1488069 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488071 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 00:54:05 +00:00
Vinod Kumar Vavilapalli 1a8872e1e0 MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli d95c5a23d9 MAPREDUCE-5261. Reverting the patch as it is no longer needed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 21:54:28 +00:00