Repository: hadoop Updated Branches: refs/heads/branch-2.7 d2dad7442 -> 47e6fc2bf
Revert "YARN-3181. FairScheduler: Fix up outdated findbugs issues. (kasha)" This reverts commit c2b185def846f5577a130003a533b9c377b58fab. (cherry picked from commit 32b43304563c2430c00bc3e142a962d2bc5f4d58) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/47e6fc2b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/47e6fc2b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/47e6fc2b Branch: refs/heads/branch-2.7 Commit: 47e6fc2bf9c3731594a37c74089411ccc44a5221 Parents: d2dad74 Author: Karthik Kambatla <ka...@apache.org> Authored: Tue Mar 17 12:31:15 2015 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Tue Mar 17 12:32:14 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 -- .../dev-support/findbugs-exclude.xml | 27 ++++++++++++++++++++ .../scheduler/fair/AllocationConfiguration.java | 13 +++------- .../fair/AllocationFileLoaderService.java | 2 +- .../scheduler/fair/FSOpDurations.java | 3 --- 5 files changed, 31 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e6fc2b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1c46d0d..0cdc7c4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -251,8 +251,6 @@ Release 2.7.0 - UNRELEASED YARN-2079. Recover NonAggregatingLogHandler state upon nodemanager restart. (Jason Lowe via junping_du) - YARN-3181. FairScheduler: Fix up outdated findbugs issues. (kasha) - YARN-3124. Fixed CS LeafQueue/ParentQueue to use QueueCapacities to track capacities-by-label. (Wangda Tan via jianhe) http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e6fc2b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml index a89884a..943ecb0 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml @@ -152,12 +152,22 @@ <Class name="org.apache.hadoop.yarn.server.nodemanager.containermanager.logaggregation.LogAggregationService" /> <Bug pattern="IS2_INCONSISTENT_SYNC" /> </Match> + <Match> + <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationFileLoaderService" /> + <Field name="allocFile" /> + <Bug pattern="IS2_INCONSISTENT_SYNC" /> + </Match> <!-- Inconsistent sync warning - minimumAllocation is only initialized once and never changed --> <Match> <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler" /> <Field name="minimumAllocation" /> <Bug pattern="IS2_INCONSISTENT_SYNC" /> </Match> + <Match> + <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSSchedulerNode" /> + <Method name="reserveResource" /> + <Bug pattern="BC_UNCONFIRMED_CAST" /> + </Match> <!-- Inconsistent sync warning - reinitialize read from other queue does not need sync--> <Match> <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue" /> @@ -215,6 +225,18 @@ <Field name="scheduleAsynchronously" /> <Bug pattern="IS2_INCONSISTENT_SYNC" /> </Match> + <!-- Inconsistent sync warning - updateInterval is only initialized once and never changed --> + <Match> + <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler" /> + <Field name="updateInterval" /> + <Bug pattern="IS2_INCONSISTENT_SYNC" /> + </Match> + <!-- Inconsistent sync warning - callDurationMetrics is only initialized once and never changed --> + <Match> + <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler" /> + <Field name="fsOpDurations" /> + <Bug pattern="IS2_INCONSISTENT_SYNC" /> + </Match> <!-- Inconsistent sync warning - numRetries is only initialized once and never changed --> <Match> @@ -415,6 +437,11 @@ <Bug pattern="IS2_INCONSISTENT_SYNC" /> </Match> <Match> + <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler" /> + <Field name="allocConf" /> + <Bug pattern="IS2_INCONSISTENT_SYNC" /> + </Match> + <Match> <Class name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode" /> <Field name="numContainers" /> <Bug pattern="VO_VOLATILE_INCREMENT" /> http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e6fc2b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java index 9cb767d..0ea7314 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java @@ -33,9 +33,6 @@ import org.apache.hadoop.yarn.util.resource.Resources; import com.google.common.annotations.VisibleForTesting; -import javax.annotation.concurrent.ThreadSafe; - -@ThreadSafe public class AllocationConfiguration extends ReservationSchedulerConfiguration { private static final AccessControlList EVERYBODY_ACL = new AccessControlList("*"); private static final AccessControlList NOBODY_ACL = new AccessControlList(" "); @@ -207,16 +204,12 @@ public class AllocationConfiguration extends ReservationSchedulerConfiguration { } public ResourceWeights getQueueWeight(String queue) { - synchronized (queueWeights) { - ResourceWeights weight = queueWeights.get(queue); - return (weight == null) ? ResourceWeights.NEUTRAL : weight; - } + ResourceWeights weight = queueWeights.get(queue); + return (weight == null) ? ResourceWeights.NEUTRAL : weight; } public void setQueueWeight(String queue, ResourceWeights weight) { - synchronized (queueWeights) { - queueWeights.put(queue, weight); - } + queueWeights.put(queue, weight); } public int getUserMaxApps(String user) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e6fc2b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java index c19aa51..76fa588 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java @@ -201,7 +201,7 @@ public class AllocationFileLoaderService extends AbstractService { * @throws ParserConfigurationException if XML parser is misconfigured. * @throws SAXException if config file is malformed. */ - public void reloadAllocations() throws IOException, + public synchronized void reloadAllocations() throws IOException, ParserConfigurationException, SAXException, AllocationConfigurationException { if (allocFile == null) { return; http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e6fc2b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java index c50f281..c2282fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java @@ -31,8 +31,6 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry; import static org.apache.hadoop.metrics2.lib.Interns.info; import org.apache.hadoop.metrics2.lib.MutableRate; -import javax.annotation.concurrent.ThreadSafe; - /** * Class to capture the performance metrics of FairScheduler. * This should be a singleton. @@ -40,7 +38,6 @@ import javax.annotation.concurrent.ThreadSafe; @InterfaceAudience.Private @InterfaceStability.Unstable @Metrics(context="fairscheduler-op-durations") -@ThreadSafe public class FSOpDurations implements MetricsSource { @Metric("Duration for a continuous scheduling run")