From 5a365dbc068f2a8cdfa9813c39cc84bb30e15637 Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Fri, 25 Oct 2024 13:32:41 +0200
Subject: Rewrote the  FlowEngine (#256)

* Removed unused components. Updated tests.

Improved checkpointing model

Improved model, started with SimPowerSource

implemented FailureModels and Checkpointing

First working version

midway commit

first update

All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability.

* fixed merge conflicts

* Updated M3SA paths.

* Fixed small typo
---
 .../src/test/resources/env/multi.json              |  59 ---------------------
 .../src/test/resources/env/single.json             |  23 --------
 .../resources/failureTraces/11_failures.parquet    | Bin 0 -> 2786 bytes
 .../resources/failureTraces/single_failure.parquet | Bin 0 -> 2786 bytes
 .../src/test/resources/topologies/multi.json       |  59 +++++++++++++++++++++
 .../src/test/resources/topologies/single.json      |  23 ++++++++
 .../trace/bitbrains-small/fragments.parquet        | Bin 717069 -> 0 bytes
 .../trace/bitbrains-small/interference-model.json  |  21 --------
 .../resources/trace/bitbrains-small/tasks.parquet  | Bin 5525 -> 0 bytes
 .../traces/bitbrains-small/fragments.parquet       | Bin 0 -> 717069 bytes
 .../traces/bitbrains-small/interference-model.json |  21 ++++++++
 .../resources/traces/bitbrains-small/tasks.parquet | Bin 0 -> 5525 bytes
 .../resources/traces/single_task/fragments.parquet | Bin 0 -> 3012 bytes
 .../resources/traces/single_task/tasks.parquet     | Bin 0 -> 4471 bytes
 14 files changed, 103 insertions(+), 103 deletions(-)
 delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
 delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/11_failures.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/multi.json
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single.json
 delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet
 delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/interference-model.json
 delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/fragments.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/interference-model.json
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/tasks.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/fragments.parquet
 create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/tasks.parquet

(limited to 'opendc-experiments/opendc-experiments-base/src/test/resources')

diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
deleted file mode 100644
index c3a060cc..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpu":
-                    {
-                        "coreCount": 32,
-                        "coreSpeed": 3200
-                    },
-                    "memory": {
-                        "memorySize": 256000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C02",
-            "hosts" :
-            [
-                {
-                    "name": "H02",
-                    "count": 6,
-                    "cpu":
-                    {
-                        "coreCount": 8,
-                        "coreSpeed": 2930
-                    },
-                    "memory": {
-                        "memorySize": 64000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C03",
-            "hosts" :
-            [
-                {
-                    "name": "H03",
-                    "count": 2,
-                    "cpu":
-                    {
-                        "coreCount": 16,
-                        "coreSpeed": 3200
-                    },
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
deleted file mode 100644
index f69b21be..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpu":
-                    {
-                        "coreCount": 8,
-                        "coreSpeed": 3200
-                    },
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/11_failures.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/11_failures.parquet
new file mode 100644
index 00000000..dbd93acb
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/11_failures.parquet differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet
new file mode 100644
index 00000000..d1f8b853
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/multi.json
new file mode 100644
index 00000000..c3a060cc
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/multi.json
@@ -0,0 +1,59 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpu":
+                    {
+                        "coreCount": 32,
+                        "coreSpeed": 3200
+                    },
+                    "memory": {
+                        "memorySize": 256000
+                    }
+                }
+            ]
+        },
+        {
+            "name": "C02",
+            "hosts" :
+            [
+                {
+                    "name": "H02",
+                    "count": 6,
+                    "cpu":
+                    {
+                        "coreCount": 8,
+                        "coreSpeed": 2930
+                    },
+                    "memory": {
+                        "memorySize": 64000
+                    }
+                }
+            ]
+        },
+        {
+            "name": "C03",
+            "hosts" :
+            [
+                {
+                    "name": "H03",
+                    "count": 2,
+                    "cpu":
+                    {
+                        "coreCount": 16,
+                        "coreSpeed": 3200
+                    },
+                    "memory": {
+                        "memorySize": 128000
+                    }
+                }
+            ]
+        }
+    ]
+}
+
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single.json
new file mode 100644
index 00000000..de66bfc2
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single.json
@@ -0,0 +1,23 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpu":
+                    {
+                        "coreCount": 12,
+                        "coreSpeed": 3300,
+                        "count": 1
+                    },
+                    "memory": {
+                        "memorySize": 140457600000
+                    }
+                }
+            ]
+        }
+    ]
+}
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet
deleted file mode 100644
index 240f58e3..00000000
Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet and /dev/null differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/interference-model.json
deleted file mode 100644
index 51fc6366..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/interference-model.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "vms": [
-            "141",
-            "379",
-            "851",
-            "116"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.8830158730158756
-    },
-    {
-        "vms": [
-            "205",
-            "116",
-            "463"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.7133055555552751
-    }
-]
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet
deleted file mode 100644
index 8e9dcea7..00000000
Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet and /dev/null differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/fragments.parquet
new file mode 100644
index 00000000..240f58e3
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/fragments.parquet differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/interference-model.json
new file mode 100644
index 00000000..51fc6366
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/interference-model.json
@@ -0,0 +1,21 @@
+[
+    {
+        "vms": [
+            "141",
+            "379",
+            "851",
+            "116"
+        ],
+        "minServerLoad": 0.0,
+        "performanceScore": 0.8830158730158756
+    },
+    {
+        "vms": [
+            "205",
+            "116",
+            "463"
+        ],
+        "minServerLoad": 0.0,
+        "performanceScore": 0.7133055555552751
+    }
+]
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/tasks.parquet
new file mode 100644
index 00000000..8e9dcea7
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/bitbrains-small/tasks.parquet differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/fragments.parquet
new file mode 100644
index 00000000..94a2d69e
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/fragments.parquet differ
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/tasks.parquet
new file mode 100644
index 00000000..2a7da2eb
Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/traces/single_task/tasks.parquet differ
-- 
cgit v1.2.3