Skip to content

missing an early return for numPorts == 0 #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 1 commit into from
Mar 8, 2016
Merged

missing an early return for numPorts == 0 #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions SingularityBase/src/main/java/com/hubspot/mesos/MesosUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ public static Resource getMemoryResource(double memory) {

public static long[] getPorts(Resource portsResource, int numPorts) {
long[] ports = new long[numPorts];
if (numPorts == 0) {
return ports;
}

int idx = 0;

for (Range r : portsResource.getRanges().getRangeList()) {
Expand Down
9 changes: 9 additions & 0 deletions SingularityService/src/test/java/com/hubspot/singularity/scheduler/MesosUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@ public void testLiteralHostPortSelection() {
Assert.assertEquals(numPorts + requestedPorts.size(), MesosUtils.getNumPorts(Collections.singletonList(resource)));
}

@Test
public void testGetZeroPortsFromResource() {
String[] rangesOverlappingRequestPorts = {"23:28"};
int numPorts = 0;
List<Long> requestedPorts = Arrays.asList(25L, 27L);
Resource resource = MesosUtils.getPortsResource(numPorts, buildOffer(rangesOverlappingRequestPorts).getResourcesList(), requestedPorts);
Assert.assertEquals(0, MesosUtils.getPorts(resource, numPorts).length);
}

public static Resource buildPortRanges(String... ranges) {
Resource.Builder resources = Resource.newBuilder()
.setType(Type.RANGES)
Expand Down