Author: mahadev
Date: Thu Aug 4 05:33:35 2011
New Revision: 1153756
URL: http://svn.apache.org/viewvc?rev=1153756&view=rev
Log:
MAPREDUCE-2776. Fix some of the yarn findbug warnings. (siddharth seth via mahadev)
Added:
hadoop/common/branches/MR-279/mapreduce/dev-support/
hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml
hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/
hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/findbugs-exclude.xml
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-core/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-shuffle/pom.xml
hadoop/common/branches/MR-279/mapreduce/mr-client/pom.xml
hadoop/common/branches/MR-279/mapreduce/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationReportPBImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerIdPBImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RecordFactoryProvider.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/YarnRemoteExceptionFactoryProvider.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourcesTrackerImpl.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerTokenIdentifier.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKStore.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Thu Aug 4 05:33:35 2011
@@ -3,6 +3,9 @@ Hadoop MapReduce Change Log
Trunk (unreleased changes)
MAPREDUCE-279
+
+ MAPREDUCE-2776. Fix some of the yarn findbug warnings. (siddharth
+ seth via mahadev)
Fix NPE in FifoScheduler. (mahadev)
Added: hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml?rev=1153756&view=auto
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml (added)
+++ hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml Thu Aug 4 05:33:35 2011
@@ -0,0 +1,391 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FindBugsFilter>
+ <Match>
+ <Package name="org.apache.hadoop.record.compiler.generated" />
+ </Match>
+ <Match>
+ <Bug pattern="EI_EXPOSE_REP" />
+ </Match>
+ <Match>
+ <Bug pattern="EI_EXPOSE_REP2" />
+ </Match>
+ <Match>
+ <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
+ </Match>
+ <Match>
+ <Class name="~.*_jsp" />
+ <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+ </Match>
+ <Match>
+ <Class name="~.*_jspx" />
+ <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+ </Match>
+ <Match>
+ <Field name="_jspx_dependants" />
+ <Bug pattern="UWF_UNWRITTEN_FIELD" />
+ </Match>
+ <!--
+ Inconsistent synchronization for Client.Connection.out is
+ is intentional to make a connection to be closed instantly.
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.ipc.Client$Connection" />
+ <Field name="out" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <!--
+ Ignore Cross Scripting Vulnerabilities
+ -->
+ <Match>
+ <Package name="~org.apache.hadoop.mapred.*" />
+ <Bug code="XSS" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.taskdetails_jsp" />
+ <Bug code="HRS" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.jobdetails_jsp"/>
+ <Bug pattern="HRS_REQUEST_PARAMETER_TO_HTTP_HEADER"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.taskstats_jsp"/>
+ <Bug pattern="HRS_REQUEST_PARAMETER_TO_HTTP_HEADER"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.jobtasks_jsp"/>
+ <Bug pattern="HRS_REQUEST_PARAMETER_TO_HTTP_HEADER"/>
+ </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>
+ <Match>
+ <Class name="~org.apache.hadoop.mapred.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
+ </Match>
+ <Match>
+ <Class name="~org.apache.hadoop.mapred.lib.aggregate.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
+ </Match>
+ <Match>
+ <Class name="~org.apache.hadoop.mapred.join.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.SequenceFileInputFilter$Filter" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
+ </Match>
+ <Match>
+ <Class name="~org.apache.hadoop.util.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
+ </Match>
+ <Match>
+ <Class name="~org.apache.hadoop.filecache.*" />
+ <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.JobTracker" />
+ <Field name="clock" />
+ <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
+ </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>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.OutputCommitter" />
+ <Or>
+ <Method name="abortJob" />
+ <Method name="commitJob" />
+ <Method name="cleanupJob" />
+ </Or>
+ <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.lib.db.DBInputFormat$DBRecordReader" />
+ <Method name="next" />
+ <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>
+ <!--
+ org.apache.hadoop.mapred.IndexCache is thread-safe. It does not need
+ synchronous access.
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.mapred.TaskTracker" />
+ <Field name="indexCache" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <!--
+ None of the following variables should be referenced by any thread
+ but the collection thread in MapTask
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.mapred.MapTask$MapOutputBuffer" />
+ <Field name="kvindex" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.MapTask$MapOutputBuffer" />
+ <Field name="bufferRemaining" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.MapTask$MapOutputBuffer" />
+ <Field name="equator" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+
+ <!-- This is spurious. -->
+ <Match>
+ <Class name="org.apache.hadoop.mapred.MapTask$MapOutputBuffer$SpillThread" />
+ <Method name="run" />
+ <Bug pattern="UL_UNRELEASED_LOCK_EXCEPTION_PATH" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.hadoop.mapreduce.task.reduce.MergeThread" />
+ <Field name="inputs" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.JobTracker" />
+ <Method name="updateTaskTrackerStatus" />
+ <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+ </Match>
+
+ <!--
+ This class is unlikely to get subclassed, so ignore
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.mapreduce.task.reduce.MergeManager" />
+ <Bug pattern="SC_START_IN_CTOR" />
+ </Match>
+
+ <!--
+ Do not bother if equals is not implemented. We will not need it here
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.mapreduce.task.reduce.ShuffleScheduler$Penalty" />
+ <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.hadoop.mapred.Task" />
+ <Method name="reportFatalError" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
+
+ <!--
+ core changes
+ -->
+ <Match>
+ <Class name="~org.apache.hadoop.*" />
+ <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>
+
+ <Match>
+ <Class name="org.apache.hadoop.examples.ContextFactory" />
+ <Method name="setAttributes" />
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.hadoop.mapred.TaskScheduler$QueueRefresher" />
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.hadoop.examples.terasort.TeraInputFormat$1" />
+ <Method name="run" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.examples.terasort.TeraOutputFormat$TeraOutputCommitter"/>
+ <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.examples.terasort.Unsigned16" />
+ <Method name="getHexDigit"/>
+ <Bug pattern="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" />
+ </Match>
+
+ <!--
+ False positive of FindBugs complaining that initializationPoller and
+ started were accessed through
+ CapacitySchedulerQueueRefresher.refreshQueues without explicitly holding
+ the lock of CapacityTaskScheduler. The lock is in fact acquired by
+ JobTracker prior to calling QueueManager.refereshQueues - this is
+ necessary to ensure the order of locking (TaskScheduler ->
+ QueueManager).
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.mapred.CapacityTaskScheduler" />
+ <Field name="initializationPoller" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.CapacityTaskScheduler" />
+ <Field name="started" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+ </FindBugsFilter>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/pom.xml Thu Aug 4 05:33:35 2011
@@ -13,6 +13,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
<applink.base>${project.build.directory}/${project.name}</applink.base>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-core/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-core/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-core/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-core/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml Thu Aug 4 05:33:35 2011
@@ -13,6 +13,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
<fork.mode>always</fork.mode>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-shuffle/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-shuffle/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-shuffle/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-shuffle/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/pom.xml Thu Aug 4 05:33:35 2011
@@ -11,6 +11,11 @@
<name>hadoop-mapreduce-client</name>
<packaging>pom</packaging>
+ <properties>
+ <mr.basedir>${project.parent.basedir}</mr.basedir>
+ </properties>
+
+
<dependencyManagement>
<dependencies>
<!-- begin MNG-4223 workaround -->
Modified: hadoop/common/branches/MR-279/mapreduce/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/pom.xml Thu Aug 4 05:33:35 2011
@@ -19,6 +19,7 @@
<install.pom>${project.build.directory}/saner-pom.xml</install.pom>
<install.file>${install.pom}</install.file>
<fork.mode>once</fork.mode>
+ <mr.basedir>=${basedir}</mr.basedir>
</properties>
<repositories>
@@ -322,6 +323,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
+ <excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -361,6 +372,7 @@
<version>2.3.2</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
</configuration>
</plugin>
<plugin>
Added: hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/findbugs-exclude.xml?rev=1153756&view=auto
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/findbugs-exclude.xml (added)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/dev-support/findbugs-exclude.xml Thu Aug 4 05:33:35 2011
@@ -0,0 +1,132 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FindBugsFilter>
+ <!-- Ignore PB Generated Code -->
+ <Match>
+ <Package name="org.apache.hadoop.yarn.proto" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.ipc\.RpcProtos.*" />
+ </Match>
+
+ <!-- Ignore unchecked Event casts -->
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.ContainerManagerImpl" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.nodemanager\.containermanager\.application\.ApplicationImpl.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.nodemanager\.containermanager\.container\.ContainerImpl.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.nodemanager\.containermanager\.localizer\.LocalizedResource.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.nodemanager\.containermanager\.localizer\.ResourceLocalizationService.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor.ContainersMonitorImpl" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmapp\.attempt\.RMAppAttemptImpl.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl$AppRejectedTransition" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmcontainer\.RMContainerImpl.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmnode\.RMNodeImpl.*" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.scheduler\.capacity\.CapacityScheduler.*" />
+ <Method name="handle" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.scheduler\.fifo\.FifoScheduler.*" />
+ <Method name="handle" />
+ <Bug pattern="BC_UNCONFIRMED_CAST" />
+ </Match>
+
+ <!-- Ignore intentional switch fallthroughs -->
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerImpl" />
+ <Method name="finished" />
+ <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ContainerLocalizer" />
+ <Method name="localizeFiles" />
+ <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+ </Match>
+
+ <!-- Ignore some irrelevant serialization warnings -->
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ResourceRetentionSet$LRUComparator" />
+ <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.exceptions.impl.pb.YarnRemoteExceptionPBImpl" />
+ <Field name="builder" />
+ <Bug pattern="SE_BAD_FIELD" />
+ </Match>
+ <Match>
+ <Class name="~org\.apache\.hadoop\.yarn\.util\.BuilderUtils.*" />
+ <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.resourcemanager.resource.Priority$Comparator" />
+ <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
+ </Match>
+
+ <!-- Inconsistent sync warning - only start() is synchronized-->
+ <Match>
+ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.logaggregation.LogAggregationService" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
+
+ <!-- Don't care if putIfAbsent value is ignored -->
+ <Match>
+ <Package name="org.apache.hadoop.yarn.factories.impl.pb" />
+ <Bug pattern="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED" />
+ </Match>
+
+ <!-- Intended System.exit calls -->
+ <Match>
+ <Class name="org.apache.hadoop.yarn.webapp.Dispatcher$1" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.yarn.webapp.WebApps$Builder" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
+
+ </FindBugsFilter>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml Thu Aug 4 05:33:35 2011
@@ -17,6 +17,7 @@
<yarn.version>1.0-SNAPSHOT</yarn.version>
<install.pom>${project.build.directory}/saner-pom.xml</install.pom>
<install.file>${install.pom}</install.file>
+ <yarn.basedir>${basedir}</yarn.basedir>
</properties>
<repositories>
@@ -347,6 +348,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
+ <excludeFilterFile>${yarn.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties>
<build>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationReportPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationReportPBImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationReportPBImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationReportPBImpl.java Thu Aug 4 05:33:35 2011
@@ -264,10 +264,6 @@ implements ApplicationReport {
return new ApplicationIdPBImpl(applicationId);
}
- private ContainerProto convertToProtoFormat(Container t) {
- return ((ContainerPBImpl) t).getProto();
- }
-
private Container convertFromProtoFormat(ContainerProto c) {
return new ContainerPBImpl(c);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerIdPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerIdPBImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerIdPBImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerIdPBImpl.java Thu Aug 4 05:33:35 2011
@@ -151,6 +151,9 @@ public class ContainerIdPBImpl extends P
@Override
public boolean equals(Object other) {
+ if (other == null) {
+ return false;
+ }
if (other.getClass().isAssignableFrom(this.getClass())) {
return this.getProto().equals(this.getClass().cast(other).getProto());
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java Thu Aug 4 05:33:35 2011
@@ -117,6 +117,7 @@ public class QueueInfoPBImpl extends Pro
maybeInitBuilder();
if (queueName == null) {
builder.clearQueueName();
+ return;
}
builder.setQueueName(queueName);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java Thu Aug 4 05:33:35 2011
@@ -47,6 +47,7 @@ implements QueueUserACLInfo {
maybeInitBuilder();
if (queueName == null) {
builder.clearQueueName();
+ return;
}
builder.setQueueName(queueName);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java Thu Aug 4 05:33:35 2011
@@ -37,7 +37,6 @@ public class ContainerLogAppender extend
//so that log4j can configure it from the configuration(log4j.properties).
private int maxEvents;
private Queue<LoggingEvent> tail = null;
- private boolean isCleanup;
@Override
public void activateOptions() {
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RecordFactoryProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RecordFactoryProvider.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RecordFactoryProvider.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RecordFactoryProvider.java Thu Aug 4 05:33:35 2011
@@ -10,10 +10,10 @@ import org.apache.hadoop.yarn.factories.
public class RecordFactoryProvider {
- public static String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
- public static String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
+ public static final String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
+ public static final String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
- public static String RECORD_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.record.factory.class";
+ public static final String RECORD_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.record.factory.class";
private static Configuration defaultConf;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java Thu Aug 4 05:33:35 2011
@@ -18,11 +18,11 @@ import org.apache.hadoop.yarn.factories.
public class RpcFactoryProvider {
private static final Log LOG = LogFactory.getLog(RpcFactoryProvider.class);
//TODO Move these keys to CommonConfigurationKeys
- public static String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
- public static String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
+ public static final String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
+ public static final String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
- public static String RPC_CLIENT_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.client.factory.class";
- public static String RPC_SERVER_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.server.factory.class";
+ public static final String RPC_CLIENT_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.client.factory.class";
+ public static final String RPC_SERVER_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.server.factory.class";
private RpcFactoryProvider() {
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/YarnRemoteExceptionFactoryProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/YarnRemoteExceptionFactoryProvider.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/YarnRemoteExceptionFactoryProvider.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/YarnRemoteExceptionFactoryProvider.java Thu Aug 4 05:33:35 2011
@@ -10,10 +10,10 @@ import org.apache.hadoop.yarn.factories.
public class YarnRemoteExceptionFactoryProvider {
- public static String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
- public static String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
+ public static final String RPC_SERIALIZER_KEY = "org.apache.yarn.ipc.rpc.serializer.property";
+ public static final String RPC_SERIALIZER_DEFAULT = "protocolbuffers";
- public static String EXCEPTION_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.exception.factory.class";
+ public static final String EXCEPTION_FACTORY_CLASS_KEY = "org.apache.yarn.ipc.exception.factory.class";
private YarnRemoteExceptionFactoryProvider() {
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java Thu Aug 4 05:33:35 2011
@@ -99,7 +99,7 @@ public abstract class ResourceCalculator
@InterfaceStability.Unstable
public abstract ProcResourceValues getProcResourceValues();
- public class ProcResourceValues {
+ public static class ProcResourceValues {
private final long cumulativeCpuTime;
private final long physicalMemorySize;
private final long virtualMemorySize;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java Thu Aug 4 05:33:35 2011
@@ -158,7 +158,7 @@ public class WebApps {
throw new WebAppException("Error starting http server", e);
}
Injector injector = Guice.createInjector(webapp, new AbstractModule() {
- @Override @SuppressWarnings("unchecked")
+ @Override
protected void configure() {
if (api != null) {
bind(api).toInstance(application);
@@ -211,7 +211,6 @@ public class WebApps {
}
// Ditto
- @SuppressWarnings("unchecked")
public static <T> Builder<T> $for(T app) {
return $for("", app);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java Thu Aug 4 05:33:35 2011
@@ -134,7 +134,7 @@ public class DefaultContainerExecutor ex
new File(containerWorkDir.toUri().getPath()));
launchCommandObjs.put(containerId, shExec);
shExec.execute();
- } catch (Exception e) {
+ } catch (IOException e) {
if (null == shExec) {
return -1;
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java Thu Aug 4 05:33:35 2011
@@ -45,7 +45,7 @@ public class DeletionService extends Abs
private int debugDelay;
private final ContainerExecutor exec;
- private final ScheduledThreadPoolExecutor sched;
+ private ScheduledThreadPoolExecutor sched;
private final FileContext lfs = getLfs();
static final FileContext getLfs() {
try {
@@ -56,16 +56,8 @@ public class DeletionService extends Abs
}
public DeletionService(ContainerExecutor exec) {
- this(exec, new ScheduledThreadPoolExecutor(1));
- sched.setMaximumPoolSize(DEFAULT_MAX_DELETE_THREADS);
- sched.setKeepAliveTime(60L, SECONDS);
- }
-
- public DeletionService(ContainerExecutor exec,
- ScheduledThreadPoolExecutor sched) {
super(DeletionService.class.getName());
this.exec = exec;
- this.sched = sched;
this.debugDelay = 0;
}
@@ -83,10 +75,13 @@ public class DeletionService extends Abs
@Override
public void init(Configuration conf) {
if (conf != null) {
- sched.setMaximumPoolSize(
+ sched = new ScheduledThreadPoolExecutor(
conf.getInt(NM_MAX_DELETE_THREADS, DEFAULT_MAX_DELETE_THREADS));
debugDelay = conf.getInt(DEBUG_DELAY_SEC, 0);
+ } else {
+ sched = new ScheduledThreadPoolExecutor(DEFAULT_MAX_DELETE_THREADS);
}
+ sched.setKeepAliveTime(60L, SECONDS);
super.init(conf);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java Thu Aug 4 05:33:35 2011
@@ -22,7 +22,6 @@ import static org.apache.hadoop.yarn.ser
import static org.apache.hadoop.yarn.server.nodemanager.NMConfig.NM_KEYTAB;
import java.io.IOException;
-import java.util.Comparator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -158,20 +157,7 @@ public class NodeManager extends Composi
private final ConcurrentMap<ApplicationId, Application> applications =
new ConcurrentHashMap<ApplicationId, Application>();
private final ConcurrentMap<ContainerId, Container> containers =
- new ConcurrentSkipListMap<ContainerId,Container>(
- new Comparator<ContainerId>() {
- @Override
- public int compare(ContainerId a, ContainerId b) {
- if (a.getAppId().getId() == b.getAppId().getId()) {
- return a.getId() - b.getId();
- }
- return a.getAppId().getId() - b.getAppId().getId();
- }
- @Override
- public boolean equals(Object other) {
- return getClass().equals(other.getClass());
- }
- });
+ new ConcurrentSkipListMap<ContainerId, Container>();
private final NodeHealthStatus nodeHealthStatus = RecordFactoryProvider
.getRecordFactory(null).newRecordInstance(NodeHealthStatus.class);
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java Thu Aug 4 05:33:35 2011
@@ -187,7 +187,7 @@ public class NodeStatusUpdaterImpl exten
@Override
public byte[] getRMNMSharedSecret() {
- return this.secretKeyBytes;
+ return this.secretKeyBytes.clone();
}
private NodeStatus getNodeStatus() {
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java Thu Aug 4 05:33:35 2011
@@ -29,7 +29,6 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.event.Dispatcher;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerDiagnosticsUpdateEvent;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerInitEvent;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerKillEvent;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.event.ApplicationLocalizationEvent;
@@ -186,7 +185,6 @@ public class ApplicationImpl implements
@Override
public void transition(ApplicationImpl app, ApplicationEvent event) {
- ApplicationInitedEvent initedEvent = (ApplicationInitedEvent) event;
// Inform the logAggregator
app.dispatcher.getEventHandler().handle(
new LogAggregatorAppStartedEvent(app.appId, app.user,
@@ -214,7 +212,7 @@ public class ApplicationImpl implements
container.getContainerID()));
}
}
-
+
static final class ContainerDoneTransition implements
SingleArcTransition<ApplicationImpl, ApplicationEvent> {
@Override
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java Thu Aug 4 05:33:35 2011
@@ -659,7 +659,7 @@ public class ContainerImpl implements Co
container.finished();
}
}
-
+
static class ContainerDiagnosticsUpdateTransition implements
SingleArcTransition<ContainerImpl, ContainerEvent> {
@Override
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java Thu Aug 4 05:33:35 2011
@@ -40,7 +40,6 @@ import org.apache.hadoop.yarn.server.nod
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ResourceLocalizationService;
import org.apache.hadoop.yarn.service.AbstractService;
-import org.apache.hadoop.yarn.util.ConverterUtils;
/**
* The launcher for the containers. This service should be started only after
@@ -81,7 +80,8 @@ public class ContainersLauncher extends
@Override
public void init(Configuration conf) {
try {
- FileContext lfs = FileContext.getLocalFSFileContext(conf);
+ //TODO Is this required?
+ FileContext.getLocalFSFileContext(conf);
} catch (UnsupportedFileSystemException e) {
throw new YarnException("Failed to start ContainersLauncher", e);
}
@@ -104,8 +104,6 @@ public class ContainersLauncher extends
case LAUNCH_CONTAINER:
Application app =
context.getApplications().get(containerId.getAppId());
- String appIdStr = ConverterUtils.toString(app.getAppId());
- // TODO set in Application
ContainerLaunch launch =
new ContainerLaunch(getConfig(), dispatcher, exec, app,
event.getContainer());
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java Thu Aug 4 05:33:35 2011
@@ -211,7 +211,9 @@ public class ContainerLocalizer {
final LocalDirAllocator lda;
switch (r.getVisibility()) {
default:
- LOG.warn("Unknown visibility: " + r.getVisibility());
+ LOG.warn("Unknown visibility: " + r.getVisibility()
+ + ", Using userDirs");
+ //Falling back to userDirs for unknown visibility.
case PUBLIC:
case PRIVATE:
lda = userDirs;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java Thu Aug 4 05:33:35 2011
@@ -87,7 +87,6 @@ public class FSDownload implements Calla
}
private long unpack(File localrsrc, File dst) throws IOException {
- File destDir = new File(localrsrc.getParent());
switch (resource.getType()) {
case ARCHIVE:
String lowerDst = dst.getName().toLowerCase();
@@ -101,12 +100,18 @@ public class FSDownload implements Calla
FileUtil.unTar(localrsrc, dst);
} else {
LOG.warn("Cannot unpack " + localrsrc);
- localrsrc.renameTo(dst);
+ if (!localrsrc.renameTo(dst)) {
+ throw new IOException("Unable to rename file: [" + localrsrc
+ + "] to [" + dst + "]");
+ }
}
break;
case FILE:
default:
- localrsrc.renameTo(dst);
+ if (!localrsrc.renameTo(dst)) {
+ throw new IOException("Unable to rename file: [" + localrsrc
+ + "] to [" + dst + "]");
+ }
break;
}
return 0;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourcesTrackerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourcesTrackerImpl.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourcesTrackerImpl.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourcesTrackerImpl.java Thu Aug 4 05:33:35 2011
@@ -67,7 +67,7 @@ class LocalResourcesTrackerImpl implemen
break;
case RELEASE:
if (null == rsrc) {
- LOG.info("Release unknown rsrc " + rsrc + " (discard)");
+ LOG.info("Release unknown rsrc null (discard)");
return;
}
break;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java Thu Aug 4 05:33:35 2011
@@ -357,7 +357,8 @@ public class ResourceLocalizationService
Application application =
((ApplicationLocalizationEvent) event).getApplication();
- LocalResourcesTracker appLocalRsrcsTracker = appRsrc.remove(application);
+ LocalResourcesTracker appLocalRsrcsTracker =
+ appRsrc.remove(ConverterUtils.toString(application.getAppId()));
if (null == appLocalRsrcsTracker) {
LOG.warn("Removing uninitialized application " + application);
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerTokenIdentifier.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerTokenIdentifier.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerTokenIdentifier.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerTokenIdentifier.java Thu Aug 4 05:33:35 2011
@@ -28,7 +28,7 @@ import org.apache.hadoop.security.token.
public class LocalizerTokenIdentifier extends TokenIdentifier {
- public static Text KIND = new Text("Localizer");
+ public static final Text KIND = new Text("Localizer");
@Override
public void write(DataOutput out) throws IOException {
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java Thu Aug 4 05:33:35 2011
@@ -106,7 +106,7 @@ public class ContainerLogsPage extends N
} catch (Exception e) {
div.h1("Cannot find this log on the local disk.")._();
}
- div.h1(logFile.getName());
+ div.h1(logFile == null ? "Unknown LogFile" : logFile.getName());
long start =
$("start").isEmpty() ? -4 * 1024 : Long.parseLong($("start"));
start = start < 0 ? logFile.length() + start : start;
@@ -128,6 +128,7 @@ public class ContainerLogsPage extends N
._(" for full log").br()._();
}
// TODO: Use secure IO Utils to avoid symlink attacks.
+ //TODO Fix findBugs close warning along with IOUtils change
FileReader reader = new FileReader(logFile);
char[] cbuf = new char[65536];
reader.skip(start);
@@ -145,7 +146,7 @@ public class ContainerLogsPage extends N
writer().write(
"Exception reading log-file "
+ StringUtils.stringifyException(e));
- }
+ }
}
div._();
} else {
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java Thu Aug 4 05:33:35 2011
@@ -23,7 +23,6 @@ import static org.apache.hadoop.yarn.uti
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.net.DNS;
import org.apache.hadoop.yarn.YarnException;
import org.apache.hadoop.yarn.server.nodemanager.Context;
import org.apache.hadoop.yarn.server.nodemanager.NMConfig;
@@ -77,7 +76,7 @@ public class WebServer extends AbstractS
super.stop();
}
- public class NMWebApp extends WebApp implements NMWebParams {
+ public static class NMWebApp extends WebApp implements NMWebParams {
private final ResourceView resourceView;
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java Thu Aug 4 05:33:35 2011
@@ -143,6 +143,7 @@ public abstract class BaseContainerManag
+ ", baseDirs - " + baseDirs);
};
};
+ delSrvc.init(conf);
exec = createContainerExecutor();
containerManager =
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java Thu Aug 4 05:33:35 2011
@@ -264,6 +264,7 @@ public class TestContainerManager extend
IOException {
// Real del service
delSrvc = new DeletionService(exec);
+ delSrvc.init(conf);
containerManager = new ContainerManagerImpl(context, exec, delSrvc,
nodeStatusUpdater, metrics);
containerManager.init(conf);
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java Thu Aug 4 05:33:35 2011
@@ -90,6 +90,7 @@ public class TestLogAggregationService e
@Test
public void testLocalFileDeletionAfterUpload() throws IOException {
this.delSrvc = new DeletionService(createContainerExecutor());
+ this.delSrvc.init(conf);
this.conf.set(NMConfig.NM_LOG_DIR, localLogDir.getAbsolutePath());
this.conf.set(NMConfig.REMOTE_USER_LOG_DIR,
this.remoteRootLogDir.getAbsolutePath());
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml Thu Aug 4 05:33:35 2011
@@ -12,6 +12,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java Thu Aug 4 05:33:35 2011
@@ -74,15 +74,15 @@ public class RMConfig {
public static final String RM_ACLS_ENABLED = YarnConfiguration.RM_PREFIX +
"acls.enabled";
- public static String RM_ADMIN_ACL =
+ public static final String RM_ADMIN_ACL =
YarnConfiguration.RM_PREFIX + "admin.acl";
- public static String DEFAULT_RM_ADMIN_ACL = "*";
+ public static final String DEFAULT_RM_ADMIN_ACL = "*";
- public static String RM_NODES_INCLUDE_FILE =
+ public static final String RM_NODES_INCLUDE_FILE =
YarnConfiguration.RM_PREFIX + "nodes.include";
- public static String DEFAULT_RM_NODES_INCLUDE_FILE = "";
+ public static final String DEFAULT_RM_NODES_INCLUDE_FILE = "";
- public static String RM_NODES_EXCLUDE_FILE =
+ public static final String RM_NODES_EXCLUDE_FILE =
YarnConfiguration.RM_PREFIX + "nodes.exclude";
- public static String DEFAULT_RM_NODES_EXCLUDE_FILE = "";
+ public static final String DEFAULT_RM_NODES_EXCLUDE_FILE = "";
}
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKStore.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKStore.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKStore.java Thu Aug 4 05:33:35 2011
@@ -83,7 +83,7 @@ public class ZKStore implements Store {
* of connection and session events.
*
*/
- private class ZKWatcher implements Watcher {
+ private static class ZKWatcher implements Watcher {
@Override
public void process(WatchedEvent arg0) {
}
@@ -124,6 +124,7 @@ public class ZKStore implements Store {
/** create a storage node and store it in zk **/
if (!doneWithRecovery) return;
NodeReportPBImpl nodeManagerInfo = createNodeManagerInfo(node);
+ // TODO FinBugs - will be fixed after the subsequent fixme
byte[] bytes = nodeManagerInfo.getProto().toByteArray();
// TODO: FIXMEVinodkv
// try {
@@ -228,8 +229,6 @@ public class ZKStore implements Store {
@Override
public synchronized void removeContainer(Container container) throws IOException {
if (!doneWithRecovery) return;
-
- ContainerPBImpl containerPBImpl = (ContainerPBImpl) container;
try {
zkClient.delete(APPS + containerPathFromContainerId(container.getId()),
-1);
@@ -325,7 +324,7 @@ public class ZKStore implements Store {
return rmState;
}
- private class ApplicationInfoImpl implements ApplicationInfo {
+ private static class ApplicationInfoImpl implements ApplicationInfo {
private ApplicationMaster master;
private Container masterContainer;
@@ -477,6 +476,7 @@ public class ZKStore implements Store {
continue;
}
int httpPort = Integer.valueOf(m.group(1));
+ // TODO: FindBugs Valid. Fix
RMNode nm = new RMNodeImpl(node.getNodeId(), null,
hostName, cmPort, httpPort,
ResourceTrackerService.resolve(node.getNodeId().getHost()),
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java Thu Aug 4 05:33:35 2011
@@ -144,6 +144,7 @@ public class SchedulerNode {
if (resource == null) {
LOG.error("Invalid deduction of null resource for "
+ rmNode.getNodeAddress());
+ return;
}
Resources.subtractFrom(availableResource, resource);
Resources.addTo(usedResource, resource);
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java Thu Aug 4 05:33:35 2011
@@ -80,25 +80,25 @@ public class CapacitySchedulerConfigurat
PREFIX + "maximum-allocation-mb";
@Private
- public static int DEFAULT_MAXIMUM_SYSTEM_APPLICATIIONS = 10000;
+ public static final int DEFAULT_MAXIMUM_SYSTEM_APPLICATIIONS = 10000;
@Private
- public static int UNDEFINED = -1;
+ public static final int UNDEFINED = -1;
@Private
- public static int MINIMUM_CAPACITY_VALUE = 1;
+ public static final int MINIMUM_CAPACITY_VALUE = 1;
@Private
- public static int MAXIMUM_CAPACITY_VALUE = 100;
+ public static final int MAXIMUM_CAPACITY_VALUE = 100;
@Private
- public static int DEFAULT_USER_LIMIT = 100;
+ public static final int DEFAULT_USER_LIMIT = 100;
@Private
- public static float DEFAULT_USER_LIMIT_FACTOR = 1.0f;
+ public static final float DEFAULT_USER_LIMIT_FACTOR = 1.0f;
@Private
- public static String DEFAULT_ACL = "*";
+ public static final String DEFAULT_ACL = "*";
@Private public static final String ENABLE_USER_METRICS =
PREFIX +"user-metrics.enable";
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml?rev=1153756&r1=1153755&r2=1153756&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml Thu Aug 4 05:33:35 2011
@@ -11,6 +11,7 @@
<properties>
<install.file>${project.artifact.file}</install.file>
+ <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
|