Permalink
Browse files

Merge branch 'branch-1.0' into branch-1.0-prod

  • Loading branch information...
2 parents 52b63fd + b6e706f commit 7f6fc7747d836a9cf0413ea4af5da0feb3ebe7bc dierobotsdie committed Apr 7, 2012
Showing with 16,223 additions and 470 deletions.
  1. +69 −1 CHANGES.txt
  2. +1 −1 bin/hadoop-config.sh
  3. +132 −24 build.xml
  4. +1 −1 ivy.xml
  5. +103 −0 ivy/hadoop-client-pom-template.xml
  6. +53 −0 ivy/hadoop-minicluster-pom-template.xml
  7. +1 −1 ivy/libraries.properties
  8. +7 −0 src/core/org/apache/hadoop/HadoopVersionAnnotation.java
  9. +26 −0 src/core/org/apache/hadoop/conf/Configuration.java
  10. +8 −3 src/core/org/apache/hadoop/io/WritableComparator.java
  11. +40 −21 src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
  12. +12 −4 src/core/org/apache/hadoop/metrics2/util/SampleStat.java
  13. +2 −169 src/core/org/apache/hadoop/net/NetUtils.java
  14. +168 −16 src/core/org/apache/hadoop/security/SecurityUtil.java
  15. +11 −1 src/core/org/apache/hadoop/security/UserGroupInformation.java
  16. +59 −51 src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
  17. +11 −1 src/core/org/apache/hadoop/util/VersionInfo.java
  18. +89 −2 src/docs/releasenotes.html
  19. +64 −35 src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
  20. +273 −49 src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
  21. +23 −0 src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
  22. +6 −6 src/hdfs/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java
  23. +1 −1 src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
  24. +12 −12 src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
  25. +3 −3 src/mapred/org/apache/hadoop/filecache/TaskDistributedCacheManager.java
  26. +39 −29 src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java
  27. +241 −0 src/mapred/org/apache/hadoop/mapred/JettyBugMonitor.java
  28. +8 −3 src/mapred/org/apache/hadoop/mapred/JobLocalizer.java
  29. +24 −2 src/mapred/org/apache/hadoop/mapred/TaskTracker.java
  30. +1 −1 src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
  31. +35 −0 src/mapred/org/apache/hadoop/mapreduce/Job.java
  32. +148 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
  33. +71 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/BooleanSplitter.java
  34. +265 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBConfiguration.java
  35. +358 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBInputFormat.java
  36. +237 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBOutputFormat.java
  37. +275 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
  38. +47 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBSplitter.java
  39. +95 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DBWritable.java
  40. +330 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBInputFormat.java
  41. +137 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBRecordReader.java
  42. +177 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/DateSplitter.java
  43. +104 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
  44. +131 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/IntegerSplitter.java
  45. +50 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
  46. +51 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
  47. +145 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
  48. +93 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBInputFormat.java
  49. +49 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBRecordReader.java
  50. +42 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDateSplitter.java
  51. +220 −0 src/mapred/org/apache/hadoop/mapreduce/lib/db/TextSplitter.java
  52. +227 −0 src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionHelper.java
  53. +110 −0 src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionMapper.java
  54. +106 −0 src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionReducer.java
  55. +693 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
  56. +169 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
  57. +200 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileSplit.java
  58. +131 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingInputFormat.java
  59. +58 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingMapper.java
  60. +92 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingRecordReader.java
  61. +1 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
  62. +128 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueLineRecordReader.java
  63. +59 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueTextInputFormat.java
  64. +150 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/MultipleInputs.java
  65. +155 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/NLineInputFormat.java
  66. +154 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsBinaryInputFormat.java
  67. +49 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextInputFormat.java
  68. +95 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextRecordReader.java
  69. +325 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFilter.java
  70. +159 −0 src/mapred/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java
  71. +345 −0 src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java
  72. +284 −0 src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
  73. +19 −2 src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
  74. +111 −0 src/mapred/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java
  75. +124 −0 src/mapred/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java
  76. +468 −0 src/mapred/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
  77. +198 −0 src/mapred/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java
  78. +142 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java
  79. +418 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
  80. +374 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java
  81. +156 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java
  82. +296 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldHelper.java
  83. +411 −0 src/mapred/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
  84. +61 −0 src/native/packageBinNativeHadoop.sh
  85. +1 −1 src/native/packageNativeHadoop.sh
  86. +2 −1 src/packages/rpm/spec/hadoop.spec
  87. +5 −2 src/saveVersion.sh
  88. +109 −14 src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
  89. +1 −1 src/test/org/apache/hadoop/fs/TestFileSystem.java
  90. +15 −0 src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
  91. +270 −0 src/test/org/apache/hadoop/hdfs/server/datanode/TestBlockReportGeneration.java
  92. +3 −0 src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
  93. +3 −0 src/test/org/apache/hadoop/hdfs/web/TestWebHdfsFileSystemContract.java
  94. +105 −0 src/test/org/apache/hadoop/mapred/TestJettyBugMonitor.java
  95. +189 −0 src/test/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java
  96. +39 −0 src/test/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java
  97. +69 −0 src/test/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java
  98. +222 −0 src/test/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java
  99. +106 −0 src/test/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java
  100. +128 −0 src/test/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java
  101. +124 −0 src/test/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java
  102. +1,174 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
  103. +115 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java
  104. +227 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
  105. +115 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java
  106. +118 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java
  107. +194 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java
  108. +72 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java
  109. +114 −0 src/test/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java
  110. +46 −0 src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
  111. +142 −0 src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java
  112. +212 −0 src/test/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java
  113. +232 −0 src/test/org/apache/hadoop/mapreduce/lib/output/TestMultipleOutputs.java
  114. +103 −0 src/test/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java
  115. +149 −0 src/test/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java
  116. +425 −0 src/test/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java
  117. +125 −0 src/test/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java
  118. +187 −0 src/test/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java
  119. +4 −4 src/test/org/apache/hadoop/metrics2/util/TestSampleStat.java
  120. +1 −0 src/test/org/apache/hadoop/net/TestNetUtils.java
  121. +18 −7 src/test/org/apache/hadoop/{net → security}/NetUtilsTestResolver.java
  122. +11 −1 src/test/org/apache/hadoop/security/TestSecurityUtil.java
  123. +32 −0 src/test/org/apache/hadoop/security/TestUserFromEnv.java
View
@@ -1,6 +1,74 @@
Hadoop Change Log
-Release 1.0.0 - 2011.11.27
+Release 1.0.2 - unreleased
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ BUG FIXES
+
+ HADOOP-8050. Deadlock in metrics. (Kihwal Lee via mattf)
+
+ MAPREDUCE-3824. Distributed caches are not removed properly. (Thomas Graves
+ via mattf)
+
+ MAPREDUCE-3583. Change pid to String and stime to BigInteger in order to
+ avoid NumberFormatException caused by overflow. (Zhihong Yu via szetszwo)
+
+ HDFS-3006. In WebHDFS, when the return body is empty, set the Content-Type
+ to application/octet-stream instead of application/json. (szetszwo)
+
+Release 1.0.1 - 2012.02.14
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ MAPREDUCE-3607. Port missing new API mapreduce lib classes to 1.x. (tomwhite)
+
+ HADOOP-7987. Support setting the run-as user in unsecure mode. (jitendra)
+
+ HADOOP-7988. Upper case in hostname part of the principals doesn't work with
+ kerberos. (jitendra)
+
+ HDFS-2814. NamenodeMXBean does not account for svn revision in the version
+ information. (Hitesh Shah via jitendra)
+
+ HADOOP-7470. Move up to Jackson 1.8.8. (Enis Soztutar via szetszwo)
+
+ HDFS-2379. Allow block reports to proceed without holding FSDataset lock.
+ (todd via suresh)
+
+ HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for
+ downstream projects. (Alejandro Abdelnur via mattf)
+
+ MAPREDUCE-3184. Add a thread to the TaskTracker which monitors for
+ spinning Jetty selector threads, and shuts down the daemon when one is
+ detected. (todd)
+
+ BUG FIXES
+
+ HADOOP-7960. Port HADOOP-5203 to branch-1, build version comparison is too
+ restrictive. (mattf)
+
+ HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization.
+ (Daryn Sharp via suresh)
+
+ HADOOP-8010. hadoop-config.sh errors when HADOOP_HOME_WARN_SUPPRESS is set
+ to true and HADOOP_HOME is present. (Roman Shaposhnik via mattf)
+
+ HADOOP-8052. Hadoop Metrics2 should emit Float.MAX_VALUE (instead of
+ Double.MAX_VALUE) to avoid making Ganglia's gmetad core. (Varun Kapoor
+ via mattf)
+
+ MAPREDUCE-3343. TaskTracker Out of Memory because of distributed cache.
+ (Zhao Yunjiong).
+
+ HADOOP-8037. Binary tarball does not preserve platform info for native builds,
+ and RPMs fail to provide needed symlinks for libhadoop.so. (Matt Foley)
+
+Release 1.0.0 - 2011.12.15
NEW FEATURES
View
@@ -70,7 +70,7 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
. "${HADOOP_CONF_DIR}/hadoop-env.sh"
fi
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME_WARN_SUPPRESS" = "" ] && [ "$HADOOP_HOME" != "" ]; then
echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
echo 1>&2
fi
Oops, something went wrong.

0 comments on commit 7f6fc77

Please sign in to comment.