summaryrefslogtreecommitdiff
path: root/opendc-experiments
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-11-17 13:40:51 +0100
committerGitHub <noreply@github.com>2021-11-17 13:40:51 +0100
commita921c9f847aabe72bdef42574d96f905d9fb2468 (patch)
treef0982efeacf4910a73eb3133a54b50352984018f /opendc-experiments
parent381c7589cbf01ca6ed321c58c8a3a9cbea6ebd84 (diff)
parent1dcdca7e09e34cdde53f6d14db56780688e19eae (diff)
merge: Improve workflow service (#43)
This pull request is the first in a series of changes to the workflow service. This pull request aims to help users setup workflow simulations. The next pull requests will focus on improving the design of the workflow service. * Remove WorkflowSchedulerMode * Add helper tools for workflow simulations (e.g. `WorkflowServiceHelper`) **Breaking API Changes** * Removal of `WorkflowSchedulerMode` * Rename from `ComputeWorkloadRunner` to `ComputeServiceHelper`
Diffstat (limited to 'opendc-experiments')
-rw-r--r--opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt2
-rw-r--r--opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt4
-rw-r--r--opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt8
3 files changed, 7 insertions, 7 deletions
diff --git a/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt b/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
index 48a90985..4b35de95 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
@@ -67,7 +67,7 @@ class CapelinBenchmarks {
filters = listOf(ComputeFilter(), VCpuFilter(16.0), RamFilter(1.0)),
weighers = listOf(CoreRamWeigher(multiplier = 1.0))
)
- val runner = ComputeWorkloadRunner(
+ val runner = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
index 53c9de11..b548ae58 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
@@ -24,8 +24,8 @@ package org.opendc.experiments.capelin
import com.typesafe.config.ConfigFactory
import mu.KotlinLogging
+import org.opendc.compute.workload.ComputeServiceHelper
import org.opendc.compute.workload.ComputeWorkloadLoader
-import org.opendc.compute.workload.ComputeWorkloadRunner
import org.opendc.compute.workload.createComputeScheduler
import org.opendc.compute.workload.export.parquet.ParquetComputeMetricExporter
import org.opendc.compute.workload.grid5000
@@ -109,7 +109,7 @@ abstract class Portfolio(name: String) : Experiment(name) {
grid5000(Duration.ofSeconds((operationalPhenomena.failureFrequency * 60).roundToLong()))
else
null
- val runner = ComputeWorkloadRunner(
+ val runner = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler,
diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
index 1a8948f3..eedc3131 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
@@ -83,7 +83,7 @@ class CapelinIntegrationTest {
@Test
fun testLarge() = runBlockingSimulation {
val workload = createTestWorkload(1.0)
- val runner = ComputeWorkloadRunner(
+ val runner = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler
@@ -131,7 +131,7 @@ class CapelinIntegrationTest {
val seed = 1
val workload = createTestWorkload(0.25, seed)
- val simulator = ComputeWorkloadRunner(
+ val simulator = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler
@@ -180,7 +180,7 @@ class CapelinIntegrationTest {
.read(perfInterferenceInput)
.withSeed(seed.toLong())
- val simulator = ComputeWorkloadRunner(
+ val simulator = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler,
@@ -222,7 +222,7 @@ class CapelinIntegrationTest {
@Test
fun testFailures() = runBlockingSimulation {
val seed = 1
- val simulator = ComputeWorkloadRunner(
+ val simulator = ComputeServiceHelper(
coroutineContext,
clock,
computeScheduler,