From 71f63618fb83c8e19ae48d5dc4a6e3927031cc10 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Tue, 4 Nov 2025 21:09:38 +0100 Subject: 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 --- opendc-web/opendc-web-runner/Dockerfile | 4 ++-- .../src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 2 +- opendc-web/opendc-web-server/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'opendc-web') 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 # 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( diff --git a/opendc-web/opendc-web-server/Dockerfile b/opendc-web/opendc-web-server/Dockerfile index e6cbaff5..2aee7ddf 100644 --- a/opendc-web/opendc-web-server/Dockerfile +++ b/opendc-web/opendc-web-server/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:21-slim +FROM eclipse-temurin:21-jdk-jammy MAINTAINER OpenDC Maintainers # Obtain (cache) Gradle wrapper @@ -19,7 +19,7 @@ ENV OPENDC_AUTH0_DOCS_CLIENT_ID=$OPENDC_AUTH0_DOCS_CLIENT_ID COPY ./ /app/ RUN ./gradlew --no-daemon :opendc-web:opendc-web-server:quarkusBuild -Dquarkus.profile=docker -FROM openjdk:21-slim +FROM eclipse-temurin:21-jdk-jammy COPY --from=0 /app/opendc-web/opendc-web-server/build/quarkus-app /opt/opendc WORKDIR /opt/opendc CMD java -jar quarkus-run.jar -- cgit v1.2.3