You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/07 00:29:53 UTC
[11/22] incubator-slider git commit: SLIDER-963 Write mock/unit tests
for AA placement
SLIDER-963 Write mock/unit tests for AA placement
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7f964166
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7f964166
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7f964166
Branch: refs/heads/feature/SLIDER-82-pass-3.1
Commit: 7f964166fcb8bb09d98f8c0cfce4839481ec6317
Parents: ee8a9be
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 5 18:58:40 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 5 18:58:40 2015 +0000
----------------------------------------------------------------------
...tRoleHistoryOutstandingRequestTracker.groovy | 36 ++++++++------------
.../appmaster/model/mock/MockFactory.groovy | 8 ++---
.../appmaster/model/mock/MockResource.groovy | 2 +-
3 files changed, 19 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f964166/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 56b2c31..8399d53 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
@@ -39,6 +39,7 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest {
NodeInstance host1 = new NodeInstance("host1", 3)
NodeInstance host2 = new NodeInstance("host2", 3)
+ def resource = factory.newResource(48, 1)
OutstandingRequestTracker tracker = new OutstandingRequestTracker()
@@ -52,9 +53,11 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest {
@Test
public void testAddCompleteEntry() throws Throwable {
- tracker.newRequest(host1, 0)
- tracker.newRequest(host2, 0)
- tracker.newRequest(host1, 1)
+ def req1 = tracker.newRequest(host1, 0)
+ req1.buildContainerRequest(resource, role0Status, 0, "")
+
+ tracker.newRequest(host2, 0).buildContainerRequest(resource, role0Status, 0, "")
+ tracker.newRequest(host1, 1).buildContainerRequest(resource, role0Status, 0, "")
def allocation = tracker.onContainerAllocated(1, "host1", null)
assert allocation.outcome == ContainerAllocationOutcome.Placed
@@ -79,14 +82,10 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest {
@Test
public void testRemoveOpenRequestUnissued() throws Throwable {
def req1 = tracker.newRequest(null, 0)
+ req1.buildContainerRequest(resource, role0Status, 0, "")
assert tracker.listOpenRequests().size() == 1
- def c1 = factory.newContainer()
- c1.setPriority(new MockPriority(0))
-
- def resource = factory.newResource()
- resource.virtualCores=1
- resource.memory = 48;
- c1.setResource(resource)
+ def c1 = factory.newContainer(null, new MockPriority(0))
+ c1.resource = resource
def allocation = tracker.onContainerAllocated(0, "host1", c1)
ContainerAllocationOutcome outcome = allocation.outcome
@@ -98,26 +97,19 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest {
@Test
public void testIssuedOpenRequest() throws Throwable {
def req1 = tracker.newRequest(null, 0)
- def resource = factory.newResource()
- resource.virtualCores = 1
- resource.memory = 48;
- def yarnRequest = req1.buildContainerRequest(resource, role0Status, 0, "")
+ req1.buildContainerRequest(resource, role0Status, 0, "")
assert tracker.listOpenRequests().size() == 1
- def c1 = factory.newContainer()
-
- def nodeId = factory.newNodeId()
- c1.nodeId = nodeId
- nodeId.host ="hostname-1"
def pri = ContainerPriority.buildPriority(0, false)
assert pri > 0
- c1.setPriority(new MockPriority(pri))
+ def nodeId = factory.newNodeId("hostname-1")
+ def c1 = factory.newContainer(nodeId, new MockPriority(pri))
- c1.setResource(resource)
+ c1.resource = resource
def issued = req1.issuedRequest
assert issued.capability == resource
- assert issued.priority.priority == c1.getPriority().getPriority()
+ assert issued.priority.priority == c1.priority.priority
assert req1.resourceRequirementsMatch(resource)
def allocation = tracker.onContainerAllocated(0, nodeId.host, c1)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f964166/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy
index 25fdd8b..f7fd641 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy
@@ -107,8 +107,8 @@ class MockFactory implements MockRoles {
return id;
}
- MockNodeId newNodeId() {
- new MockNodeId()
+ MockNodeId newNodeId(String host = null) {
+ new MockNodeId(host: host)
}
MockContainer newContainer(ContainerId cid) {
@@ -202,8 +202,8 @@ class MockFactory implements MockRoles {
]
}
- MockResource newResource() {
- return new MockResource()
+ MockResource newResource(int memory = 0, int vcores = 0) {
+ return new MockResource(memory, vcores)
}
MockContainerStatus newContainerStatus() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f964166/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockResource.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockResource.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockResource.groovy
index f4c54f3..91ab43b 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockResource.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockResource.groovy
@@ -24,7 +24,7 @@ class MockResource extends Resource {
int memory
int virtualCores
- MockResource(int memory=0, int vcores=0) {
+ MockResource(int memory = 0, int vcores = 0) {
this.memory = memory
this.virtualCores = vcores
}