Commit Graph

2818 Commits

Author SHA1 Message Date
Alejandro Abdelnur d21c6aa52f Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 21:37:14 +00:00
Siddharth Seth 09ac40f800 Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:56:11 +00:00
Alejandro Abdelnur 850c03cc46 Adding svn-ignore for pipes target dir
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353629 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 16:04:28 +00:00
Alejandro Abdelnur e519ed959a Merge -r 1353624:1353625 from trunk to branch. FIXES: MAPREDUCE-4336
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353628 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 16:03:25 +00:00
Siddharth Seth 461ef73bf2 Merge MAPREDUCE-4031 from trunk. Prevent a Node Manager hang during shutdown. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353040 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 21:47:12 +00:00
Harsh J 13bbb35577 svn merge -c 1352689 from trunk. Backport HADOOP-8524 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352693 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 21:15:46 +00:00
Thomas Graves 22d23a4d0f merge -r 1352637:1352638 from trunk. FIXES: MAPREDUCE-4295
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352639 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 18:15:13 +00:00
Thomas Graves 2d734774a1 merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:02:16 +00:00
Robert Joseph Evans f63255faec svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 21:32:21 +00:00
Siddharth Seth 3b61e3693f Merge MAPREDUCE-4306 from trunk. Fix distributed shell to work with users other than the one running the daemons. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351878 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 22:02:48 +00:00
Siddharth Seth 27bbcc4c5c Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 21:54:00 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Thomas Graves 234f1a7ab7 merge -r 1351761:1351762 from trunk. FIXES: MAPREDUCE-4341
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351764 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 16:18:08 +00:00
Thomas Graves daf8c54e66 merge -r 1351699:1351700 from trunk. FIXES: MAPREDUCE-4311
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351703 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 13:08:20 +00:00
Alejandro Abdelnur e5c06e3b88 SVN-ignoring target/download directories
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351413 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 16:40:15 +00:00
Alejandro Abdelnur 55b61efab6 Merge -r 1351407:1351408 from trunk to branch. FIXES: HADOOP-8512
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 16:31:26 +00:00
Thomas Graves 5f69497e35 merge -r 1351362:1351363 from trunk. FIXES: HADOOP-8495
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351364 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 14:43:51 +00:00
Tsz-wo Sze 2106c8bec8 svn merge -c 1350825 from trunk for HDFS-3518. Add a utility method HdfsUtils.isHealthy(uri) for checking if he given HDFS is healthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350826 13f79535-47bb-0310-9956-ffa450edef68
2012-06-15 23:02:46 +00:00
Tsz-wo Sze 94a5971872 svn merge -c 1350384 from trunk for HDFS-3524. Update TestFileLengthOnClusterRestart for HDFS-3522.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350385 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 20:18:36 +00:00
Alejandro Abdelnur 497de4942a Merge -r 1350007:1350008 from trunk to branch. FIXES: HADOOP-8509
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350012 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 20:50:16 +00:00
Eli Collins 401f9ace50 HDFS-3480. Multiple SLF4J binding warning. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349644 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:53:48 +00:00
Eli Collins 17b4ce909c HADOOP-8433. Don't set HADOOP_LOG_DIR in hadoop-env.sh. Contributed by Brahma Reddy Battula
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349642 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:37:49 +00:00
Aaron Myers cbd17834c0 HDFS-766. Error message not clear for set space quota out of boundary values. Contributed by Jon Zuanich.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349640 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:34:19 +00:00
Eli Collins 788592aa3b HDFS-3372. offlineEditsViewer should be able to read a binary edits file with recovery mode. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349630 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 03:38:14 +00:00
Eli Collins bc5f311bb8 HDFS-3531. EditLogFileOutputStream#preallocate should check for incomplete writes. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349617 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:48:26 +00:00
Alejandro Abdelnur 5c15ffdc3e Merge -r 1349612:1349613 from trunk to branch. FIXES: HADOOP-8465
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349615 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:26:20 +00:00
Eli Collins 5b4080c094 Fix bug in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349566 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:13:58 +00:00
Eli Collins e1da4f4541 HADOOP-8507. Avoid OOM while deserializing DelegationTokenIdentifer. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349564 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:12:53 +00:00
Alejandro Abdelnur 12201fca35 Merge -r 1349554:1349555 from trunk to branch. FIXES: HDFS-3428
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:03:52 +00:00
Alejandro Abdelnur 16ae946de4 Merge -r 1349513:1349514 from trunk to branch. FIXES: HADOOP-8458
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349516 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 20:48:29 +00:00
Uma Maheswara Rao G 1bfab40533 Updated CHANGES.txt for Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349470 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:28:38 +00:00
Uma Maheswara Rao G 0b32101511 Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349469 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:27:01 +00:00
Uma Maheswara Rao G 148f7e2dd7 Merge r:1349456 and r:1349459 HDFS-3408. BKJM : Namenode format fails, if there is no BK root. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349462 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:04:31 +00:00
Eli Collins 2acc997daa Revert HADOOP-8491
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349135 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 06:23:43 +00:00
Tsz-wo Sze 4c831ec671 svn merge -c 1349124 from trunk for HDFS-3504.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 05:33:54 +00:00
Eli Collins 8e1730243b HDFS-3520. Add transfer rate logging to TransferFsImage. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349118 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 05:01:50 +00:00
Tsz-wo Sze abfd7dba32 svn merge -c 1349088 from trunk for HDFS-3522. If a namenode is in safemode, it should throw SafeModeException when getBlockLocations has zero locations.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349090 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 01:59:24 +00:00
Tsz-wo Sze 97ab65f3ab svn merge -c 1348998 from trunk for HDFS-3052. Change INodeFile and INodeFileUnderConstruction to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349089 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 01:57:38 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
Eli Collins 9d83af831b HADOOP-8491. Check for short writes when using FileChannel#write and related methods. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349025 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 21:26:06 +00:00
Eli Collins bc18206bbe HDFS-3517. TestStartup should bind ephemeral ports. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349005 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:53:08 +00:00
Thomas White f323ea705d Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Alejandro Abdelnur cca04f2bf6 HADOOP-8368. Amendment to add entry in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348961 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:47:53 +00:00
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Eli Collins d781e8efdf HDFS-2797. Fix misuses of InputStream#skip in the edit log code. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348953 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:20:41 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Tsz-wo Sze 1f564d1135 svn merge -c 1348287 from trunk for HDFS-3490. DatanodeWebHdfsMethods throws NullPointerException if NamenodeRpcAddressParam is not set.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348288 13f79535-47bb-0310-9956-ffa450edef68
2012-06-09 00:55:47 +00:00
Todd Lipcon 4b531693d3 HDFS-3243. TestParallelRead timing out on jenkins. Contributed by Henry Robinson.
(svn merge -c 1312029 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348257 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:45:54 +00:00
Todd Lipcon caa6f4ab98 HDFS-3514. Add missing TestParallelLocalRead. Contributed by Henry Robinson.
(svn merge -c 1348207 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348249 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:23:35 +00:00
Todd Lipcon 5b43977af1 HDFS-3235. MiniDFSClusterManager doesn't correctly support -format option. Contributed by Henry Robinson.
(svn merge -c 1311556 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348247 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:19:17 +00:00