Author: szetszwo Date: Thu Feb 27 20:39:34 2014 New Revision: 1572723 URL: http://svn.apache.org/r1572723 Log: Merge r1569890 through r1572722 from trunk.
Added: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java - copied unchanged from r1572722, hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/ (props changed) hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java Propchange: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1572418-1572722 Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1572723&r1=1572722&r2=1572723&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Feb 27 20:39:34 2014 @@ -365,6 +365,8 @@ Release 2.4.0 - UNRELEASED HDFS-3969. Small bug fixes and improvements for disk locations API. (Todd Lipcon and Andrew Wang) + HDFS-6025. Update findbugsExcludeFile.xml. (szetszwo) + OPTIMIZATIONS HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml?rev=1572723&r1=1572722&r2=1572723&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml (original) +++ hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml Thu Feb 27 20:39:34 2014 @@ -50,103 +50,6 @@ <Match> <Bug code="HRS" /> </Match> - <!-- - Ignore warnings where child class has the same name as - super class. Classes based on Old API shadow names from - new API. Should go off after HADOOP-1.0 - --> - <Match> - <Class name="~org.apache.hadoop.mapred.*" /> - <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" /> - </Match> - <!-- - Ignore warnings for usage of System.exit. This is - required and have been well thought out - --> - <Match> - <Class name="org.apache.hadoop.mapred.Child$2" /> - <Method name="run" /> - <Bug pattern="DM_EXIT" /> - </Match> - <Match> - <Class name="org.apache.hadoop.mapred.JobTracker" /> - <Method name="addHostToNodeMapping" /> - <Bug pattern="DM_EXIT" /> - </Match> - <Match> - <Class name="org.apache.hadoop.mapred.Task" /> - <Or> - <Method name="done" /> - <Method name="commit" /> - <Method name="statusUpdate" /> - </Or> - <Bug pattern="DM_EXIT" /> - </Match> - <Match> - <Class name="org.apache.hadoop.mapred.Task$TaskReporter" /> - <Method name="run" /> - <Bug pattern="DM_EXIT" /> - </Match> - <!-- - We need to cast objects between old and new api objects - --> - <Match> - <Class name="org.apache.hadoop.mapred.OutputCommitter" /> - <Bug pattern="BC_UNCONFIRMED_CAST" /> - </Match> - <!-- - We intentionally do the get name from the inner class - --> - <Match> - <Class name="org.apache.hadoop.mapred.TaskTracker$MapEventsFetcherThread" /> - <Method name="run" /> - <Bug pattern="IA_AMBIGUOUS_INVOCATION_OF_INHERITED_OR_OUTER_METHOD" /> - </Match> - <Match> - <Class name="org.apache.hadoop.mapred.FileOutputCommitter" /> - <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" /> - </Match> - <!-- - Ignoring this warning as resolving this would need a non-trivial change in code - --> - <Match> - <Class name="org.apache.hadoop.mapred.lib.aggregate.ValueAggregatorBaseDescriptor" /> - <Method name="configure" /> - <Field name="maxNumItems" /> - <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" /> - </Match> - <!-- - Comes from org.apache.jasper.runtime.ResourceInjector. Cannot do much. - --> - <Match> - <Class name="org.apache.hadoop.mapred.jobqueue_005fdetails_jsp" /> - <Field name="_jspx_resourceInjector" /> - <Bug pattern="SE_BAD_FIELD" /> - </Match> - <!-- - Storing textInputFormat and then passing it as a parameter. Safe to ignore. - --> - <Match> - <Class name="org.apache.hadoop.mapred.lib.aggregate.ValueAggregatorJob" /> - <Method name="createValueAggregatorJob" /> - <Bug pattern="DLS_DEAD_STORE_OF_CLASS_LITERAL" /> - </Match> - <!-- - Can remove this after the upgrade to findbugs1.3.8 - --> - <Match> - <Class name="org.apache.hadoop.mapred.lib.db.DBInputFormat" /> - <Method name="getSplits" /> - <Bug pattern="DLS_DEAD_LOCAL_STORE" /> - </Match> - <!-- - This is a spurious warning. Just ignore - --> - <Match> - <Class name="org.apache.hadoop.mapred.MapTask$MapOutputBuffer" /> - <Field name="kvindex" /> - <Bug pattern="IS2_INCONSISTENT_SYNC" /> - </Match> <!-- core changes @@ -156,68 +59,6 @@ <Bug code="MS" /> </Match> - <Match> - <Class name="org.apache.hadoop.fs.FileSystem" /> - <Method name="checkPath" /> - <Bug pattern="ES_COMPARING_STRINGS_WITH_EQ" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.fs.kfs.KFSOutputStream" /> - <Field name="path" /> - <Bug pattern="URF_UNREAD_FIELD" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.fs.kfs.KosmosFileSystem" /> - <Method name="initialize" /> - <Bug pattern="DM_EXIT" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.io.Closeable" /> - <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.security.AccessControlException" /> - <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.record.meta.Utils" /> - <Method name="skip" /> - <Bug pattern="BC_UNCONFIRMED_CAST" /> - </Match> - - <!-- - The compareTo method is actually a dummy method that just - throws excpetions. So, no need to override equals. Ignore - --> - <Match> - <Class name="org.apache.hadoop.record.meta.RecordTypeInfo" /> - <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.util.ProcfsBasedProcessTree" /> - <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" /> - </Match> - - <!-- - Streaming, Examples - --> - <Match> - <Class name="org.apache.hadoop.streaming.StreamUtil$TaskId" /> - <Bug pattern="URF_UNREAD_FIELD" /> - </Match> - - <Match> - <Class name="org.apache.hadoop.examples.DBCountPageView" /> - <Method name="verify" /> - <Bug pattern="OBL_UNSATISFIED_OBLIGATION" /> - </Match> - <!-- getTmpInputStreams is pretty much like a stream constructor. The newly created streams are not supposed to be closed in the constructor. So ignore @@ -233,7 +74,7 @@ ResponseProccessor is thread that is designed to catch RuntimeException. --> <Match> - <Class name="org.apache.hadoop.hdfs.DFSClient$DFSOutputStream$DataStreamer$ResponseProcessor" /> + <Class name="org.apache.hadoop.hdfs.DFSOutputStream$DataStreamer$ResponseProcessor" /> <Method name="run" /> <Bug pattern="REC_CATCH_EXCEPTION" /> </Match> @@ -312,22 +153,6 @@ <Field name="pendingReceivedRequests" /> <Bug pattern="VO_VOLATILE_INCREMENT" /> </Match> - <!-- The "LightWeight" classes are explicitly not thread safe --> - <Match> - <Class name="org.apache.hadoop.hdfs.util.LightWeightGSet" /> - <Field name="modification" /> - <Bug pattern="VO_VOLATILE_INCREMENT" /> - </Match> - <Match> - <Class name="org.apache.hadoop.hdfs.util.LightWeightHashSet" /> - <Field name="modification" /> - <Bug pattern="VO_VOLATILE_INCREMENT" /> - </Match> - <Match> - <Class name="org.apache.hadoop.hdfs.util.LightWeightLinkedSet" /> - <Field name="modification" /> - <Bug pattern="VO_VOLATILE_INCREMENT" /> - </Match> <!-- Replace System.exit() call with ExitUtil.terminate() --> <Match> <Class name="org.apache.hadoop.hdfs.tools.JMXGet"/> Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java?rev=1572723&r1=1572722&r2=1572723&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java (original) +++ hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java Thu Feb 27 20:39:34 2014 @@ -35,7 +35,7 @@ import org.apache.hadoop.test.PathUtils; import org.junit.Test; /** - * Test of the URL stream handler factory. + * Test of the URL stream handler. */ public class TestUrlStreamHandler {