You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/01/07 23:13:02 UTC
hadoop git commit: YARN-3010. Fixed findbugs warning in
AbstractYarnScheduler. Contributed by Yi Liu (cherry picked from commit
e13a484a2be64fb781c5eca5ae7056cbe194ac5e)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 adf49e4b9 -> d3b26454e
YARN-3010. Fixed findbugs warning in AbstractYarnScheduler. Contributed by Yi Liu
(cherry picked from commit e13a484a2be64fb781c5eca5ae7056cbe194ac5e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d3b26454
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d3b26454
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d3b26454
Branch: refs/heads/branch-2
Commit: d3b26454e453953d2eb221b62d1ff3632da9e8a6
Parents: adf49e4
Author: Jian He <ji...@apache.org>
Authored: Wed Jan 7 14:12:07 2015 -0800
Committer: Jian He <ji...@apache.org>
Committed: Wed Jan 7 14:12:54 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../server/resourcemanager/scheduler/AbstractYarnScheduler.java | 4 ++--
.../resourcemanager/scheduler/capacity/CapacityScheduler.java | 3 ++-
.../server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3b26454/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c477db7..5e8e6ca 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -296,6 +296,9 @@ Release 2.7.0 - UNRELEASED
YARN-2230. Fixed few configs description in yarn-default.xml. (Vijay Bhat
via jianhe)
+ YARN-3010. Fixed findbugs warning in AbstractYarnScheduler. (Yi Liu via
+ jianhe)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3b26454/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index bf720ae..ad2b5d4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -189,8 +189,8 @@ public abstract class AbstractYarnScheduler
}
}
- protected void containerLaunchedOnNode(ContainerId containerId,
- SchedulerNode node) {
+ protected synchronized void containerLaunchedOnNode(
+ ContainerId containerId, SchedulerNode node) {
// Get the application for the finished container
SchedulerApplicationAttempt application = getCurrentAttemptForContainer
(containerId);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3b26454/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index 5e6a352..e622d3a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -249,7 +249,8 @@ public class CapacityScheduler extends
}
@Override
- public RMContainerTokenSecretManager getContainerTokenSecretManager() {
+ public synchronized RMContainerTokenSecretManager
+ getContainerTokenSecretManager() {
return this.rmContext.getContainerTokenSecretManager();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3b26454/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.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/FairScheduler.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/FairScheduler.java
index 124da99..2f0857e 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/FairScheduler.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/FairScheduler.java
@@ -1232,7 +1232,7 @@ public class FairScheduler extends
}
}
- private String resolveReservationQueueName(String queueName,
+ private synchronized String resolveReservationQueueName(String queueName,
ApplicationId applicationId, ReservationId reservationID) {
FSQueue queue = queueMgr.getQueue(queueName);
if ((queue == null) || !allocConf.isReservable(queue.getQueueName())) {