diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2020-11-30 15:23:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 15:23:00 +0100 |
| commit | 9d64924f89a48e712403fb73808e2280bfe3dfe3 (patch) | |
| tree | ac476ec91a2392e032b16144c14cbcae51a45023 | |
| parent | 9f31d47a80a9d1827be9adc9d4a8a2c0f4aff706 (diff) | |
| parent | c9d5015a556142f1e6025615badc0335ffdfd2d4 (diff) | |
Merge pull request #15535 from vespa-engine/hakonhall/require-hostresource-bandwidth
Require HostResource bandwidth
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/custom/HostResources.java | 3 | ||||
| -rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/custom/HostResources.java b/flags/src/main/java/com/yahoo/vespa/flags/custom/HostResources.java index c0b5d7a523c..129e1020b04 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/custom/HostResources.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/custom/HostResources.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; -import java.util.Optional; import java.util.Set; /** @@ -45,7 +44,7 @@ public class HostResources { this.vcpu = requirePositive("vcpu", vcpu); this.memoryGb = requirePositive("memoryGb", memoryGb); this.diskGb = requirePositive("diskGb", diskGb); - this.bandwidthGbps = requirePositive("bandwidthGbps", Optional.ofNullable(bandwidthGbps).orElse(0.3)); + this.bandwidthGbps = requirePositive("bandwidthGbps", bandwidthGbps); this.diskSpeed = validateEnum("diskSpeed", validDiskSpeeds, diskSpeed); this.storageType = validateEnum("storageType", validStorageTypes, storageType); this.containers = requirePositive("containers", containers); diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java index 28e84bcf3e5..636eea2c33c 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java @@ -112,7 +112,7 @@ public class FlagsTest { @Test public void testSharedHostFlag() { SharedHost sharedHost = new SharedHost(List.of(new HostResources( - 4.0, 16.0, 50.0, null, + 4.0, 16.0, 50.0, 0.3, "fast", "local", 10))); testGeneric(Flags.SHARED_HOST, sharedHost); |