Commit Graph

4033 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli c3981d3f2c MAPREDUCE-4892. Modify CombineFileInputFormat to not skew input slits' allocation on small clusters. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1450912 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450915 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 18:53:03 +00:00
Robert Joseph Evans 829a798201 svn merge -c 1450807 FIXES: YARN-426. Failure to download a public resource prevents further downloads (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450811 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 15:33:22 +00:00
Thomas White 7b943682fb Merge -r 1450722:1450723 from trunk to branch-2. Fixes: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450724 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 10:40:52 +00:00
Aaron Myers ba7b51eec1 MAPREDUCE-5033. mapred shell script should respect usage flags (--help -help -h). Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450585 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 02:43:27 +00:00
Suresh Srinivas 680c612ca4 HADOOP-8917. Changed contributed by from Arpit Agarwal to Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450576 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 01:45:04 +00:00
Suresh Srinivas d0e1c8656e HADOOP-8917. Merge 1450571 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450572 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 01:39:01 +00:00
Suresh Srinivas 6485664b15 HADOOP-9334. Merge change 1450463 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 22:02:30 +00:00
Siddharth Seth c215e12419 merge YARN-365 from trunk. Change NM heartbeat handling to not generate a scheduler event on each heartbeat. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450008 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 03:33:01 +00:00
Aaron Myers 89f14ca928 HADOOP-7487. DF should throw a more reasonable exception when mount cannot be determined. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449994 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 01:43:44 +00:00
Suresh Srinivas dbb624ed74 YARN-390. Merge r1449980 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449986 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 00:57:35 +00:00
Aaron Myers 0c9ceb03b2 HDFS-4235. When outputting XML, OfflineEditsViewer can't handle some edits containing non-ASCII strings. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449985 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 00:52:38 +00:00
Suresh Srinivas a3e4b7a6fb HADOOP-9323. Merge change 1449977 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449979 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 00:16:37 +00:00
Aaron Myers dcc8325c12 HADOOP-8569. CMakeLists.txt: define _GNU_SOURCE and _LARGEFILE_SOURCE. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449923 13f79535-47bb-0310-9956-ffa450edef68
2013-02-25 22:08:33 +00:00
Suresh Srinivas 5feb62204d HADOOP-9279. Merging change r1449543 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449544 13f79535-47bb-0310-9956-ffa450edef68
2013-02-24 20:21:45 +00:00
Konstantin Boudnik 8f5c630a58 HDFS-4269. DatanodeManager#registerDatanode rejects all datanode registrations
from localhost in single-node developer setup  (Contributed by Chris Nauroth)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449256 13f79535-47bb-0310-9956-ffa450edef68
2013-02-22 23:53:56 +00:00
Aaron Myers 90e4d62cec HDFS-4304. Make FSEditLogOp.MAX_OP_SIZE configurable. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449219 13f79535-47bb-0310-9956-ffa450edef68
2013-02-22 21:28:29 +00:00
Aaron Myers a58b66808b HADOOP-9267. hadoop -help, -h, --help should show usage instructions. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449162 13f79535-47bb-0310-9956-ffa450edef68
2013-02-22 18:37:30 +00:00
Suresh Srinivas 9ce332ad39 HDFS-4222. Merge r1448801 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448805 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 21:09:17 +00:00
Uma Maheswara Rao G 975d24feb1 Merge HDFS-4482. ReplicationMonitor thread can exit with NPE due to the race between delete and replication of same file. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448716 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 16:39:40 +00:00
Thomas White 96b3905afd Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448618 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 12:04:46 +00:00
Thomas White a9f552cb33 Merge -r 1448601:1448602 from trunk to branch-2. Fixes: MAPREDUCE-5013. mapred.JobStatus compatibility: MR2 missing constructors from MR1. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448604 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 11:44:50 +00:00
Thomas White af07edf1ab Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 11:36:26 +00:00
Jonathan Turner Eagles 937ef703eb YARN-236. RM should point tracking URL to RM web page when app fails to start (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448408 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 21:00:05 +00:00
Thomas Graves e9880d5942 YARN-400. RM can return null application resource usage report leading to NPE in client (Jason Lowe via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448243 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 15:37:27 +00:00
Jonathan Turner Eagles e3afdf5aa9 MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear the value from the Task commitAttempt member (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1447969 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 23:42:40 +00:00
Alejandro Abdelnur 270ecc1b98 HADOOP-9304. remove addition of avro genreated-sources dirs to build. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446297 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 18:50:29 +00:00
Thomas White b1a31d484d Merge -r 1446182:1446183 from trunk to branch-2. Fixes: HADOOP-9154. SortedMapWritable#putAll() doesn't add key/value classes to the map. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446186 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 14:09:23 +00:00
Alejandro Abdelnur 67aaee865f HADOOP-9297. remove old record IO generation and tests. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446045 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:28:46 +00:00
Alejandro Abdelnur 7f9b4c4e8b MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:22:41 +00:00
Alejandro Abdelnur 1195fc994a HADOOP-9246. Amending CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446023 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:45:37 +00:00
Alejandro Abdelnur 1709c222d9 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:36:47 +00:00
Alejandro Abdelnur ca12c99c79 HADOOP-9246. Execution phase for hadoop-maven-plugin should be process-resources. Contributed by Karthik Kambatla and Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446020 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:32:58 +00:00
Alejandro Abdelnur 41cd04e92b HADOOP-9245. mvn clean without running mvn install before fails. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446019 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:32:30 +00:00
Alejandro Abdelnur 2d35d0063a HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. Contributed by Alejandro Abdelnur and Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446018 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:30:50 +00:00
Kihwal Lee 6beda592cc svn merge 1445964:1445965 from trunk to branch-2 to fix HDFS-4495.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445968 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:59:27 +00:00
Aaron Myers 2fb899b9b3 HADOOP-9305. Add support for running the Hadoop client on 64-bit AIX. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445885 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:46:27 +00:00
Siddharth Seth 19e5586651 merge YARN-391 from trunk. Formatting fixes for LCEResourceHandler classes. Contributed by Steve Loughran.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445883 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:41:22 +00:00
Siddharth Seth d53d4cbca3 merge MAPREDUCE-5000 from trunk. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445873 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:23:50 +00:00
Thomas Graves 208238887c YARN-249. Capacity Scheduler web page should show list of active users per queue like it used to (in 1.x) (Ravi Prakash via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445691 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:52:05 +00:00
Thomas Graves b81e3acd31 HADOOP-9303. command manual dfsadmin missing entry for restoreFailedStorage option (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445657 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:16:54 +00:00
Thomas Graves ecfd15693e HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445648 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:05:21 +00:00
Jason Darrell Lowe e3924c623f svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 02:17:24 +00:00
Jason Darrell Lowe a6f31c1d91 svn merge -c 1445448 FIXES: MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445450 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 01:21:58 +00:00
Alejandro Abdelnur a6925b3fdd MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 20:16:43 +00:00
Tsz-wo Sze 7ae27355bc svn merge -c 1445006 from trunk for HDFS-4342. Directories configured in dfs.namenode.edits.dir.required but not in dfs.namenode.edits.dir are silently ignored.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445007 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 00:50:46 +00:00
Suresh Srinivas 1991072520 HDFS-4470. Merging change r1443744 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1444430 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 20:39:31 +00:00
Suresh Srinivas 1e96de720a HADOOP-9294. Merge 1444415 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1444419 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 20:09:59 +00:00
Suresh Srinivas 50eba7b82e Revering r1444416 because it committed unnecessary changes.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1444418 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 20:09:21 +00:00
Suresh Srinivas 36d614bac4 HADOOP-9294. Merge 1444415 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1444416 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 20:01:38 +00:00
Jason Darrell Lowe b81c3b29a4 svn merge -c 1444085 FIXES: YARN-362. Unexpected extra results when using webUI table search. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1444086 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 15:56:38 +00:00