summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-energy21/src
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-09-10 17:10:42 +0200
committerGitHub <noreply@github.com>2021-09-10 17:10:42 +0200
commitcae193284570d6ee9dbacdde57b3e4e367aa9d9f (patch)
tree205bf08e503bc8b8bb2d5af77f0b4aee819f862b /opendc-experiments/opendc-experiments-energy21/src
parent58ac6e203f38ea0122d08c74adf7644c478c3afe (diff)
parentf142be8c2afd1f19bdec183f1169639b7cd1a472 (diff)
merge: Integrate fault injector into compute simulator
This pull request integrates the fault injector into the `opendc-compute-simulator` module, where it is now specialized to inject faults into `SimHost` instances. The previous fault injector implementation supported generic targets, but this caused the implementation to be more complex. Since the fault injector was only used for `SimHost` instances, we have decided to specialize it to `SimHost` for now. - Support generic distribution in fault injector - Terminate servers after reaching deadline - Integrate fault injection into compute simulator - Clarify terminology in compute service ** External Dependencies** - Apache commons-math3 **Breaking API Changes** - Removal of `opendc-simulator-failures` and its corresponding interfaces/classes.
Diffstat (limited to 'opendc-experiments/opendc-experiments-energy21/src')
-rw-r--r--opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt3
1 files changed, 0 insertions, 3 deletions
diff --git a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
index 02aaab3c..d9194969 100644
--- a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
+++ b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
@@ -26,7 +26,6 @@ import com.typesafe.config.ConfigFactory
import io.opentelemetry.api.metrics.MeterProvider
import io.opentelemetry.sdk.metrics.export.MetricProducer
import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.coroutineScope
import mu.KotlinLogging
import org.opendc.compute.service.ComputeService
@@ -81,7 +80,6 @@ public class EnergyExperiment : Experiment("Energy Modeling 2021") {
private val powerModel by anyOf(PowerModelType.LINEAR, PowerModelType.CUBIC, PowerModelType.INTERPOLATION)
override fun doRun(repeat: Int): Unit = runBlockingSimulation {
- val chan = Channel<Unit>(Channel.CONFLATED)
val allocationPolicy = FilterScheduler(
filters = listOf(ComputeFilter(), VCpuFilter(1.0), RamFilter(1.0)),
weighers = listOf(),
@@ -98,7 +96,6 @@ public class EnergyExperiment : Experiment("Energy Modeling 2021") {
clock,
trace,
scheduler,
- chan,
monitor
)
}