diff options
Diffstat (limited to 'opendc-compute')
17 files changed, 153 insertions, 349 deletions
diff --git a/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Flavor.kt b/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Flavor.kt index a15191c6..581c29ba 100644 --- a/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Flavor.kt +++ b/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Flavor.kt @@ -45,15 +45,15 @@ public interface Flavor : Resource { /** * Set of Tasks that need to be finished before this can startAdd commentMore actions */ - public val dependencies: Set<String> + public val dependencies: Set<Int> /** * Set of Tasks that need to be finished before this can startAdd commentMore actions */ - public val parents: Set<String> + public val parents: Set<Int> /** * Set of Tasks that need to be finished before this can startAdd commentMore actions */ - public val children: Set<String> + public val children: Set<Int> } diff --git a/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Resource.kt b/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Resource.kt index 2c3822a7..ab9d42f3 100644 --- a/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Resource.kt +++ b/opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Resource.kt @@ -22,21 +22,14 @@ package org.opendc.compute.api -import java.util.UUID - /** * A generic resource provided by the OpenDC Compute service. */ public interface Resource { /** - * The unique identifier of the resource. - */ - public val uid: UUID - - /** * The name of the resource. */ - public val name: String + public val taskId: Int /** * The non-identifying metadata attached to the resource. diff --git a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt index 104abdca..197134c4 100644 --- a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt +++ b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt @@ -24,9 +24,9 @@ package org.opendc.compute.carbon import org.opendc.simulator.compute.power.CarbonFragment import org.opendc.trace.Trace -import org.opendc.trace.conv.CARBON_INTENSITY_TIMESTAMP -import org.opendc.trace.conv.CARBON_INTENSITY_VALUE -import org.opendc.trace.conv.TABLE_CARBON_INTENSITIES +import org.opendc.trace.conv.CARBON_INTENSITY +import org.opendc.trace.conv.CARBON_TIMESTAMP +import org.opendc.trace.conv.TABLE_CARBON import java.io.File import java.lang.ref.SoftReference import java.time.Instant @@ -35,7 +35,6 @@ import java.util.concurrent.ConcurrentHashMap /** * A helper class for loading compute workload traces into memory. * - * @param baseDir The directory containing the traces. */ public class CarbonTraceLoader { /** @@ -49,10 +48,10 @@ public class CarbonTraceLoader { * Read the metadata into a workload. */ private fun parseCarbon(trace: Trace): List<CarbonFragment> { - val reader = checkNotNull(trace.getTable(TABLE_CARBON_INTENSITIES)).newReader() + val reader = checkNotNull(trace.getTable(TABLE_CARBON)).newReader() - val startTimeCol = reader.resolve(CARBON_INTENSITY_TIMESTAMP) - val carbonIntensityCol = reader.resolve(CARBON_INTENSITY_VALUE) + val startTimeCol = reader.resolve(CARBON_TIMESTAMP) + val carbonIntensityCol = reader.resolve(CARBON_INTENSITY) try { while (reader.nextRow()) { @@ -75,7 +74,7 @@ public class CarbonTraceLoader { } /** - * Load the trace with the specified [name] and [format]. + * Load the Carbon Trace at the given path. */ public fun get(pathToFile: File): List<CarbonFragment> { val trace = Trace.open(pathToFile, "carbon") @@ -97,7 +96,7 @@ public class CarbonTraceLoader { /** * The total load of the trace. */ - public val fragments: MutableList<CarbonFragment> = mutableListOf() + val fragments: MutableList<CarbonFragment> = mutableListOf() /** * Add a fragment to the trace. diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java index 8b6bef2c..fde83ead 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java +++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java @@ -34,14 +34,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SplittableRandom; -import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.opendc.common.Dispatcher; import org.opendc.common.util.Pacer; import org.opendc.compute.api.Flavor; -import org.opendc.compute.api.Image; import org.opendc.compute.api.TaskState; import org.opendc.compute.simulator.host.HostListener; import org.opendc.compute.simulator.host.HostModel; @@ -82,11 +79,6 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { */ private final Pacer pacer; - /** - * The {@link SplittableRandom} used to generate the unique identifiers for the service resources. - */ - private final SplittableRandom random = new SplittableRandom(0); - private final int maxNumFailures; /** @@ -126,31 +118,21 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { */ private final Map<ServiceTask, SimHost> activeTasks = new HashMap<>(); - /** - * The active tasks in the system. - */ - private final List<String> completedTasks = new ArrayList<>(); + private final List<Integer> completedTasks = new ArrayList<>(); - private final List<String> terminatedTasks = new ArrayList<>(); + private final List<Integer> terminatedTasks = new ArrayList<>(); /** * The registered flavors for this compute service. */ - private final Map<UUID, ServiceFlavor> flavorById = new HashMap<>(); + private final Map<Integer, ServiceFlavor> flavorById = new HashMap<>(); private final List<ServiceFlavor> flavors = new ArrayList<>(); /** - * The registered images for this compute service. - */ - private final Map<UUID, ServiceImage> imageById = new HashMap<>(); - - private final List<ServiceImage> images = new ArrayList<>(); - - /** * The registered tasks for this compute service. */ - private final Map<UUID, ServiceTask> taskById = new HashMap<>(); + private final Map<Integer, ServiceTask> taskById = new HashMap<>(); private final List<ServiceTask> tasksToRemove = new ArrayList<>(); @@ -192,7 +174,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { || newState == TaskState.PAUSED || newState == TaskState.TERMINATED || newState == TaskState.FAILED) { - LOGGER.info("task {} {} {} finished", task.getUid(), task.getName(), task.getFlavor()); + LOGGER.info("task {} {} {} finished", task.getId(), task.getName(), task.getFlavor()); if (activeTasks.remove(task) != null) { tasksActive--; @@ -272,7 +254,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { /** * Return the {@link ServiceTask}s hosted by this service. */ - public Map<UUID, ServiceTask> getTasks() { + public Map<Integer, ServiceTask> getTasks() { return taskById; } @@ -419,11 +401,10 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { } SchedulingRequest schedule(ServiceTask task, boolean atFront) { - LOGGER.debug("Enqueueing task {} to be assigned to host", task.getUid()); + LOGGER.debug("Enqueueing task {} to be assigned to host", task.getId()); if (task.getNumFailures() >= maxNumFailures) { - LOGGER.warn("task {} has been terminated because it failed {} times", (Object) task, (Object) - task.getNumFailures()); + LOGGER.warn("task {} has been terminated because it failed {} times", task, task.getNumFailures()); tasksTerminated++; task.setState(TaskState.TERMINATED); @@ -436,8 +417,8 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { SchedulingRequest request = new SchedulingRequest(task, now); ServiceFlavor flavor = task.getFlavor(); - for (String taskName : this.terminatedTasks) { - if (flavor.isInDependencies(taskName)) { + for (int taskId : this.terminatedTasks) { + if (flavor.isInDependencies(taskId)) { // Terminate task task.setState(TaskState.TERMINATED); } @@ -447,10 +428,10 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { flavor.updatePendingDependencies(this.completedTasks); // If there are still pending dependencies, we cannot schedule the task yet - Set<String> pendingDependencies = flavor.getDependencies(); + Set<Integer> pendingDependencies = flavor.getDependencies(); if (!pendingDependencies.isEmpty()) { // If the task has pending dependencies, we cannot schedule it yet - LOGGER.debug("Task {} has pending dependencies: {}", task.getUid(), pendingDependencies); + LOGGER.debug("Task {} has pending dependencies: {}", task.getId(), pendingDependencies); blockedTasks.add(request); return null; } @@ -466,18 +447,18 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { } void addCompletedTask(ServiceTask task) { - String taskName = task.getName(); + int taskId = task.getId(); - if (!this.completedTasks.contains(taskName)) { - this.completedTasks.add(taskName); + if (!this.completedTasks.contains(taskId)) { + this.completedTasks.add(taskId); } List<SchedulingRequest> requestsToRemove = new ArrayList<>(); for (SchedulingRequest request : blockedTasks) { - request.getTask().getFlavor().updatePendingDependencies(taskName); + request.getTask().getFlavor().updatePendingDependencies(taskId); - Set<String> pendingDependencies = request.getTask().getFlavor().getDependencies(); + Set<Integer> pendingDependencies = request.getTask().getFlavor().getDependencies(); if (pendingDependencies.isEmpty()) { requestsToRemove.add(request); @@ -492,16 +473,16 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { } void addTerminatedTask(ServiceTask task) { - String taskName = task.getName(); + int taskId = task.getId(); List<SchedulingRequest> requestsToRemove = new ArrayList<>(); - if (!this.terminatedTasks.contains(taskName)) { - this.terminatedTasks.add(taskName); + if (!this.terminatedTasks.contains(taskId)) { + this.terminatedTasks.add(taskId); } for (SchedulingRequest request : blockedTasks) { - if (request.getTask().getFlavor().isInDependencies(taskName)) { + if (request.getTask().getFlavor().isInDependencies(taskId)) { requestsToRemove.add(request); request.getTask().setState(TaskState.TERMINATED); } @@ -513,18 +494,13 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { } void delete(ServiceFlavor flavor) { - flavorById.remove(flavor.getUid()); + flavorById.remove(flavor.getTaskId()); flavors.remove(flavor); } - void delete(ServiceImage image) { - imageById.remove(image.getUid()); - images.remove(image); - } - void delete(ServiceTask task) { completedTasks.remove(task); - taskById.remove(task.getUid()); + taskById.remove(task.getId()); } public void updateCarbonIntensity(double newCarbonIntensity) { @@ -675,68 +651,25 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { return new ArrayList<>(service.flavors); } - public Flavor findFlavor(@NotNull UUID id) { - checkOpen(); - - return service.flavorById.get(id); - } - @NotNull public ServiceFlavor newFlavor( - @NotNull String name, + int taskId, int cpuCount, long memorySize, int gpuCoreCount, - @NotNull Set<String> parents, - @NotNull Set<String> children, + @NotNull Set<Integer> parents, + @NotNull Set<Integer> children, @NotNull Map<String, ?> meta) { checkOpen(); final ComputeService service = this.service; - UUID uid = new UUID(service.clock.millis(), service.random.nextLong()); - ServiceFlavor flavor = - new ServiceFlavor(service, uid, name, cpuCount, memorySize, gpuCoreCount, parents, children, meta); - - // service.flavorById.put(uid, flavor); - // service.flavors.add(flavor); - return flavor; - } - - @NotNull - public List<Image> queryImages() { - checkOpen(); - - return new ArrayList<>(service.images); - } - - public Image findImage(@NotNull UUID id) { - checkOpen(); - - return service.imageById.get(id); - } - - public Image newImage(@NotNull String name) { - return newImage(name, Collections.emptyMap(), Collections.emptyMap()); - } - - @NotNull - public Image newImage(@NotNull String name, @NotNull Map<String, String> labels, @NotNull Map<String, ?> meta) { - checkOpen(); - - final ComputeService service = this.service; - UUID uid = new UUID(service.clock.millis(), service.random.nextLong()); - - ServiceImage image = new ServiceImage(service, uid, name, labels, meta); - - service.imageById.put(uid, image); - service.images.add(image); - - return image; + return new ServiceFlavor(service, taskId, cpuCount, memorySize, gpuCoreCount, parents, children, meta); } @NotNull public ServiceTask newTask( + int id, @NotNull String name, @NotNull TaskNature nature, @NotNull Duration duration, @@ -747,15 +680,10 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { checkOpen(); final ComputeService service = this.service; - UUID uid = new UUID(service.clock.millis(), service.random.nextLong()); - - // final ServiceFlavor internalFlavor = - // Objects.requireNonNull(service.flavorById.get(flavor.getUid()), "Unknown flavor"); - // ServiceTask task = new ServiceTask(service, uid, name, internalFlavor, workload, meta); - ServiceTask task = new ServiceTask(service, uid, name, nature, duration, deadline, flavor, workload, meta); + ServiceTask task = new ServiceTask(service, id, name, nature, duration, deadline, flavor, workload, meta); - service.taskById.put(uid, task); + service.taskById.put(id, task); service.tasksTotal++; @@ -765,7 +693,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { } @Nullable - public ServiceTask findTask(@NotNull UUID id) { + public ServiceTask findTask(int id) { checkOpen(); return service.taskById.get(id); } @@ -781,7 +709,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { @Nullable public void rescheduleTask(@NotNull ServiceTask task, @NotNull Workload workload) { - ServiceTask internalTask = findTask(task.getUid()); + ServiceTask internalTask = findTask(task.getId()); // SimHost from = service.lookupHost(internalTask); // from.delete(internalTask); diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceFlavor.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceFlavor.java index bb68d336..6201f21f 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceFlavor.java +++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceFlavor.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.opendc.compute.api.Flavor; @@ -37,29 +36,26 @@ import org.opendc.compute.api.Flavor; */ public final class ServiceFlavor implements Flavor { private final ComputeService service; - private final UUID uid; - private final String name; + private final int taskId; private final int cpuCoreCount; private final long memorySize; private final int gpuCoreCount; - private final Set<String> parents; - private final Set<String> children; - private final Set<String> dependencies; + private final Set<Integer> parents; + private final Set<Integer> children; + private final Set<Integer> dependencies; private final Map<String, ?> meta; ServiceFlavor( ComputeService service, - UUID uid, - String name, + int taskId, int cpuCoreCount, long memorySize, int gpuCoreCount, - Set<String> parents, - Set<String> children, + Set<Integer> parents, + Set<Integer> children, Map<String, ?> meta) { this.service = service; - this.uid = uid; - this.name = name; + this.taskId = taskId; this.cpuCoreCount = cpuCoreCount; this.memorySize = memorySize; this.gpuCoreCount = gpuCoreCount; @@ -84,16 +80,9 @@ public final class ServiceFlavor implements Flavor { return gpuCoreCount; } - @NotNull - @Override - public UUID getUid() { - return uid; - } - - @NotNull @Override - public String getName() { - return name; + public int getTaskId() { + return taskId; } @NotNull @@ -117,45 +106,45 @@ public final class ServiceFlavor implements Flavor { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ServiceFlavor flavor = (ServiceFlavor) o; - return service.equals(flavor.service) && uid.equals(flavor.uid); + return service.equals(flavor.service) && taskId == flavor.taskId; } @Override public int hashCode() { - return Objects.hash(service, uid); + return Objects.hash(service, taskId); } @Override public String toString() { - return "Flavor[uid=" + uid + ",name=" + name + "]"; + return "Flavor[name=" + taskId + "]"; } @Override - public @NotNull Set<String> getDependencies() { + public @NotNull Set<Integer> getDependencies() { return dependencies; } - public void updatePendingDependencies(List<String> completedTasks) { - for (String task : completedTasks) { + public void updatePendingDependencies(List<Integer> completedTasks) { + for (int task : completedTasks) { this.updatePendingDependencies(task); } } - public void updatePendingDependencies(String completedTask) { + public void updatePendingDependencies(int completedTask) { this.dependencies.remove(completedTask); } - public boolean isInDependencies(String task) { + public boolean isInDependencies(int task) { return this.dependencies.contains(task); } @Override - public @NotNull Set<@NotNull String> getParents() { + public @NotNull Set<Integer> getParents() { return parents; } @Override - public @NotNull Set<@NotNull String> getChildren() { + public @NotNull Set<Integer> getChildren() { return children; } } diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceImage.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceImage.java deleted file mode 100644 index dffa4356..00000000 --- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceImage.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2022 AtLarge Research - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package org.opendc.compute.simulator.service; - -import java.util.Collections; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; -import org.jetbrains.annotations.NotNull; -import org.opendc.compute.api.Image; - -/** - * Implementation of {@link Image} provided by {@link ComputeService}. - */ -public final class ServiceImage implements Image { - private final ComputeService service; - private final UUID uid; - private final String name; - private final Map<String, String> labels; - private final Map<String, ?> meta; - - ServiceImage(ComputeService service, UUID uid, String name, Map<String, String> labels, Map<String, ?> meta) { - this.service = service; - this.uid = uid; - this.name = name; - this.labels = labels; - this.meta = meta; - } - - @NotNull - @Override - public UUID getUid() { - return uid; - } - - @NotNull - @Override - public String getName() { - return name; - } - - @NotNull - @Override - public Map<String, Object> getMeta() { - return Collections.unmodifiableMap(meta); - } - - @Override - public void reload() { - // No-op: this object is the source-of-truth - } - - @Override - public void delete() { - service.delete(this); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ServiceImage image = (ServiceImage) o; - return service.equals(image.service) && uid.equals(image.uid); - } - - @Override - public int hashCode() { - return Objects.hash(service, uid); - } - - @Override - public String toString() { - return "Image[uid=" + uid + ",name=" + name + "]"; - } -} diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java index 281f75ca..57bbb7c3 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java +++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.opendc.compute.api.TaskState; @@ -47,7 +46,7 @@ public class ServiceTask { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceTask.class); private final ComputeService service; - private final UUID uid; + private final int id; private final String name; private final TaskNature nature; @@ -73,7 +72,7 @@ public class ServiceTask { ServiceTask( ComputeService service, - UUID uid, + int id, String name, TaskNature nature, Duration duration, @@ -82,7 +81,7 @@ public class ServiceTask { Workload workload, Map<String, ?> meta) { this.service = service; - this.uid = uid; + this.id = id; this.name = name; this.nature = nature; this.duration = duration; @@ -94,9 +93,8 @@ public class ServiceTask { this.submittedAt = this.service.getClock().instant(); } - @NotNull - public UUID getUid() { - return uid; + public int getId() { + return id; } @NotNull @@ -191,18 +189,18 @@ public class ServiceTask { LOGGER.warn("User tried to start deleted task"); throw new IllegalStateException("Task is deleted"); case CREATED: - LOGGER.info("User requested to start task {}", uid); + LOGGER.info("User requested to start task {}", id); setState(TaskState.PROVISIONING); assert request == null : "Scheduling request already active"; request = service.schedule(this); break; case PAUSED: - LOGGER.info("User requested to start task after pause {}", uid); + LOGGER.info("User requested to start task after pause {}", id); setState(TaskState.PROVISIONING); request = service.schedule(this, true); break; case FAILED: - LOGGER.info("User requested to start task after failure {}", uid); + LOGGER.info("User requested to start task after failure {}", id); setState(TaskState.PROVISIONING); request = service.schedule(this, true); break; @@ -235,15 +233,15 @@ public class ServiceTask { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ServiceTask task = (ServiceTask) o; - return service.equals(task.service) && uid.equals(task.uid); + return service.equals(task.service) && id == task.id; } public int hashCode() { - return Objects.hash(service, uid); + return Objects.hash(service, id); } public String toString() { - return "Task[uid=" + uid + ",name=" + name + ",state=" + state + "]"; + return "Task[uid=" + id + ",name=" + name + ",state=" + state + "]"; } void setState(TaskState newState) { diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt index 40de94bb..ed0c5226 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt @@ -73,7 +73,7 @@ public class Guest( public fun start() { when (state) { TaskState.CREATED, TaskState.FAILED, TaskState.PAUSED -> { - LOGGER.info { "User requested to start task ${task.uid}" } + LOGGER.info { "User requested to start task ${task.id}" } doStart() } TaskState.RUNNING -> return diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/HostsProvisioningStep.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/HostsProvisioningStep.kt index ced38480..7a0d5d65 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/HostsProvisioningStep.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/HostsProvisioningStep.kt @@ -22,6 +22,7 @@ package org.opendc.compute.simulator.provisioner +import org.opendc.common.ResourceType import org.opendc.compute.carbon.getCarbonFragments import org.opendc.compute.simulator.host.SimHost import org.opendc.compute.simulator.service.ComputeService @@ -119,11 +120,11 @@ public class HostsProvisioningStep internal constructor( carbonModel?.addReceiver(batteryPolicy) - FlowEdge(hostDistributor, batteryAggregator) + FlowEdge(hostDistributor, batteryAggregator, ResourceType.POWER) service.addBattery(battery) } else { - FlowEdge(hostDistributor, simPowerSource) + FlowEdge(hostDistributor, simPowerSource, ResourceType.POWER) } // Create hosts, they are connected to the powerMux when SimMachine is created diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/DifferentHostFilter.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/DifferentHostFilter.kt index 279a2717..bc98a575 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/DifferentHostFilter.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/DifferentHostFilter.kt @@ -24,7 +24,6 @@ package org.opendc.compute.simulator.scheduler.filters import org.opendc.compute.simulator.service.HostView import org.opendc.compute.simulator.service.ServiceTask -import java.util.UUID /** * A [HostFilter] that ensures an instance is scheduled on a different host from a set of instances. @@ -35,7 +34,7 @@ public class DifferentHostFilter : HostFilter { task: ServiceTask, ): Boolean { @Suppress("UNCHECKED_CAST") - val affinityUUIDs = task.meta["scheduler_hint:different_host"] as? Set<UUID> ?: return true - return host.host.getInstances().none { it.uid in affinityUUIDs } + val affinityIDs = task.meta["scheduler_hint:different_host"] as? Set<Int> ?: return true + return host.host.getInstances().none { it.id in affinityIDs } } } diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/SameHostFilter.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/SameHostFilter.kt index 761b125d..73fd0d3c 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/SameHostFilter.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/filters/SameHostFilter.kt @@ -24,7 +24,6 @@ package org.opendc.compute.simulator.scheduler.filters import org.opendc.compute.simulator.service.HostView import org.opendc.compute.simulator.service.ServiceTask -import java.util.UUID /** * A [HostFilter] that ensures an instance is scheduled on the same host as all other instances in a set of instances. @@ -35,7 +34,7 @@ public class SameHostFilter : HostFilter { task: ServiceTask, ): Boolean { @Suppress("UNCHECKED_CAST") - val affinityUUIDs = task.meta["scheduler_hint:same_host"] as? Set<UUID> ?: return true - return host.host.getInstances().any { it.uid in affinityUUIDs } + val affinityIDs = task.meta["scheduler_hint:same_host"] as? Set<Int> ?: return true + return host.host.getInstances().any { it.id in affinityIDs } } } diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/parquet/DfltTaskExportColumns.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/parquet/DfltTaskExportColumns.kt index 07750114..0397b9a1 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/parquet/DfltTaskExportColumns.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/parquet/DfltTaskExportColumns.kt @@ -61,10 +61,9 @@ public object DfltTaskExportColumns { public val TASK_ID: ExportColumn<TaskTableReader> = ExportColumn( field = - Types.required(BINARY) - .`as`(LogicalTypeAnnotation.stringType()) + Types.required(INT32) .named("task_id"), - ) { Binary.fromString(it.taskInfo.id) } + ) { it.taskInfo.id } public val TASK_NAME: ExportColumn<TaskTableReader> = ExportColumn( diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskInfo.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskInfo.kt index c1a14613..2727847f 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskInfo.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskInfo.kt @@ -26,7 +26,7 @@ package org.opendc.compute.simulator.telemetry.table.task * Static information about a task exposed to the telemetry service. */ public data class TaskInfo( - val id: String, + val id: Int, val name: String, val type: String, val arch: String, diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReaderImpl.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReaderImpl.kt index ce62fdb0..3183cf11 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReaderImpl.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReaderImpl.kt @@ -89,7 +89,7 @@ public class TaskTableReaderImpl( */ override val taskInfo: TaskInfo = TaskInfo( - task.uid.toString(), + task.id, task.name, "vm", "x86", diff --git a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/scheduler/FilterSchedulerTest.kt b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/scheduler/FilterSchedulerTest.kt index 5109f828..fe5cea70 100644 --- a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/scheduler/FilterSchedulerTest.kt +++ b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/scheduler/FilterSchedulerTest.kt @@ -44,7 +44,6 @@ import org.opendc.compute.simulator.scheduler.weights.VCpuWeigher import org.opendc.compute.simulator.service.HostView import org.opendc.compute.simulator.service.ServiceTask import java.util.Random -import java.util.UUID /** * Test suite for the [FilterScheduler]. @@ -362,7 +361,7 @@ internal class FilterSchedulerTest { every { reqA.task.flavor.memorySize } returns 1024 every { reqA.isCancelled } returns false val taskA = mockk<ServiceTask>() - every { taskA.uid } returns UUID.randomUUID() + every { taskA.id } returns Random().nextInt(1, Int.MAX_VALUE) every { reqA.task } returns taskA val hostA = mockk<HostView>() @@ -388,7 +387,7 @@ internal class FilterSchedulerTest { assertEquals(hostA, scheduler.select(mutableListOf(reqB).iterator()).host) - every { reqB.task.meta } returns mapOf("scheduler_hint:same_host" to setOf(reqA.task.uid)) + every { reqB.task.meta } returns mapOf("scheduler_hint:same_host" to setOf(reqA.task.id)) assertEquals(hostB, scheduler.select(mutableListOf(reqB).iterator()).host) } @@ -406,7 +405,7 @@ internal class FilterSchedulerTest { every { reqA.task.flavor.memorySize } returns 1024 every { reqA.isCancelled } returns false val taskA = mockk<ServiceTask>() - every { taskA.uid } returns UUID.randomUUID() + every { taskA.id } returns Random().nextInt(1, Int.MAX_VALUE) every { reqA.task } returns taskA val hostA = mockk<HostView>() @@ -432,7 +431,7 @@ internal class FilterSchedulerTest { assertEquals(hostA, scheduler.select(mutableListOf(reqB).iterator()).host) - every { reqB.task.meta } returns mapOf("scheduler_hint:different_host" to setOf(taskA.uid)) + every { reqB.task.meta } returns mapOf("scheduler_hint:different_host" to setOf(taskA.id)) assertEquals(hostB, scheduler.select(mutableListOf(reqB).iterator()).host) } diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt index 3a0ee3e0..5db2b43b 100644 --- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt +++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt @@ -27,27 +27,27 @@ import org.opendc.simulator.compute.workload.trace.TraceWorkload import org.opendc.simulator.compute.workload.trace.scaling.NoDelayScaling import org.opendc.simulator.compute.workload.trace.scaling.ScalingPolicy import org.opendc.trace.Trace -import org.opendc.trace.conv.TABLE_RESOURCES -import org.opendc.trace.conv.TABLE_RESOURCE_STATES -import org.opendc.trace.conv.resourceChildren -import org.opendc.trace.conv.resourceCpuCapacity -import org.opendc.trace.conv.resourceCpuCount -import org.opendc.trace.conv.resourceDeadline -import org.opendc.trace.conv.resourceDuration -import org.opendc.trace.conv.resourceGpuCapacity -import org.opendc.trace.conv.resourceGpuCount -import org.opendc.trace.conv.resourceID -import org.opendc.trace.conv.resourceMemCapacity -import org.opendc.trace.conv.resourceNature -import org.opendc.trace.conv.resourceParents -import org.opendc.trace.conv.resourceStateCpuUsage -import org.opendc.trace.conv.resourceStateDuration -import org.opendc.trace.conv.resourceStateGpuUsage -import org.opendc.trace.conv.resourceSubmissionTime +import org.opendc.trace.conv.FRAGMENT_CPU_USAGE +import org.opendc.trace.conv.FRAGMENT_DURATION +import org.opendc.trace.conv.FRAGMENT_GPU_USAGE +import org.opendc.trace.conv.TABLE_FRAGMENTS +import org.opendc.trace.conv.TABLE_TASKS +import org.opendc.trace.conv.TASK_CHILDREN +import org.opendc.trace.conv.TASK_CPU_CAPACITY +import org.opendc.trace.conv.TASK_CPU_COUNT +import org.opendc.trace.conv.TASK_DEADLINE +import org.opendc.trace.conv.TASK_DURATION +import org.opendc.trace.conv.TASK_GPU_CAPACITY +import org.opendc.trace.conv.TASK_GPU_COUNT +import org.opendc.trace.conv.TASK_ID +import org.opendc.trace.conv.TASK_MEM_CAPACITY +import org.opendc.trace.conv.TASK_NAME +import org.opendc.trace.conv.TASK_NATURE +import org.opendc.trace.conv.TASK_PARENTS +import org.opendc.trace.conv.TASK_SUBMISSION_TIME import java.io.File import java.lang.ref.SoftReference import java.time.Duration -import java.util.UUID import java.util.concurrent.ConcurrentHashMap import kotlin.math.roundToLong @@ -77,23 +77,20 @@ public class ComputeWorkloadLoader( /** * Read the fragments into memory. */ - private fun parseFragments(trace: Trace): Map<String, Builder> { - val reader = checkNotNull(trace.getTable(TABLE_RESOURCE_STATES)).newReader() + private fun parseFragments(trace: Trace): Map<Int, Builder> { + val reader = checkNotNull(trace.getTable(TABLE_FRAGMENTS)).newReader() - val idCol = reader.resolve(resourceID) - val durationCol = reader.resolve(resourceStateDuration) - val coresCol = reader.resolve(resourceCpuCount) - val usageCol = reader.resolve(resourceStateCpuUsage) - val gpuCoresCol = reader.resolve(resourceGpuCount) - val resourceGpuCapacityCol = reader.resolve(resourceStateGpuUsage) + val idCol = reader.resolve(TASK_ID) + val durationCol = reader.resolve(FRAGMENT_DURATION) + val usageCol = reader.resolve(FRAGMENT_CPU_USAGE) + val resourceGpuCapacityCol = reader.resolve(FRAGMENT_GPU_USAGE) - val fragments = mutableMapOf<String, Builder>() + val fragments = mutableMapOf<Int, Builder>() return try { while (reader.nextRow()) { - val id = reader.getString(idCol)!! + val id = reader.getInt(idCol) val durationMs = reader.getDuration(durationCol)!! - val cores = reader.getInt(coresCol) val cpuUsage = reader.getDouble(usageCol) val gpuUsage = if (reader.getDouble( @@ -104,14 +101,13 @@ public class ComputeWorkloadLoader( } else { reader.getDouble(resourceGpuCapacityCol) // Default to 0 if not present } - val gpuCores = reader.getInt(gpuCoresCol) // Default to 0 if not present - val gpuMemory = 0L // Default to 0 if not present + val gpuMemory = 0 // Default to 0 if not present val builder = fragments.computeIfAbsent( id, ) { Builder(checkpointInterval, checkpointDuration, checkpointIntervalScaling, scalingPolicy, id) } - builder.add(durationMs, cpuUsage, cores, gpuUsage, gpuCores, gpuMemory) + builder.add(durationMs, cpuUsage, gpuUsage, gpuMemory) } fragments @@ -125,29 +121,35 @@ public class ComputeWorkloadLoader( */ private fun parseMeta( trace: Trace, - fragments: Map<String, Builder>, + fragments: Map<Int, Builder>, ): List<Task> { - val reader = checkNotNull(trace.getTable(TABLE_RESOURCES)).newReader() + val reader = checkNotNull(trace.getTable(TABLE_TASKS)).newReader() - val idCol = reader.resolve(resourceID) - val submissionTimeCol = reader.resolve(resourceSubmissionTime) - val durationCol = reader.resolve(resourceDuration) - val cpuCountCol = reader.resolve(resourceCpuCount) - val cpuCapacityCol = reader.resolve(resourceCpuCapacity) - val memCol = reader.resolve(resourceMemCapacity) - val gpuCapacityCol = reader.resolve(resourceGpuCapacity) // Assuming GPU capacity is also present - val gpuCoreCountCol = reader.resolve(resourceGpuCount) // Assuming GPU cores are also present - val parentsCol = reader.resolve(resourceParents) - val childrenCol = reader.resolve(resourceChildren) - val natureCol = reader.resolve(resourceNature) - val deadlineCol = reader.resolve(resourceDeadline) + val idCol = reader.resolve(TASK_ID) + val idName = reader.resolve(TASK_NAME) + val submissionTimeCol = reader.resolve(TASK_SUBMISSION_TIME) + val durationCol = reader.resolve(TASK_DURATION) + val cpuCountCol = reader.resolve(TASK_CPU_COUNT) + val cpuCapacityCol = reader.resolve(TASK_CPU_CAPACITY) + val memCol = reader.resolve(TASK_MEM_CAPACITY) + val gpuCapacityCol = reader.resolve(TASK_GPU_CAPACITY) // Assuming GPU capacity is also present + val gpuCoreCountCol = reader.resolve(TASK_GPU_COUNT) // Assuming GPU cores are also present + val parentsCol = reader.resolve(TASK_PARENTS) + val childrenCol = reader.resolve(TASK_CHILDREN) + val natureCol = reader.resolve(TASK_NATURE) + val deadlineCol = reader.resolve(TASK_DEADLINE) - var counter = 0 val entries = mutableListOf<Task>() return try { while (reader.nextRow()) { - val id = reader.getString(idCol)!! + val id = reader.getInt(idCol) + var name = reader.getString(idName) + + if (name == null) { + name = id.toString() + } + if (!fragments.containsKey(id)) { continue } @@ -169,10 +171,9 @@ public class ComputeWorkloadLoader( val gpuCoreCount = reader.getInt(gpuCoreCountCol) // Default to 0 if not present val gpuMemory = 0L // currently not implemented - val parents = reader.getSet(parentsCol, String::class.java) // No dependencies in the trace - val children = reader.getSet(childrenCol, String::class.java) // No dependencies in the trace + val parents = reader.getSet(parentsCol, Int::class.java) // No dependencies in the trace + val children = reader.getSet(childrenCol, Int::class.java) // No dependencies in the trace - val uid = UUID.nameUUIDFromBytes("$id-${counter++}".toByteArray()) var nature = reader.getString(natureCol) var deadline = reader.getLong(deadlineCol) if (deferAll) { @@ -185,8 +186,8 @@ public class ComputeWorkloadLoader( entries.add( Task( - uid, id, + name, submissionTime, duration, parents!!, @@ -221,7 +222,7 @@ public class ComputeWorkloadLoader( * Load the trace at the specified [pathToFile]. */ override fun load(): List<Task> { - val trace = Trace.open(pathToFile, "opendc-vm") + val trace = Trace.open(pathToFile, "workload") val fragments = parseFragments(trace) val vms = parseMeta(trace, fragments) @@ -243,7 +244,7 @@ public class ComputeWorkloadLoader( checkpointDuration: Long, checkpointIntervalScaling: Double, scalingPolicy: ScalingPolicy, - taskName: String, + taskId: Int, ) { /** * The total load of the trace. @@ -259,7 +260,7 @@ public class ComputeWorkloadLoader( checkpointDuration, checkpointIntervalScaling, scalingPolicy, - taskName, + taskId, ) /** @@ -267,22 +268,18 @@ public class ComputeWorkloadLoader( * * @param duration The duration of the fragment (in epoch millis). * @param cpuUsage CPU usage of this fragment. - * @param cpuCores Number of cores used. * @param gpuUsage GPU usage of this fragment. - * @param gpuCores Number of GPU cores used. * @param gpuMemoryUsage GPU memory usage of this fragment. */ fun add( duration: Duration, cpuUsage: Double, - cpuCores: Int, gpuUsage: Double = 0.0, - gpuCores: Int = 0, - gpuMemoryUsage: Long = 0, + gpuMemoryUsage: Int = 0, ) { totalLoad += ((cpuUsage * duration.toMillis()) + (gpuUsage * duration.toMillis())) / 1000 // avg MHz * duration = MFLOPs - builder.add(duration.toMillis(), cpuUsage, cpuCores, gpuUsage, gpuCores, gpuMemoryUsage) + builder.add(duration.toMillis(), cpuUsage, gpuUsage, gpuMemoryUsage) } /** diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/Task.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/Task.kt index b1ba4545..c875b8a2 100644 --- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/Task.kt +++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/Task.kt @@ -23,27 +23,25 @@ package org.opendc.compute.workload import org.opendc.simulator.compute.workload.trace.TraceWorkload -import java.util.UUID /** * A virtual machine workload. * - * @param uid The unique identifier of the virtual machine. + * @param id The unique identifier of the virtual machine. * @param name The name of the virtual machine. * @param cpuCapacity The required CPU capacity for the VM in MHz. * @param cpuCount The number of vCPUs in the VM. * @param memCapacity The provisioned memory for the VM in MB. * @param submissionTime The start time of the VM. * @param trace The trace that belong to this VM. - * @param interferenceProfile The interference profile of this virtual machine. */ public data class Task( - val uid: UUID, + val id: Int, val name: String, var submissionTime: Long, val duration: Long, - val parents: Set<String> = emptySet(), - val children: Set<String> = emptySet(), + val parents: Set<Int> = emptySet(), + val children: Set<Int> = emptySet(), val cpuCount: Int, val cpuCapacity: Double, val totalCpuLoad: Double, |