diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-05-06 11:54:21 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-05-06 11:54:21 +0200 |
| commit | 171d9948af5f14243da7aa140a231dbf9ae8df15 (patch) | |
| tree | c42f2a5b08923e91b0afad4bc686b298c165a1ea /opendc/opendc-compute/src | |
| parent | 9d17c77a85d7d88287b06a521b0c6358f589ca9a (diff) | |
| parent | 48f6a6f2d42851bc2eeed5b6ef41145740c70286 (diff) | |
Merge branch 'test/integration-test' into '2.x'
Add integration tests for SC20 experiments
Closes #54
See merge request opendc/opendc-simulator!63
Diffstat (limited to 'opendc/opendc-compute/src')
| -rw-r--r-- | opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/service/SimpleVirtProvisioningService.kt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/service/SimpleVirtProvisioningService.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/service/SimpleVirtProvisioningService.kt index 520f6dc5..2185b372 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/service/SimpleVirtProvisioningService.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/service/SimpleVirtProvisioningService.kt @@ -139,10 +139,13 @@ class SimpleVirtProvisioningService( if (selectedHv == null) { if (requiredMemory > maxMemory || imageInstance.flavor.cpuCount > maxCores) { unscheduledVms++ + incomingImages -= imageInstance + println("[${clock.millis()}] CANNOT SPAWN ${imageInstance.image}") + continue + } else { + break } - - break } try { |