Repository: incubator-slider Updated Branches: refs/heads/develop 88e6d66c5 -> 68f52ed02
SLIDER-1154 fix concurrent data access violations Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/68f52ed0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/68f52ed0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/68f52ed0 Branch: refs/heads/develop Commit: 68f52ed02675a22614ab45fc447fc3d0a60f3567 Parents: 88e6d66 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Fri Jul 15 07:42:53 2016 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Fri Jul 15 07:43:04 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/slider/server/appmaster/state/AppState.java | 2 +- .../java/org/apache/slider/server/appmaster/state/NodeEntry.java | 2 +- .../apache/slider/server/appmaster/state/OutstandingRequest.java | 2 +- .../org/apache/slider/server/appmaster/state/RoleHistory.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/68f52ed0/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java index 7ff2b4c..08a6e2e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java @@ -491,7 +491,7 @@ public class AppState { return snapshotTime; } - public AggregateConf getInstanceDefinitionSnapshot() { + public synchronized AggregateConf getInstanceDefinitionSnapshot() { return instanceDefinitionSnapshot; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/68f52ed0/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java index cf3881e..eb8ff03 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java @@ -279,7 +279,7 @@ public class NodeEntry implements Cloneable { /** * Reset the failed recently count. */ - public void resetFailedRecently() { + public synchronized void resetFailedRecently() { failedRecently = 0; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/68f52ed0/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java index c6524be..4357ef8 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java @@ -164,7 +164,7 @@ public final class OutstandingRequest extends RoleHostnamePair { return escalationTimeoutMillis; } - public boolean isEscalated() { + public synchronized boolean isEscalated() { return escalated; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/68f52ed0/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java index 0584d30..4e8a4d7 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java @@ -328,7 +328,7 @@ public class RoleHistory { * It's OK to be incomplete, for those the list falls back to numbers. * @return the information about that host, or null if there is none */ - public NodeInformation getNodeInformation(String hostname, + public synchronized NodeInformation getNodeInformation(String hostname, Map<Integer, String> naming) { NodeInstance nodeInstance = nodemap.get(hostname); return nodeInstance != null ? nodeInstance.serialize(naming) : null; @@ -1004,7 +1004,7 @@ public class RoleHistory { * Escalate operation as triggered by external timer. * @return a (usually empty) list of cancel/request operations. */ - public List<AbstractRMOperation> escalateOutstandingRequests() { + public synchronized List<AbstractRMOperation> escalateOutstandingRequests() { return outstandingRequests.escalateOutstandingRequests(now()); } /**
