Commit Graph

2621 Commits

Author SHA1 Message Date
Uma Maheswara Rao G 4688044c40 Merge r:1343913 HDFS-3452. BKJM:Switch from standby to active fails and NN gets shut down due to delay in clearing of lock. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343929 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 19:05:40 +00:00
Harsh J 4200fa906e svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:15:25 +00:00
Thomas White 5e473c9c6e Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:45:25 +00:00
Harsh J 1ff0b15e9b svn merge -c 1343732. Backport HADOOP-8444 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343735 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:16:35 +00:00
Harsh J d7585fa501 svn merge -c 1343290. Backport of HADOOP-8358 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343294 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 15:41:24 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Tsz-wo Sze 4303c38361 svn merge -c 1342512 from trunk for HDFS-3368. Missing blocks due to bad DataNodes coming up and down.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 18:03:35 +00:00
Uma Maheswara Rao G c2e2d424e3 vn merge -c -1342534 for HDFS-3058. HA: Bring BookKeeperJournalManager up to date with HA changes. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342538 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 09:09:39 +00:00
Harsh J dda59a5ef9 svn merge -c 1342514 from trunk. Backports HADOOP-8323 (harsh).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342516 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 06:44:31 +00:00
Eli Collins 92f0d2be53 HADOOP-8422. Deprecate FileSystem#getDefault* and getServerDefault methods that don't take a Path argument. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342496 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 04:12:14 +00:00
Eli Collins 251c159d93 Revert HDFS-3058
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342494 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 03:57:56 +00:00
Uma Maheswara Rao G 8341fb21c1 svn merge -c -1342483 for HDFS-3058. HA: Bring BookKeeperJournalManager up to date with HA changes. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342485 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 01:39:10 +00:00
Alejandro Abdelnur 671bd40e9b Merge -r 1342333:1342334 from trunk to branch. FIXES: HDFS-3460
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 16:51:46 +00:00
Thomas Graves 02a703fac2 merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 13:17:08 +00:00
Todd Lipcon b36a80a731 HDFS-1013. Miscellaneous improvements to HTML markup for web UIs. Contributed by Eugene Koontz.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342103 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 00:27:57 +00:00
Alejandro Abdelnur 897314775b Merge -r 1342074:1342075 from trunk to branch. FIXES: MAPREDUCE-4276
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342076 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 22:23:50 +00:00
Todd Lipcon e4b5b99e8e HDFS-2982. Startup performance suffers when there are many edit log segments. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342043 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 20:43:00 +00:00
Thomas Graves f57e335252 merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 18:38:23 +00:00
Tsz-wo Sze 08a39a9e73 svn merge -c 1341961 from trunk for HDFS-3436. In DataNode.transferReplicaForPipelineRecovery(..), it should use the stored generation stamp to check if the block is valid.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341962 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 18:01:11 +00:00
Eli Collins ca16f8bdae HDFS-3454. Balancer unconditionally logs InterruptedException at INFO level on shutdown if security is enabled. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341928 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 16:05:41 +00:00
Tsz-wo Sze 3ea532eefc svn merge -c 1341676 from trunk for HDFS-3415. Make sure all layout versions are the same for all storage directories in the Namenode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341677 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 23:19:33 +00:00
Aaron Myers 27cfc48b3b Amend HADOOP-8408 per Daryn's post-commit feedback.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341339 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 07:50:58 +00:00
Thomas Graves 0a0c649c86 merge -r 1341159:1341160 from trunk. FIXES: MAPREDUCE-3870
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341162 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:22:49 +00:00
Robert Joseph Evans 1586e827ed i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:07:13 +00:00
Tsz-wo Sze 8ba8542cde svn merge -c 1341141 from trunk for HDFS-3394. Do not use generic in INodeFile.getLastBlock(): the run-time ClassCastException check is useless since generic type information is only available in compile-time.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341143 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 18:55:26 +00:00
Thomas Graves 1c65990dae merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 01:57:21 +00:00
Eli Collins 619cc6a775 HDFS-2885. Remove "federation" from the nameservice config options. Contributed by Tsz Wo (Nicholas), SZE
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340842 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 21:15:16 +00:00
Uma Maheswara Rao G cb96cf17a9 svn merge 1340749:1340750 HDFS-2717. BookKeeper Journal output stream doesn't check addComplete rc. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340754 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 15:32:34 +00:00
Todd Lipcon 58f72f035f MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340629 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 07:41:37 +00:00
Todd Lipcon d4ae893a27 HDFS-3438. BootstrapStandby should not require a rollEdits on active node. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340342 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 05:12:49 +00:00
Eli Collins 8f1f57b37e HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340269 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:45:42 +00:00
Aaron Myers f03fc39e2c HDFS-3444. hdfs groups command doesn't work with security enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340261 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:27:28 +00:00
Todd Lipcon 0e7ea9b56c HDFS-3440. More effectively limit stream memory consumption when reading corrupt edit logs. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339979 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 05:28:26 +00:00
Eli Collins b1d3b518c2 HADOOP-8408. MR doesn't work with a non-default ViewFS mount table and security enabled. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339971 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 04:22:30 +00:00
Thomas Graves 297cbcca27 merge -r 1339956:1339957 from trunk. FIXES: MAPREDUCE-4197
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339958 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 02:51:56 +00:00
Eli Collins 8c26cd2a3e HADOOP-8287. etc/hadoop is missing hadoop-env.sh. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339907 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 22:49:12 +00:00
Todd Lipcon e83cf11d92 HDFS-3391. Fix InvalidateBlocks to compare blocks including their generation stamps. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339898 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 22:30:52 +00:00
Todd Lipcon c86a4cbe93 HDFS-2800. Fix cancellation of checkpoints in the standby node to be more reliable. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339744 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 17:49:36 +00:00
Eli Collins 84a39c2711 HDFS-3434. svn merge -c 1339712 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339725 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 17:22:59 +00:00
Eli Collins 0319ebb42a HDFS-1153. svn merge -c 1339706 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339713 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 17:01:23 +00:00
Thomas Graves b35de62e1d MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:31:19 +00:00
Aaron Myers 1faa95d662 HDFS-3433. GetImageServlet should allow administrative requestors when security is enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339543 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 10:28:15 +00:00
Todd Lipcon 274eddcb03 HADOOP-8406. CompressionCodecFactory.CODEC_PROVIDERS iteration is thread-unsafe. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339475 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 04:28:24 +00:00
Todd Lipcon d62694d97f HDFS-3422. TestStandbyIsHot timeouts too aggressive. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339450 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 02:45:34 +00:00
Eli Collins 3f844f50dd HDFS-860. svn merge -c 1339413 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339414 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 22:58:00 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Alejandro Abdelnur 0a8ab63a6c Merge -r 1339297:1339298 from trunk to branch. FIXES: HADOOP-8400
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339300 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 18:20:20 +00:00
Aaron Myers 4402866c74 HDFS-3413. TestFailureToReadEdits timing out. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339252 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 16:27:55 +00:00
Thomas Graves a1ce7813e9 merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
Todd Lipcon 73766e6d1d Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 05:44:01 +00:00