SLIDER-799 rename cancelOutstandingRequests to resetOutstandingRequests -as all it does is reset the data structures
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1624bdfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1624bdfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1624bdfb Branch: refs/heads/feature/SLIDER-799-AM-managed-relax Commit: 1624bdfbe75194b78ef58cc6f68cb67d0a447e3c Parents: 06e8db3 Author: Steve Loughran <[email protected]> Authored: Wed Mar 18 10:30:19 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Mar 18 10:30:19 2015 +0000 ---------------------------------------------------------------------- .../slider/server/appmaster/SliderAppMaster.java | 2 +- .../appmaster/state/OutstandingRequestTracker.java | 4 ++-- .../slider/server/appmaster/state/RoleHistory.java | 4 ++-- .../TestRoleHistoryOutstandingRequestTracker.groovy | 14 +++++++++----- 4 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1624bdfb/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index a93c60b..fd420fd 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -863,7 +863,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService // build up environment variables that the AM wants set in every container // irrespective of provider and role. - envVars = new HashMap<String, String>(); + envVars = new HashMap<>(); if (hadoop_user_name != null) { envVars.put(HADOOP_USER_NAME, hadoop_user_name); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1624bdfb/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java index eb58e74..93db3fa 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java @@ -202,13 +202,13 @@ public class OutstandingRequestTracker { /** - * Cancel all outstanding requests for a role: return the hostnames + * Reset list all outstanding requests for a role: return the hostnames * of any canceled requests * * @param role role to cancel * @return possibly empty list of hostnames */ - public synchronized List<NodeInstance> cancelOutstandingRequests(int role) { + public synchronized List<NodeInstance> resetOutstandingRequests(int role) { List<NodeInstance> hosts = new ArrayList<>(); Iterator<Map.Entry<OutstandingRequest,OutstandingRequest>> iterator = placedRequests.entrySet().iterator(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1624bdfb/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 0d4de2d..7ac5c52 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 @@ -645,10 +645,10 @@ public class RoleHistory { boolean requestFound = outstandingRequests.onContainerAllocated(role, hostname); if (desiredCount <= actualCount) { - // all oustanding requests have been satisfied + // all outstanding requests have been satisfied // tag nodes as available List<NodeInstance> - hosts = outstandingRequests.cancelOutstandingRequests(role); + hosts = outstandingRequests.resetOutstandingRequests(role); if (!hosts.isEmpty()) { //add the list log.info("Adding {} hosts for role {}", hosts.size(), role); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1624bdfb/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy index 79a9bd6..0143bce 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy @@ -55,19 +55,23 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest { } @Test - public void testCancelEntries() throws Throwable { + public void testResetEntries() throws Throwable { OutstandingRequest r1 = tracker.newRequest(host1, 0) OutstandingRequest r2 = tracker.newRequest(host2, 0) OutstandingRequest r3 = tracker.newRequest(host1, 1) - List<NodeInstance> canceled = tracker.cancelOutstandingRequests(0) + List<NodeInstance> canceled = tracker.resetOutstandingRequests(0) assert canceled.size() == 2 assert canceled.contains(host1) assert canceled.contains(host2) assert tracker.lookup(1, "host1") assert !tracker.lookup(0, "host1") - canceled = tracker.cancelOutstandingRequests(0) + canceled = tracker.resetOutstandingRequests(0) assert canceled.size() == 0 - assert tracker.cancelOutstandingRequests(1).size() == 1 + assert tracker.resetOutstandingRequests(1).size() == 1 + } + + @Test + public void testEscalation() throws Throwable { + OutstandingRequest r1 = tracker.newRequest(host1, 0) } - }
