From 3363df4c72a064e590ca98f8e01832cfa4e15a3f Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Tue, 27 Aug 2024 13:48:46 +0200 Subject: Renamed input files and internally server is changed to task (#246) * Updated SimTrace to use a single ArrayDeque instead of three separate lists for deadline, cpuUsage, and coreCount * Renamed input files to tasks.parquet and fragments.parquet. Renamed server to task. OpenDC nows exports tasks.parquet instead of server.parquet --- .../experiments/base/ScenarioIntegrationTest.kt | 24 ++++++++++----------- .../opendc/experiments/base/ScenarioRunnerTest.kt | 4 ++-- .../src/test/resources/model.json | 15 +++++++++++++ .../trace/bitbrains-small/fragments.parquet | Bin 0 -> 2163354 bytes .../resources/trace/bitbrains-small/meta.parquet | Bin 2723 -> 0 bytes .../resources/trace/bitbrains-small/tasks.parquet | Bin 0 -> 2723 bytes .../resources/trace/bitbrains-small/trace.parquet | Bin 2163354 -> 0 bytes 7 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/model.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/meta.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/trace.parquet (limited to 'opendc-experiments/opendc-experiments-base/src/test') diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt index 5ad1ecde..301d507b 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt @@ -110,16 +110,16 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand assertAll( { assertEquals(50, monitor.attemptsSuccess, "The scheduler should schedule 50 VMs") }, - { assertEquals(0, monitor.serversActive, "All VMs should finish after a run") }, + { assertEquals(0, monitor.tasksActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, - { assertEquals(0, monitor.serversPending, "No VM should not be in the queue") }, + { assertEquals(0, monitor.tasksPending, "No VM should not be in the queue") }, { assertEquals(43795971955, monitor.idleTime) { "Incorrect idle time" } }, { assertEquals(2864995687, monitor.activeTime) { "Incorrect active time" } }, { assertEquals(148, monitor.stealTime) { "Incorrect steal time" } }, @@ -156,8 +156,8 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand @@ -197,8 +197,8 @@ class ScenarioIntegrationTest { "Success=${monitor.attemptsSuccess} " + "Failure=${monitor.attemptsFailure} " + "Error=${monitor.attemptsError} " + - "Pending=${monitor.serversPending} " + - "Active=${monitor.serversActive}", + "Pending=${monitor.tasksPending} " + + "Active=${monitor.tasksActive}", ) // Note that these values have been verified beforehand @@ -265,15 +265,15 @@ class ScenarioIntegrationTest { var attemptsSuccess = 0 var attemptsFailure = 0 var attemptsError = 0 - var serversPending = 0 - var serversActive = 0 + var tasksPending = 0 + var tasksActive = 0 override fun record(reader: ServiceTableReader) { attemptsSuccess = reader.attemptsSuccess attemptsFailure = reader.attemptsFailure attemptsError = reader.attemptsError - serversPending = reader.serversPending - serversActive = reader.serversActive + tasksPending = reader.tasksPending + tasksActive = reader.tasksActive } var idleTime = 0L diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt index f10ab310..0b32b8f6 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioRunnerTest.kt @@ -51,7 +51,7 @@ class ScenarioRunnerTest { Topology("topology"), Workload("bitbrains-small", trace("bitbrains-small")), OperationalPhenomena(failureFrequency = 24.0 * 7, hasInterference = true), - "active-servers" + "active-tasks" ) assertDoesNotThrow { runner.runScenario(scenario, seed = 0L) } @@ -70,7 +70,7 @@ class ScenarioRunnerTest { Topology("topology"), Workload("bitbrains-small", trace("bitbrains-small")), OperationalPhenomena(failureFrequency = 24.0 * 7, hasInterference = true), - "active-servers" + "active-tasks" ) assertDoesNotThrow { runner.runScenario(scenario, seed = 0L) } diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/model.json new file mode 100644 index 00000000..91e2657f --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/model.json @@ -0,0 +1,15 @@ +{ + "version": "1.0", + "defaultSchema": "trace", + "schemas": [ + { + "name": "trace", + "type": "custom", + "factory": "org.opendc.trace.calcite.TraceSchemaFactory", + "operand": { + "path": "trace", + "format": "opendc-vm" + } + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet new file mode 100644 index 00000000..9d953956 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/meta.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/meta.parquet deleted file mode 100644 index 9cded35f..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/meta.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet new file mode 100644 index 00000000..9cded35f Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/trace.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/trace.parquet deleted file mode 100644 index 9d953956..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/trace.parquet and /dev/null differ -- cgit v1.2.3