diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2025-11-04 21:09:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-04 21:09:38 +0100 |
| commit | 71f63618fb83c8e19ae48d5dc4a6e3927031cc10 (patch) | |
| tree | 6bf4048b1e683bbcac53e162be787e80828e48e2 /opendc-web/opendc-web-runner | |
| parent | 59898b873eabc72719376854770c55e8d8efaa0f (diff) | |
Memory update (#379)
* Updated the memory usage of Tasks. Still in Progress.
* Merged Task and ServiceTask -> Currently not fully working!!!
* Fixed bugs that made the merger between Task and ServiceTask not work well.
* Updated jdk version for Dockerfile
* Removed ServiceFlavor.java and Task.kt
Diffstat (limited to 'opendc-web/opendc-web-runner')
| -rw-r--r-- | opendc-web/opendc-web-runner/Dockerfile | 4 | ||||
| -rw-r--r-- | opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/opendc-web/opendc-web-runner/Dockerfile b/opendc-web/opendc-web-runner/Dockerfile index b3bd0af6..9ec184ee 100644 --- a/opendc-web/opendc-web-runner/Dockerfile +++ b/opendc-web/opendc-web-runner/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:21-slim +FROM eclipse-temurin:21-jdk-jammy MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com> # Obtain (cache) Gradle wrapper @@ -11,7 +11,7 @@ RUN ./gradlew --version COPY ./ /app/ RUN ./gradlew --no-daemon :opendc-web:opendc-web-runner:installDist -FROM openjdk:21-slim +FROM eclipse-temurin:21-jdk-jammy COPY --from=0 /app/opendc-web/opendc-web-runner/build/install /opt/ COPY --from=0 /app/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces \ /opt/opendc/traces diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt index b4c76fdb..83583eab 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt @@ -274,7 +274,7 @@ public class OpenDCRunner( // val vms = workload.resolve(workloadLoader, Random(seed)) val vms = workloadLoader.sampleByLoad(scenario.workload.samplingFraction) - val startTime = vms.minOf { it.submissionTime } + val startTime = vms.minOf { it.submittedAt } provisioner.runSteps( setupComputeService( |