Merging upstream version 2.1.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 6 deletions

diff --git a/cts/scheduler/dot/bundle-interleave-start.dot b/cts/scheduler/dot/bundle-interleave-start.dot
index bf6ed7f..109a6cb 100644
--- a/cts/scheduler/dot/bundle-interleave-start.dot
+++ b/cts/scheduler/dot/bundle-interleave-start.dot
@@ -41,9 +41,15 @@
 "app-bundle-2_monitor_0 node5" [ style=bold color="green" fontcolor="black"]
 "app-bundle-2_monitor_30000 node4" [ style=bold color="green" fontcolor="black"]
 "app-bundle-2_start_0 node4" -> "app-bundle-2_monitor_30000 node4" [ style = bold]
-"app-bundle-2_start_0 node4" -> "app:2_monitor_16000 app-bundle-2" [ style = bold]
+"app-bundle-2_start_0 node4" -> "app:2_monitor_15000 app-bundle-2" [ style = bold]
+"app-bundle-2_start_0 node4" -> "app:2_promote_0 app-bundle-2" [ style = bold]
 "app-bundle-2_start_0 node4" -> "app:2_start_0 app-bundle-2" [ style = bold]
 "app-bundle-2_start_0 node4" [ style=bold color="green" fontcolor="black"]
+"app-bundle-clone_promote_0" -> "app:2_promote_0 app-bundle-2" [ style = bold]
+"app-bundle-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
+"app-bundle-clone_promoted_0" -> "app-bundle_promoted_0" [ style = bold]
+"app-bundle-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
+"app-bundle-clone_running_0" -> "app-bundle-clone_promote_0" [ style = bold]
 "app-bundle-clone_running_0" -> "app-bundle_running_0" [ style = bold]
 "app-bundle-clone_running_0" [ style=bold color="green" fontcolor="orange"]
 "app-bundle-clone_start_0" -> "app-bundle-clone_running_0" [ style = bold]
@@ -133,8 +139,13 @@
 "app-bundle-podman-2_start_0 node4" -> "app-bundle-2_start_0 node4" [ style = bold]
 "app-bundle-podman-2_start_0 node4" -> "app-bundle-podman-2_monitor_60000 node4" [ style = bold]
 "app-bundle-podman-2_start_0 node4" -> "app-bundle_running_0" [ style = bold]
+"app-bundle-podman-2_start_0 node4" -> "app:2_promote_0 app-bundle-2" [ style = bold]
 "app-bundle-podman-2_start_0 node4" -> "app:2_start_0 app-bundle-2" [ style = bold]
 "app-bundle-podman-2_start_0 node4" [ style=bold color="green" fontcolor="black"]
+"app-bundle_promote_0" -> "app-bundle-clone_promote_0" [ style = bold]
+"app-bundle_promote_0" [ style=bold color="green" fontcolor="orange"]
+"app-bundle_promoted_0" [ style=bold color="green" fontcolor="orange"]
+"app-bundle_running_0" -> "app-bundle_promote_0" [ style = bold]
 "app-bundle_running_0" [ style=bold color="green" fontcolor="orange"]
 "app-bundle_start_0" -> "app-bundle-clone_start_0" [ style = bold]
 "app-bundle_start_0" -> "app-bundle-podman-0_start_0 node2" [ style = bold]
@@ -145,15 +156,20 @@
 "app:0_start_0 app-bundle-0" -> "app-bundle-clone_running_0" [ style = bold]
 "app:0_start_0 app-bundle-0" -> "app:0_monitor_16000 app-bundle-0" [ style = bold]
 "app:0_start_0 app-bundle-0" -> "app:1_start_0 app-bundle-1" [ style = bold]
+"app:0_start_0 app-bundle-0" -> "app:2_start_0 app-bundle-2" [ style = bold]
 "app:0_start_0 app-bundle-0" [ style=bold color="green" fontcolor="black"]
 "app:1_monitor_16000 app-bundle-1" [ style=bold color="green" fontcolor="black"]
 "app:1_start_0 app-bundle-1" -> "app-bundle-clone_running_0" [ style = bold]
 "app:1_start_0 app-bundle-1" -> "app:1_monitor_16000 app-bundle-1" [ style = bold]
 "app:1_start_0 app-bundle-1" -> "app:2_start_0 app-bundle-2" [ style = bold]
 "app:1_start_0 app-bundle-1" [ style=bold color="green" fontcolor="black"]
-"app:2_monitor_16000 app-bundle-2" [ style=bold color="green" fontcolor="black"]
+"app:2_monitor_15000 app-bundle-2" [ style=bold color="green" fontcolor="black"]
+"app:2_promote_0 app-bundle-2" -> "app-bundle-clone_promoted_0" [ style = bold]
+"app:2_promote_0 app-bundle-2" -> "app:2_monitor_15000 app-bundle-2" [ style = bold]
+"app:2_promote_0 app-bundle-2" [ style=bold color="green" fontcolor="black"]
 "app:2_start_0 app-bundle-2" -> "app-bundle-clone_running_0" [ style = bold]
-"app:2_start_0 app-bundle-2" -> "app:2_monitor_16000 app-bundle-2" [ style = bold]
+"app:2_start_0 app-bundle-2" -> "app:2_monitor_15000 app-bundle-2" [ style = bold]
+"app:2_start_0 app-bundle-2" -> "app:2_promote_0 app-bundle-2" [ style = bold]
 "app:2_start_0 app-bundle-2" [ style=bold color="green" fontcolor="black"]
 "base-bundle-0_monitor_0 node1" -> "base-bundle-0_start_0 node2" [ style = bold]
 "base-bundle-0_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
@@ -197,9 +213,15 @@
 "base-bundle-2_monitor_0 node5" [ style=bold color="green" fontcolor="black"]
 "base-bundle-2_monitor_30000 node4" [ style=bold color="green" fontcolor="black"]
 "base-bundle-2_start_0 node4" -> "base-bundle-2_monitor_30000 node4" [ style = bold]
-"base-bundle-2_start_0 node4" -> "base:2_monitor_16000 base-bundle-2" [ style = bold]
+"base-bundle-2_start_0 node4" -> "base:2_monitor_15000 base-bundle-2" [ style = bold]
+"base-bundle-2_start_0 node4" -> "base:2_promote_0 base-bundle-2" [ style = bold]
 "base-bundle-2_start_0 node4" -> "base:2_start_0 base-bundle-2" [ style = bold]
 "base-bundle-2_start_0 node4" [ style=bold color="green" fontcolor="black"]
+"base-bundle-clone_promote_0" -> "base:2_promote_0 base-bundle-2" [ style = bold]
+"base-bundle-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
+"base-bundle-clone_promoted_0" -> "base-bundle_promoted_0" [ style = bold]
+"base-bundle-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
+"base-bundle-clone_running_0" -> "base-bundle-clone_promote_0" [ style = bold]
 "base-bundle-clone_running_0" -> "base-bundle_running_0" [ style = bold]
 "base-bundle-clone_running_0" [ style=bold color="green" fontcolor="orange"]
 "base-bundle-clone_start_0" -> "base-bundle-clone_running_0" [ style = bold]
@@ -289,9 +311,15 @@
 "base-bundle-podman-2_start_0 node4" -> "base-bundle-2_start_0 node4" [ style = bold]
 "base-bundle-podman-2_start_0 node4" -> "base-bundle-podman-2_monitor_60000 node4" [ style = bold]
 "base-bundle-podman-2_start_0 node4" -> "base-bundle_running_0" [ style = bold]
+"base-bundle-podman-2_start_0 node4" -> "base:2_promote_0 base-bundle-2" [ style = bold]
 "base-bundle-podman-2_start_0 node4" -> "base:2_start_0 base-bundle-2" [ style = bold]
 "base-bundle-podman-2_start_0 node4" [ style=bold color="green" fontcolor="black"]
+"base-bundle_promote_0" -> "base-bundle-clone_promote_0" [ style = bold]
+"base-bundle_promote_0" [ style=bold color="green" fontcolor="orange"]
+"base-bundle_promoted_0" -> "app-bundle_promote_0" [ style = bold]
+"base-bundle_promoted_0" [ style=bold color="green" fontcolor="orange"]
 "base-bundle_running_0" -> "app-bundle_start_0" [ style = bold]
+"base-bundle_running_0" -> "base-bundle_promote_0" [ style = bold]
 "base-bundle_running_0" [ style=bold color="green" fontcolor="orange"]
 "base-bundle_start_0" -> "base-bundle-clone_start_0" [ style = bold]
 "base-bundle_start_0" -> "base-bundle-podman-0_start_0 node2" [ style = bold]
@@ -303,6 +331,7 @@
 "base:0_start_0 base-bundle-0" -> "base-bundle-clone_running_0" [ style = bold]
 "base:0_start_0 base-bundle-0" -> "base:0_monitor_16000 base-bundle-0" [ style = bold]
 "base:0_start_0 base-bundle-0" -> "base:1_start_0 base-bundle-1" [ style = bold]
+"base:0_start_0 base-bundle-0" -> "base:2_start_0 base-bundle-2" [ style = bold]
 "base:0_start_0 base-bundle-0" [ style=bold color="green" fontcolor="black"]
 "base:1_monitor_16000 base-bundle-1" [ style=bold color="green" fontcolor="black"]
 "base:1_start_0 base-bundle-1" -> "app-bundle-podman-1_start_0 node3" [ style = bold]
@@ -310,9 +339,14 @@
 "base:1_start_0 base-bundle-1" -> "base:1_monitor_16000 base-bundle-1" [ style = bold]
 "base:1_start_0 base-bundle-1" -> "base:2_start_0 base-bundle-2" [ style = bold]
 "base:1_start_0 base-bundle-1" [ style=bold color="green" fontcolor="black"]
-"base:2_monitor_16000 base-bundle-2" [ style=bold color="green" fontcolor="black"]
+"base:2_monitor_15000 base-bundle-2" [ style=bold color="green" fontcolor="black"]
+"base:2_promote_0 base-bundle-2" -> "app:2_promote_0 app-bundle-2" [ style = bold]
+"base:2_promote_0 base-bundle-2" -> "base-bundle-clone_promoted_0" [ style = bold]
+"base:2_promote_0 base-bundle-2" -> "base:2_monitor_15000 base-bundle-2" [ style = bold]
+"base:2_promote_0 base-bundle-2" [ style=bold color="green" fontcolor="black"]
 "base:2_start_0 base-bundle-2" -> "app-bundle-podman-2_start_0 node4" [ style = bold]
 "base:2_start_0 base-bundle-2" -> "base-bundle-clone_running_0" [ style = bold]
-"base:2_start_0 base-bundle-2" -> "base:2_monitor_16000 base-bundle-2" [ style = bold]
+"base:2_start_0 base-bundle-2" -> "base:2_monitor_15000 base-bundle-2" [ style = bold]
+"base:2_start_0 base-bundle-2" -> "base:2_promote_0 base-bundle-2" [ style = bold]
 "base:2_start_0 base-bundle-2" [ style=bold color="green" fontcolor="black"]
 }