diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2025-06-20 16:07:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-20 16:07:27 +0200 |
| commit | 8f846655347195bf6f22a4a102aa06f0ab127da1 (patch) | |
| tree | c6a9cb7cdeac9d655ef2ac27a5f7d7572ca810bb /opendc-compute/opendc-compute-simulator/src/main/kotlin | |
| parent | 0df3d9ced743ac3385dd710c7133a6cf369b051c (diff) | |
Task now saves the hostName of connected host, until a new Host is selected. (#347)
Diffstat (limited to 'opendc-compute/opendc-compute-simulator/src/main/kotlin')
3 files changed, 11 insertions, 2 deletions
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 f862a843..f533eb1f 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 @@ -81,10 +81,10 @@ public object DfltTaskExportColumns { .`as`(LogicalTypeAnnotation.stringType()) .named("host_name"), ) { - if (it.hostInfo == null) { + if (it.hostName == null) { return@ExportColumn Binary.fromString("") } - return@ExportColumn Binary.fromString(it.hostInfo!!.name) + return@ExportColumn Binary.fromString(it.hostName) } public val MEM_CAPACITY: ExportColumn<TaskTableReader> = diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReader.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReader.kt index 8861eabb..b0745dd6 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReader.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/table/task/TaskTableReader.kt @@ -60,6 +60,8 @@ public interface TaskTableReader : Exportable { */ public val hostInfo: HostInfo? + public val hostName: String? + /** * The uptime of the host since last time in ms. */ 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 f6a52759..d63202a9 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 @@ -52,6 +52,7 @@ public class TaskTableReaderImpl( override fun setValues(table: TaskTableReader) { hostInfo = table.hostInfo + _hostName = table.hostName _timestamp = table.timestamp _timestampAbsolute = table.timestampAbsolute @@ -93,6 +94,10 @@ public class TaskTableReaderImpl( override var hostInfo: HostInfo? = null private var simHost: SimHost? = null + private var _hostName: String? = null + override val hostName: String? + get() = _hostName + private var _timestamp = Instant.MIN override val timestamp: Instant get() = _timestamp @@ -188,6 +193,8 @@ public class TaskTableReaderImpl( val cpuStats = simHost?.getCpuStats(task) val sysStats = simHost?.getSystemStats(task) + _hostName = task.hostName + _timestamp = now _timestampAbsolute = now + startTime |