summaryrefslogtreecommitdiff
path: root/opendc-compute
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-08-24 16:55:42 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-09-07 14:24:40 +0200
commitd097d65851619483a85ce16ab56f61a726bbe756 (patch)
treedd88343b07125fd8fa30567d0306ff4b5797cb9f /opendc-compute
parent9236b3cfb7be1e9d44fe60cbdd699c19c70f6411 (diff)
fix(compute): Support overcommitted memory in SimHost
This change enables host to overcommit their memory when testing whether new servers can fit on the host.
Diffstat (limited to 'opendc-compute')
-rw-r--r--opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt8
1 files changed, 1 insertions, 7 deletions
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
index e12bd37b..76cc7dfe 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
@@ -87,11 +87,6 @@ public class SimHost(
private val listeners = mutableListOf<HostListener>()
/**
- * Current total memory use of the images on this hypervisor.
- */
- private var availableMemory: Long = model.memory.sumOf { it.size }
-
- /**
* The machine to run on.
*/
public val machine: SimBareMetalMachine = SimBareMetalMachine(interpreter, model, powerDriver)
@@ -291,7 +286,7 @@ public class SimHost(
}
override fun canFit(server: Server): Boolean {
- val sufficientMemory = availableMemory > server.flavor.memorySize
+ val sufficientMemory = machine.model.memory.size >= server.flavor.memorySize
val enoughCpus = machine.model.cpus.size >= server.flavor.cpuCount
val canFit = hypervisor.canFit(server.flavor.toMachineModel())
@@ -469,7 +464,6 @@ public class SimHost(
else
ServerState.ERROR
- availableMemory += server.flavor.memorySize
onGuestStop(this)
}
}