From c27c43fd0f34b8ae95ce2a0939d827530b9e2bf2 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 5 May 2020 18:16:40 +0200 Subject: Add basic replay policy --- .../com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'opendc/opendc-experiments-sc20/src') diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index 028cfb9a..54af8a4b 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -39,11 +39,13 @@ import com.atlarge.opendc.compute.virt.service.allocation.AvailableMemoryAllocat import com.atlarge.opendc.compute.virt.service.allocation.NumberOfActiveServersAllocationPolicy import com.atlarge.opendc.compute.virt.service.allocation.ProvisionedCoresAllocationPolicy import com.atlarge.opendc.compute.virt.service.allocation.RandomAllocationPolicy +import com.atlarge.opendc.compute.virt.service.allocation.ReplayAllocationPolicy import com.atlarge.opendc.core.failure.CorrelatedFaultInjector import com.atlarge.opendc.core.failure.FailureDomain import com.atlarge.opendc.core.failure.FaultInjector import com.atlarge.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader import com.atlarge.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader +import com.atlarge.opendc.format.trace.sc20.Sc20VmPlacementReader import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import com.xenomachina.argparser.ArgParser @@ -67,6 +69,7 @@ class ExperimentParameters(parser: ArgParser) { val traceDirectory by parser.storing("path to the trace directory") val environmentFile by parser.storing("path to the environment file") val performanceInterferenceFile by parser.storing("path to the performance interference file").default { null } + val vmPlacementFile by parser.storing("path to the VM placement file").default { null } val outputFile by parser.storing("path to where the output should be stored") .default { "data/results-${System.currentTimeMillis()}.parquet" } val selectedVms by parser.storing("the VMs to run") { parseVMs(this) } @@ -121,6 +124,7 @@ fun main(args: Array) { println("trace-directory: $traceDirectory") println("environment-file: $environmentFile") println("performance-interference-file: $performanceInterferenceFile") + println("vm-placement-file: $vmPlacementFile") println("selected-vms-file: $selectedVmsFile") println("seed: $seed") println("failures: $failures") @@ -134,6 +138,12 @@ fun main(args: Array) { val root = system.newDomain("root") val chan = Channel(Channel.CONFLATED) + val vmPlacements = if (vmPlacementFile == null) { + emptyMap() + } else { + Sc20VmPlacementReader(File(vmPlacementFile!!).inputStream().buffered()).construct() + } + val allocationPolicies = mapOf( "mem" to AvailableMemoryAllocationPolicy(), "mem-inv" to AvailableMemoryAllocationPolicy(true), @@ -143,6 +153,7 @@ fun main(args: Array) { "active-servers-inv" to NumberOfActiveServersAllocationPolicy(true), "provisioned-cores" to ProvisionedCoresAllocationPolicy(), "provisioned-cores-inv" to ProvisionedCoresAllocationPolicy(true), + "replay" to ReplayAllocationPolicy(vmPlacements), "random" to RandomAllocationPolicy(Random(seed)) ) -- cgit v1.2.3 From 9892e3d9a6755e4b9ec213adc30e7539696248f6 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 5 May 2020 19:38:09 +0200 Subject: Add check for VMs not in placement data --- .../atlarge/opendc/experiments/sc20/TestExperiment.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'opendc/opendc-experiments-sc20/src') diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index 54af8a4b..424f411c 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -253,6 +253,23 @@ fun main(args: Array) { val reader = Sc20ParquetTraceReader(File(traceDirectory), performanceInterferenceModel, getSelectedVmList(), Random(seed)) while (reader.hasNext()) { val (time, workload) = reader.next() + + if (vmPlacements.isNotEmpty()) { + val vmId = workload.name.replace("VM Workload ", "") + // Check if VM in topology + val clusterName = vmPlacements[vmId] + if (clusterName == null) { + println("Could not find placement data in VM placement file for VM ${vmId}") + continue + } + val machinesInCluster = + hypervisors.filter { (it as SimpleVirtDriver).server.name.contains(clusterName) } + if (machinesInCluster.isEmpty()) { + println("Ignored VM") + continue + } + } + submitted++ delay(max(0, time - simulationContext.clock.millis())) launch { -- cgit v1.2.3 From 18c80d362703f6d96920ed3362dc9c389d723ae9 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 5 May 2020 19:47:41 +0200 Subject: Fix redundant braces --- .../main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opendc/opendc-experiments-sc20/src') diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index 424f411c..a2f609a5 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -259,7 +259,7 @@ fun main(args: Array) { // Check if VM in topology val clusterName = vmPlacements[vmId] if (clusterName == null) { - println("Could not find placement data in VM placement file for VM ${vmId}") + println("Could not find placement data in VM placement file for VM $vmId") continue } val machinesInCluster = -- cgit v1.2.3