Made changes based on feedback from PR

atlarge-research · Aug 10, 2024 · a46ea88 · a46ea88
1 parent a2c3c3f
commit a46ea88
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 123 deletions.
diff --git a/...te-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostSystemStats.java b/...te-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostSystemStats.java
@@ -44,7 +44,7 @@ public record HostSystemStats(
         Instant bootTime,
         double powerDraw,
         double energyUsage,
-        double temperatureC,
+        double cpuTemperature,
         int guestsTerminated,
         int guestsRunning,
         int guestsError,

diff --git a/...-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt b/...-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
@@ -237,7 +237,7 @@ public class SimHost(
             localBootTime,
             machine.psu.powerDraw,
             machine.psu.energyUsage,
-            machine.psu.temperature,
+            machine.psu.cpuTemperature,
             terminated,
             running,
             error,

diff --git a/...ndc-compute-telemetry/src/main/kotlin/org/opendc/compute/telemetry/ComputeMetricReader.kt b/...ndc-compute-telemetry/src/main/kotlin/org/opendc/compute/telemetry/ComputeMetricReader.kt
@@ -247,7 +247,7 @@ public class ComputeMetricReader(
             _cpuLostTime = table.cpuLostTime
             _powerDraw = table.powerDraw
             _energyUsage = table.energyUsage
-            _temperature = table.temperature
+            _cpuTemperature = table.cpuTemperature
             _carbonIntensity = table.carbonIntensity
             _carbonEmission = table.carbonEmission
             _uptime = table.uptime
@@ -329,9 +329,9 @@ public class ComputeMetricReader(
         private var _energyUsage = 0.0
         private var previousPowerTotal = 0.0
 
-        override val temperature: Double
-            get() = _temperature
-        private var _temperature = 0.0
+        override val cpuTemperature: Double
+            get() = _cpuTemperature
+        private var _cpuTemperature = 0.0
 
         override val carbonIntensity: Double
             get() = _carbonIntensity
@@ -383,7 +383,7 @@ public class ComputeMetricReader(
             _cpuLostTime = hostCpuStats.lostTime
             _powerDraw = hostSysStats.powerDraw
             _energyUsage = hostSysStats.energyUsage
-            _temperature = hostSysStats.temperatureC
+            _cpuTemperature = hostSysStats.cpuTemperature
             _carbonIntensity = carbonTrace.getCarbonIntensity(timestampAbsolute)
 
             _carbonEmission = carbonIntensity * (energyUsage / 3600000.0) // convert energy usage from J to kWh
@@ -418,7 +418,7 @@ public class ComputeMetricReader(
 
             _powerDraw = 0.0
             _energyUsage = 0.0
-            _temperature = 0.0
+            _cpuTemperature = 0.0
             _carbonIntensity = 0.0
             _carbonEmission = 0.0
         }

diff --git a/...etry/src/main/kotlin/org/opendc/compute/telemetry/export/parquet/ParquetHostDataWriter.kt b/...etry/src/main/kotlin/org/opendc/compute/telemetry/export/parquet/ParquetHostDataWriter.kt
@@ -152,9 +152,9 @@ public class ParquetHostDataWriter(path: File, bufferSize: Int) :
             consumer.addDouble(data.energyUsage)
             consumer.endField("energy_usage", 19)
 
-            consumer.startField("temperature_C", 20)
-            consumer.addDouble(data.temperature)
-            consumer.endField("temperature_C", 20)
+            consumer.startField("cpuTemperature", 20)
+            consumer.addDouble(data.cpuTemperature)
+            consumer.endField("cpuTemperature", 20)
 
             consumer.startField("carbon_intensity", 21)
             consumer.addDouble(data.carbonIntensity)
@@ -262,7 +262,7 @@ public class ParquetHostDataWriter(path: File, bufferSize: Int) :
                         .named("energy_usage"),
                     Types
                         .required(PrimitiveType.PrimitiveTypeName.DOUBLE)
-                        .named("temperature_C"),
+                        .named("cpuTemperature"),
                     Types
                         .required(PrimitiveType.PrimitiveTypeName.DOUBLE)
                         .named("carbon_intensity"),

diff --git a/...c-compute-telemetry/src/main/kotlin/org/opendc/compute/telemetry/table/HostTableReader.kt b/...c-compute-telemetry/src/main/kotlin/org/opendc/compute/telemetry/table/HostTableReader.kt
@@ -120,7 +120,7 @@ public interface HostTableReader {
     /**
      * The current temperature of the host in degrees Celsius.
      */
-    public val temperature: Double
+    public val cpuTemperature: Double
 
     /**
      * The current carbon intensity of the host in gCO2 / kW.

diff --git a/...pendc-compute-topology/src/main/kotlin/org/opendc/compute/topology/specs/TopologySpecs.kt b/...pendc-compute-topology/src/main/kotlin/org/opendc/compute/topology/specs/TopologySpecs.kt
@@ -58,6 +58,7 @@ public data class ClusterSpec(
  * @param memory The amount of RAM memory available in Byte
  * @param powerModel The power model used to determine the power draw of a host
  * @param count The power model used to determine the power draw of a host
+ * @param thermalModel The thermal model used to determine the temperature of a host - defaults to Intel Xeon Platinum 8160
  */
 @Serializable
 public data class HostJSONSpec(

diff --git a/opendc-experiments/opendc-experiments-scenario/build.gradle.kts b/opendc-experiments/opendc-experiments-scenario/build.gradle.kts
diff --git a/...simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/SimPsu.java b/...simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/SimPsu.java
@@ -48,7 +48,7 @@ public abstract class SimPsu extends SimPowerInlet {
     /**
      * Return the temperature of the Host in degrees Celsius based on a power equation.
      */
-    public abstract double getTemperature();
+    public abstract double getCpuTemperature();
 
     /**
      * Set the temperature of the Host in degrees Celsius based on a power equation.

diff --git a/.../opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/SimPsuFactories.java b/.../opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/SimPsuFactories.java
@@ -93,7 +93,7 @@ public double getEnergyUsage() {
         }
 
         @Override
-        public double getTemperature() {
+        public double getCpuTemperature() {
             return 0;
         }
 
@@ -182,7 +182,7 @@ public void setTemperature() {
         }
 
         @Override
-        public double getTemperature() {
+        public double getCpuTemperature() {
             return machineTemp;
         }
 

diff --git a/...lator-compute/src/main/java/org/opendc/simulator/compute/thermal/ThermalModelFactories.kt b/...lator-compute/src/main/java/org/opendc/simulator/compute/thermal/ThermalModelFactories.kt
@@ -22,6 +22,19 @@
 
 package org.opendc.simulator.compute.thermal
 
+// FIXME: This currently only works for RC models, we need to generalize this to support more models.
+
+/**
+ * A factory for creating thermal models.
+ * @param modelType The type of the thermal model to create.
+ * @param rHS The thermal resistance between the heat source and the heat sink.
+ * @param rCase The thermal resistance between the heat sink and the ambient.
+ * @param minLeakageCurrent The minimum leakage current of the heat source.
+ * @param maxLeakageCurrent The maximum leakage current of the heat source.
+ * @param supplyVoltage The supply voltage of the heat source.
+ * @param ambientTemperature The ambient temperature of the heat source.
+ * @return The thermal model.
+ */
 public fun getThermalModel(
     modelType: String,
     rHS: Double,
@@ -42,10 +55,13 @@ public fun getThermalModel(
                 ambientTemperature,
             )
 
-        else -> throw IllegalArgumentException("Unknown power modelType $modelType")
+        else -> throw IllegalArgumentException("Unknown thermal modelType $modelType")
     }
 }
 
+/**
+ * The default factory for creating RC thermal model using the values from an Intel Xeon Platinum 8160.
+ */
 public fun getThermalModel(modelType: String): ThermalModel {
     return when (modelType) {
         "rcmodel" ->
@@ -57,9 +73,7 @@ public fun getThermalModel(modelType: String): ThermalModel {
                 1.8,
                 22.0,
             )
-        "manufacturerModel" ->
-            ThermalModels.manufacturerModel(0.278, 47.0)
 
-        else -> throw IllegalArgumentException("Unknown power modelType $modelType")
+        else -> throw IllegalArgumentException("Unknown thermal modelType $modelType")
     }
 }
diff --git a/...c-simulator-compute/src/main/java/org/opendc/simulator/compute/thermal/ThermalModels.java b/...c-simulator-compute/src/main/java/org/opendc/simulator/compute/thermal/ThermalModels.java
@@ -25,7 +25,12 @@
 public class ThermalModels {
 
     public static ThermalModel rcmodel(
-            double rHS, double rCase, double minLeakageCurrent, double maxLeakageCurrent, double supplyVoltage, double ambientTemperature) {
+            double rHS,
+            double rCase,
+            double minLeakageCurrent,
+            double maxLeakageCurrent,
+            double supplyVoltage,
+            double ambientTemperature) {
         return new RCModel(rHS, rCase, minLeakageCurrent, maxLeakageCurrent, supplyVoltage, ambientTemperature);
     }
 
@@ -61,8 +66,8 @@ private RCModel(
 
         private void setStaticPower(double dynamicPower, double minPower, double maxPower) {
             currentStaticPower =
-                ((maxLeakageCurrent - minLeakageCurrent) / (maxPower - minPower) * (dynamicPower - minPower))
-                    + minLeakageCurrent;
+                    ((maxLeakageCurrent - minLeakageCurrent) / (maxPower - minPower) * (dynamicPower - minPower))
+                            + minLeakageCurrent;
         }
 
         private void setThermalPower(double dynamicPower, double minPower) {
@@ -74,7 +79,7 @@ public double setTemperature(double dynamicPower, double minPower, double maxPow
             setStaticPower(dynamicPower, minPower, maxPower);
             setThermalPower(dynamicPower, minPower);
 
-           return ambientTemperature + (totalPowerDissipated * (rHS + rCase));
+            return ambientTemperature + (totalPowerDissipated * (rHS + rCase));
         }
     }
 

diff --git a/...ator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/ThermalTest.kt b/...ator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/ThermalTest.kt
@@ -83,7 +83,7 @@ class ThermalTest {
             yield()
             assertAll({
                 assertEquals(expectedPower, machine.psu.thermalPower, 0.0001, "The power draw should be $expectedPower W")
-                assertEquals(expectedTemperature, machine.psu.temperature, 0.0001, "The temperature should be $expectedTemperature C")
+                assertEquals(expectedTemperature, machine.psu.cpuTemperature, 0.0001, "The temperature should be $expectedTemperature C")
             })
         }
     }

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
@@ -347,7 +347,15 @@ public class OpenDCRunner(
 
             val energyConsumptionW = machine.cpus.sumOf { it.energyConsumptionW }
             val powerModel = CpuPowerModels.linear(2 * energyConsumptionW, energyConsumptionW * 0.5)
-            val thermalModel = ThermalModels.rcmodel(0.298, 0.00061, 0.00035, 0.0041, 22.0)
+            val thermalModel =
+                ThermalModels.rcmodel(
+                    0.298,
+                    0.00061,
+                    0.00035,
+                    0.0041,
+                    1.8,
+                    22.0,
+                )
 
             val spec =
                 HostSpec(