diff options
| -rw-r--r-- | docker-compose.override.yml | 10 | ||||
| -rw-r--r-- | docker-compose.yml | 26 | ||||
| -rw-r--r-- | opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 10 |
3 files changed, 41 insertions, 5 deletions
diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d5b8e786..933e3ecb 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -13,6 +13,16 @@ services: environment: SENTRY_ENVIRONMENT: "development" + runner: + build: + context: . + dockerfile: opendc-web/opendc-web-runner/Dockerfile + environment: + JAVA_TOOL_OPTIONS: >- + -Dlog4j2.rootLogger.level=DEBUG + -Dlog4j2.logger.org.opendc.level=DEBUG + -Dlog4j2.logger.org.opendc.web.client.level=TRACE + postgres: ports: - "5432:5432" diff --git a/docker-compose.yml b/docker-compose.yml index 0169cad9..55c880f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,32 @@ services: volumes: - postgres:/var/lib/postgresql/data + runner: + image: ghcr.io/atlarge-research/opendc:2.4k + restart: on-failure + networks: + - backend + depends_on: + - postgres + volumes: + - type: bind + source: ./traces + target: /opt/opendc/traces + environment: + OPENDC_API_URL: http://server:8080/api + OPENDC_DB_USERNAME: ${OPENDC_DB_USERNAME:?No database username specified} + OPENDC_DB_PASSWORD: ${OPENDC_DB_PASSWORD:?No database password specified} + OPENDC_DB_URL: jdbc:postgresql://postgres:5432/opendc + AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE} + AUTH0_CLIENT_ID: ${OPENDC_RUNNER_AUTH0_CLIENT_ID} + AUTH0_DOMAIN: ${OPENDC_RUNNER_AUTH0_DOMAIN} + AUTH0_CLIENT_SECRET: ${OPENDC_RUNNER_AUTH0_CLIENT_SECRET} + SENTRY_DSN: ${OPENDC_SERVER_SENTRY_DSN-} + JAVA_TOOL_OPTIONS: >- + -Dlog4j2.rootLogger.level=DEBUG + -Dlog4j2.logger.org.opendc.level=DEBUG + -Dlog4j2.logger.org.opendc.web.client.level=TRACE + volumes: postgres: 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 d41400e3..33f8c94d 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 @@ -268,12 +268,12 @@ public class OpenDCRunner( val topology = listOf(ClusterSpec("cluster", topologyHosts, powerSourceSpec)) Provisioner(dispatcher, seed).use { provisioner -> + // Create a trace-specific workload loader + val traceId = scenario.workload.trace.id + val traceSpecificPath = tracePath.resolve(traceId) + val traceLoader = ComputeWorkloadLoader(traceSpecificPath) -// val workload = -// trace(scenario.workload.trace.id).sampleByLoad(scenario.workload.samplingFraction) -// val vms = workload.resolve(workloadLoader, Random(seed)) - - val vms = workloadLoader.sampleByLoad(scenario.workload.samplingFraction) + val vms = traceLoader.sampleByLoad(scenario.workload.samplingFraction) val startTime = vms.minOf { it.submittedAt } logger.debug { "Using scheduler: '${scenario.schedulerName}' for scenario ${scenario.id}" } |