From ae46153035bbc4ae86344a2efd5ace3ff53be656 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Tue, 14 Jan 2025 17:24:30 -0600 Subject: [PATCH 01/10] Refactor: scheduler: convert boolean arguments to flags ... in pcmk__node_available(), to make it easier to add new conditions. I went through the callers to see if any others should reject guest nodes with unrunnable guests, and it appears not. --- lib/pacemaker/libpacemaker_private.h | 20 +++++++++++-- lib/pacemaker/pcmk_sched_actions.c | 2 +- lib/pacemaker/pcmk_sched_colocation.c | 4 +-- lib/pacemaker/pcmk_sched_instances.c | 18 ++++++----- lib/pacemaker/pcmk_sched_nodes.c | 41 +++++++++++++++----------- lib/pacemaker/pcmk_sched_primitive.c | 13 +++++--- lib/pacemaker/pcmk_sched_promotable.c | 9 ++++-- lib/pacemaker/pcmk_sched_resource.c | 37 +++++++++++++---------- lib/pacemaker/pcmk_sched_utilization.c | 14 ++++++--- 9 files changed, 100 insertions(+), 58 deletions(-) diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h index 58435a62173..0e9cb25b62d 100644 --- a/lib/pacemaker/libpacemaker_private.h +++ b/lib/pacemaker/libpacemaker_private.h @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 the Pacemaker project contributors + * Copyright 2021-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -994,9 +994,23 @@ xmlNode *pcmk__inject_action_result(xmlNode *cib_resource, // Nodes (pcmk_sched_nodes.c) +//! Options for checking node availability +enum pcmk__node_availability { + //! Disallow offline or unclean nodes (always implied) + pcmk__node_alive = 0, + + //! Disallow shutting down, standby, and maintenance nodes + pcmk__node_usable = (1 << 0), + + //! Disallow nodes with negative scores + pcmk__node_no_negative = (1 << 2), + + //! Disallow guest nodes whose guest resource is unrunnable + pcmk__node_no_unrunnable_guest = (1 << 4), +}; + G_GNUC_INTERNAL -bool pcmk__node_available(const pcmk_node_t *node, bool consider_score, - bool consider_guest); +bool pcmk__node_available(const pcmk_node_t *node, uint32_t flags); G_GNUC_INTERNAL bool pcmk__any_node_available(GHashTable *nodes); diff --git a/lib/pacemaker/pcmk_sched_actions.c b/lib/pacemaker/pcmk_sched_actions.c index f8699db46bc..36ecbeef424 100644 --- a/lib/pacemaker/pcmk_sched_actions.c +++ b/lib/pacemaker/pcmk_sched_actions.c @@ -1940,7 +1940,7 @@ pcmk__handle_rsc_config_changes(pcmk_scheduler_t *scheduler) * cancel any existing recurring monitors. */ if (node->details->maintenance - || pcmk__node_available(node, false, false)) { + || pcmk__node_available(node, pcmk__node_alive|pcmk__node_usable)) { char *xpath = NULL; xmlNode *history = NULL; diff --git a/lib/pacemaker/pcmk_sched_colocation.c b/lib/pacemaker/pcmk_sched_colocation.c index 3c4c4c6b23e..3472d28adc8 100644 --- a/lib/pacemaker/pcmk_sched_colocation.c +++ b/lib/pacemaker/pcmk_sched_colocation.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -1578,7 +1578,7 @@ best_node_score_matching_attr(const pcmk__colocation_t *colocation, while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { if ((node->assign->score > best_score) - && pcmk__node_available(node, false, false) + && pcmk__node_available(node, pcmk__node_alive|pcmk__node_usable) && pcmk__str_eq(value, pcmk__colocation_node_attr(node, attr, rsc), pcmk__str_casei)) { diff --git a/lib/pacemaker/pcmk_sched_instances.c b/lib/pacemaker/pcmk_sched_instances.c index f2bc1a432cd..af53fc07261 100644 --- a/lib/pacemaker/pcmk_sched_instances.c +++ b/lib/pacemaker/pcmk_sched_instances.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -38,7 +38,7 @@ can_run_instance(const pcmk_resource_t *instance, const pcmk_node_t *node, return false; } - if (!pcmk__node_available(node, false, false)) { + if (!pcmk__node_available(node, pcmk__node_alive|pcmk__node_usable)) { pcmk__rsc_trace(instance, "%s cannot run on %s: node cannot run resources", instance->id, pcmk__node_name(node)); @@ -434,8 +434,8 @@ pcmk__cmp_instance(gconstpointer a, gconstpointer b) } // Prefer instance whose current node can run resources - can1 = pcmk__node_available(node1, false, false); - can2 = pcmk__node_available(node2, false, false); + can1 = pcmk__node_available(node1, pcmk__node_alive|pcmk__node_usable); + can2 = pcmk__node_available(node2, pcmk__node_alive|pcmk__node_usable); if (can1 && !can2) { crm_trace("Assign %s before %s: current node can run resources", instance1->id, instance2->id); @@ -613,7 +613,9 @@ assign_instance_early(const pcmk_resource_t *rsc, pcmk_resource_t *instance, allowed_node = g_hash_table_lookup(instance->priv->allowed_nodes, current->priv->id); - if (!pcmk__node_available(allowed_node, true, false)) { + if (!pcmk__node_available(allowed_node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { pcmk__rsc_info(instance, "Not assigning %s to current node %s: unavailable", instance->id, pcmk__node_name(current)); @@ -726,7 +728,7 @@ reset_allowed_node_counts(pcmk_resource_t *rsc) g_hash_table_iter_init(&iter, rsc->priv->allowed_nodes); while (g_hash_table_iter_next(&iter, NULL, (gpointer *) &node)) { node->assign->count = 0; - if (pcmk__node_available(node, false, false)) { + if (pcmk__node_available(node, pcmk__node_alive|pcmk__node_usable)) { available_nodes++; } } @@ -757,7 +759,9 @@ preferred_node(const pcmk_resource_t *instance, int optimal_per_node) // Check whether instance's current node can run resources node = pcmk__current_node(instance); - if (!pcmk__node_available(node, true, false)) { + if (!pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { pcmk__rsc_trace(instance, "Not assigning %s to %s early (unavailable)", instance->id, pcmk__node_name(node)); return NULL; diff --git a/lib/pacemaker/pcmk_sched_nodes.c b/lib/pacemaker/pcmk_sched_nodes.c index 544a8ced6be..f866cb32549 100644 --- a/lib/pacemaker/pcmk_sched_nodes.c +++ b/lib/pacemaker/pcmk_sched_nodes.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -18,31 +18,34 @@ * \internal * \brief Check whether a node is available to run resources * - * \param[in] node Node to check - * \param[in] consider_score If true, consider a negative score unavailable - * \param[in] consider_guest If true, consider a guest node unavailable whose - * resource will not be active + * \param[in] node Node to check + * \param[in] flags Group of enum pcmk__node_availability flags * - * \return true if node is online and not shutting down, unclean, or in standby - * or maintenance mode, otherwise false + * \return true if node is available per flags, otherwise false */ bool -pcmk__node_available(const pcmk_node_t *node, bool consider_score, - bool consider_guest) +pcmk__node_available(const pcmk_node_t *node, uint32_t flags) { - if ((node == NULL) || (node->details == NULL) || !node->details->online - || node->details->shutdown || node->details->unclean + // pcmk__node_alive is implicit + if ((node == NULL) || (node->details == NULL) + || !node->details->online || node->details->unclean) { + return false; + } + + if (pcmk_is_set(flags, pcmk__node_usable) + && (node->details->shutdown || pcmk_is_set(node->priv->flags, pcmk__node_standby) - || node->details->maintenance) { + || node->details->maintenance)) { return false; } - if (consider_score && (node->assign->score < 0)) { + if (pcmk_is_set(flags, pcmk__node_no_negative) + && (node->assign->score < 0)) { return false; } - // @TODO Go through all callers to see which should set consider_guest - if (consider_guest && pcmk__is_guest_or_bundle_node(node)) { + if (pcmk_is_set(flags, pcmk__node_no_unrunnable_guest) + && pcmk__is_guest_or_bundle_node(node)) { pcmk_resource_t *guest = node->priv->remote->priv->launcher; if (guest->priv->fns->location(guest, NULL, @@ -226,10 +229,10 @@ compare_nodes(gconstpointer a, gconstpointer b, gpointer data) // Compare node scores - if (pcmk__node_available(node1, false, false)) { + if (pcmk__node_available(node1, pcmk__node_alive|pcmk__node_usable)) { node1_score = node1->assign->score; } - if (pcmk__node_available(node2, false, false)) { + if (pcmk__node_available(node2, pcmk__node_alive|pcmk__node_usable)) { node2_score = node2->assign->score; } @@ -351,7 +354,9 @@ pcmk__any_node_available(GHashTable *nodes) } g_hash_table_iter_init(&iter, nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (pcmk__node_available(node, true, false)) { + if (pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { return true; } } diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c index 390072a214a..8bff84b8a3f 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -206,7 +206,9 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, pcmk__node_name(chosen), rsc->id); chosen = NULL; - } else if (!pcmk__node_available(chosen, true, false)) { + } else if (!pcmk__node_available(chosen, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { pcmk__rsc_trace(rsc, "Preferred node %s for %s was unavailable", pcmk__node_name(chosen), rsc->id); chosen = NULL; @@ -229,7 +231,8 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, if (!pcmk__is_unique_clone(rsc->priv->parent) && (chosen->assign->score > 0) // Zero not acceptable - && pcmk__node_available(chosen, false, false)) { + && pcmk__node_available(chosen, + pcmk__node_alive|pcmk__node_usable)) { /* If the resource is already running on a node, prefer that node if * it is just as good as the chosen node. * @@ -244,7 +247,9 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, if (running == NULL) { // Nothing to do - } else if (!pcmk__node_available(running, true, false)) { + } else if (!pcmk__node_available(running, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { pcmk__rsc_trace(rsc, "Current node for %s (%s) can't run resources", rsc->id, pcmk__node_name(running)); diff --git a/lib/pacemaker/pcmk_sched_promotable.c b/lib/pacemaker/pcmk_sched_promotable.c index 6a1bf9cd9d2..e345554b479 100644 --- a/lib/pacemaker/pcmk_sched_promotable.c +++ b/lib/pacemaker/pcmk_sched_promotable.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -206,7 +206,9 @@ node_to_be_promoted_on(const pcmk_resource_t *rsc) rsc->id, rsc->priv->priority); return NULL; - } else if (!pcmk__node_available(node, false, true)) { + } else if (!pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_unrunnable_guest)) { pcmk__rsc_trace(rsc, "%s can't be promoted because %s can't run resources", rsc->id, pcmk__node_name(node)); @@ -801,7 +803,8 @@ pcmk__add_promotion_scores(pcmk_resource_t *rsc) g_hash_table_iter_init(&iter, child_rsc->priv->allowed_nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (!pcmk__node_available(node, false, false)) { + if (!pcmk__node_available(node, + pcmk__node_alive|pcmk__node_usable)) { /* This node will never be promoted, so don't apply the * promotion score, as that may lead to clone shuffling. */ diff --git a/lib/pacemaker/pcmk_sched_resource.c b/lib/pacemaker/pcmk_sched_resource.c index 2bc843f05f8..fa4330bf3cc 100644 --- a/lib/pacemaker/pcmk_sched_resource.c +++ b/lib/pacemaker/pcmk_sched_resource.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2024 the Pacemaker project contributors + * Copyright 2014-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -436,23 +436,28 @@ pcmk__assign_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool force, // Assigning a primitive - if (!force && (node != NULL) - && ((node->assign->score < 0) + if (!force && (node != NULL)) { + bool available = pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative); + + if ((node->assign->score < 0) // Allow graph to assume that guest node connections will come up - || (!pcmk__node_available(node, true, false) - && !pcmk__is_guest_or_bundle_node(node)))) { - - pcmk__rsc_debug(rsc, - "All nodes for resource %s are unavailable, unclean or " - "shutting down (%s can%s run resources, with score %s)", - rsc->id, pcmk__node_name(node), - (pcmk__node_available(node, true, false)? "" : "not"), - pcmk_readable_score(node->assign->score)); - - if (stop_if_fail) { - pe__set_next_role(rsc, pcmk_role_stopped, "node availability"); + || (!available && !pcmk__is_guest_or_bundle_node(node))) { + + pcmk__rsc_debug(rsc, + "All nodes for resource %s are unavailable, " + "unclean or shutting down (%s can%s run " + "resources, with score %s)", + rsc->id, pcmk__node_name(node), + (available? "" : "not"), + pcmk_readable_score(node->assign->score)); + + if (stop_if_fail) { + pe__set_next_role(rsc, pcmk_role_stopped, "node availability"); + } + node = NULL; } - node = NULL; } if (rsc->priv->assigned_node != NULL) { diff --git a/lib/pacemaker/pcmk_sched_utilization.c b/lib/pacemaker/pcmk_sched_utilization.c index 4e4132b4da8..a3627c7efbe 100644 --- a/lib/pacemaker/pcmk_sched_utilization.c +++ b/lib/pacemaker/pcmk_sched_utilization.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2024 the Pacemaker project contributors + * Copyright 2014-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -336,7 +336,9 @@ pcmk__ban_insufficient_capacity(pcmk_resource_t *rsc) // Check whether any node has enough capacity for all the resources g_hash_table_iter_init(&iter, rsc->priv->allowed_nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (!pcmk__node_available(node, true, false)) { + if (!pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { continue; } @@ -355,7 +357,9 @@ pcmk__ban_insufficient_capacity(pcmk_resource_t *rsc) // If so, ban resource from any node with insufficient capacity g_hash_table_iter_init(&iter, rsc->priv->allowed_nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (pcmk__node_available(node, true, false) + if (pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative) && !have_enough_capacity(node, rscs_id, unassigned_utilization)) { pcmk__rsc_debug(rsc, "%s does not have enough capacity for %s", @@ -371,7 +375,9 @@ pcmk__ban_insufficient_capacity(pcmk_resource_t *rsc) // Otherwise, ban from nodes with insufficient capacity for rsc alone g_hash_table_iter_init(&iter, rsc->priv->allowed_nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (pcmk__node_available(node, true, false) + if (pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative) && !have_enough_capacity(node, rsc->id, rsc->priv->utilization)) { pcmk__rsc_debug(rsc, "%s does not have enough capacity for %s", From 68181f4f968ad88c7a66ba101a3e1bc886c664fd Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Tue, 14 Jan 2025 17:36:22 -0600 Subject: [PATCH 02/10] Refactor: scheduler: use pcmk__node_available() in more places ... now that the "alive" and "usable" checks are separated --- lib/pacemaker/pcmk_sched_fencing.c | 4 ++-- lib/pacemaker/pcmk_sched_primitive.c | 2 +- lib/pacemaker/pcmk_sched_recurring.c | 7 +++---- lib/pacemaker/pcmk_sched_remote.c | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/pacemaker/pcmk_sched_fencing.c b/lib/pacemaker/pcmk_sched_fencing.c index 318d5926874..ee0c49b446d 100644 --- a/lib/pacemaker/pcmk_sched_fencing.c +++ b/lib/pacemaker/pcmk_sched_fencing.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -216,7 +216,7 @@ order_stop_vs_fencing(pcmk_resource_t *rsc, pcmk_action_t *stonith_op) for (iter = action_list; iter != NULL; iter = iter->next) { pcmk_action_t *action = iter->data; - if (!(action->node->details->online) || action->node->details->unclean + if (!pcmk__node_available(action->node, pcmk__node_alive) || pcmk_is_set(rsc->flags, pcmk__rsc_failed)) { if (pcmk_is_set(rsc->flags, pcmk__rsc_failed)) { diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c index 8bff84b8a3f..4b7d11746ef 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c @@ -1511,7 +1511,7 @@ pcmk__schedule_cleanup(pcmk_resource_t *rsc, const pcmk_node_t *node, return; } - if (node->details->unclean || !node->details->online) { + if (!pcmk__node_available(node, pcmk__node_alive)) { pcmk__rsc_trace(rsc, "Skipping clean-up of %s on %s: node unavailable", rsc->id, pcmk__node_name(node)); return; diff --git a/lib/pacemaker/pcmk_sched_recurring.c b/lib/pacemaker/pcmk_sched_recurring.c index 88d8a7035b1..299151b1975 100644 --- a/lib/pacemaker/pcmk_sched_recurring.c +++ b/lib/pacemaker/pcmk_sched_recurring.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -329,8 +329,7 @@ recurring_op_for_active(pcmk_resource_t *rsc, pcmk_action_t *start, pcmk__rsc_trace(rsc, "%s is unrunnable because start is", mon->uuid); pcmk__clear_action_flags(mon, pcmk__action_runnable); - } else if ((node == NULL) || !node->details->online - || node->details->unclean) { + } else if (!pcmk__node_available(node, pcmk__node_alive)) { pcmk__rsc_trace(rsc, "%s is unrunnable because no node is available", mon->uuid); pcmk__clear_action_flags(mon, pcmk__action_runnable); @@ -559,7 +558,7 @@ recurring_op_for_inactive(pcmk_resource_t *rsc, const pcmk_node_t *node, */ order_after_stops(rsc, stop_node, stopped_mon); - if (!stop_node->details->online || stop_node->details->unclean) { + if (!pcmk__node_available(stop_node, pcmk__node_alive)) { pcmk__rsc_debug(rsc, "%s unrunnable on %s: node unavailable)", stopped_mon->uuid, pcmk__node_name(stop_node)); pcmk__clear_action_flags(stopped_mon, pcmk__action_runnable); diff --git a/lib/pacemaker/pcmk_sched_remote.c b/lib/pacemaker/pcmk_sched_remote.c index 90b43a3995b..03231e4cf01 100644 --- a/lib/pacemaker/pcmk_sched_remote.c +++ b/lib/pacemaker/pcmk_sched_remote.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2024 the Pacemaker project contributors + * Copyright 2004-2025 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -143,8 +143,7 @@ get_remote_node_state(const pcmk_node_t *node) */ return remote_state_unknown; - } else if (cluster_node->details->unclean - || !(cluster_node->details->online)) { + } else if (!pcmk__node_available(cluster_node, pcmk__node_alive)) { // Connection is running on a dead node, see if we can recover it first return remote_state_resting; From 8aca980600ab3008c9605efcca84d4486fac608f Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Tue, 14 Jan 2025 17:44:46 -0600 Subject: [PATCH 03/10] Refactor: scheduler: make guest check a node availablity option ... to isolate the code more logically --- lib/pacemaker/libpacemaker_private.h | 3 +++ lib/pacemaker/pcmk_sched_nodes.c | 26 +++++++++++++------- lib/pacemaker/pcmk_sched_resource.c | 36 ++++++++++++---------------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h index 0e9cb25b62d..e32064821e7 100644 --- a/lib/pacemaker/libpacemaker_private.h +++ b/lib/pacemaker/libpacemaker_private.h @@ -1007,6 +1007,9 @@ enum pcmk__node_availability { //! Disallow guest nodes whose guest resource is unrunnable pcmk__node_no_unrunnable_guest = (1 << 4), + + //! Exempt guest nodes from alive and usable checks + pcmk__node_exempt_guest = (1 << 5), }; G_GNUC_INTERNAL diff --git a/lib/pacemaker/pcmk_sched_nodes.c b/lib/pacemaker/pcmk_sched_nodes.c index f866cb32549..cdeb13a1aa3 100644 --- a/lib/pacemaker/pcmk_sched_nodes.c +++ b/lib/pacemaker/pcmk_sched_nodes.c @@ -26,17 +26,25 @@ bool pcmk__node_available(const pcmk_node_t *node, uint32_t flags) { - // pcmk__node_alive is implicit - if ((node == NULL) || (node->details == NULL) - || !node->details->online || node->details->unclean) { - return false; + if ((node == NULL) || (node->details == NULL)) { + return false; // A nonexistent node is not available } - if (pcmk_is_set(flags, pcmk__node_usable) - && (node->details->shutdown - || pcmk_is_set(node->priv->flags, pcmk__node_standby) - || node->details->maintenance)) { - return false; + // Guest nodes may be exempted from alive and usable checks + if (!pcmk_is_set(flags, pcmk__node_exempt_guest) + || !pcmk__is_guest_or_bundle_node(node)) { + + // pcmk__node_alive is implicit + if (!node->details->online || node->details->unclean) { + return false; + } + + if (pcmk_is_set(flags, pcmk__node_usable) + && (node->details->shutdown + || pcmk_is_set(node->priv->flags, pcmk__node_standby) + || node->details->maintenance)) { + return false; + } } if (pcmk_is_set(flags, pcmk__node_no_negative) diff --git a/lib/pacemaker/pcmk_sched_resource.c b/lib/pacemaker/pcmk_sched_resource.c index fa4330bf3cc..f49778b3390 100644 --- a/lib/pacemaker/pcmk_sched_resource.c +++ b/lib/pacemaker/pcmk_sched_resource.c @@ -436,28 +436,22 @@ pcmk__assign_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool force, // Assigning a primitive - if (!force && (node != NULL)) { - bool available = pcmk__node_available(node, pcmk__node_alive - |pcmk__node_usable - |pcmk__node_no_negative); - - if ((node->assign->score < 0) - // Allow graph to assume that guest node connections will come up - || (!available && !pcmk__is_guest_or_bundle_node(node))) { - - pcmk__rsc_debug(rsc, - "All nodes for resource %s are unavailable, " - "unclean or shutting down (%s can%s run " - "resources, with score %s)", - rsc->id, pcmk__node_name(node), - (available? "" : "not"), - pcmk_readable_score(node->assign->score)); - - if (stop_if_fail) { - pe__set_next_role(rsc, pcmk_role_stopped, "node availability"); - } - node = NULL; + if (!force && (node != NULL) + // Allow graph to assume that guest node connections will come up + && !pcmk__node_available(node, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative + |pcmk__node_exempt_guest)) { + + pcmk__rsc_debug(rsc, + "All nodes for resource %s are unavailable, unclean or " + "shutting down (preferring %s @ %s)", + rsc->id, pcmk__node_name(node), + pcmk_readable_score(node->assign->score)); + if (stop_if_fail) { + pe__set_next_role(rsc, pcmk_role_stopped, "node availability"); } + node = NULL; } if (rsc->priv->assigned_node != NULL) { From fa3345b92f3523428ea40c0b3ab41593746270b9 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Tue, 14 Jan 2025 17:49:38 -0600 Subject: [PATCH 04/10] Refactor: scheduler: make positive score check a node availablity option ... to isolate the code more logically --- lib/pacemaker/libpacemaker_private.h | 3 +++ lib/pacemaker/pcmk_sched_nodes.c | 4 ++++ lib/pacemaker/pcmk_sched_primitive.c | 7 ++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h index e32064821e7..02b012a05bd 100644 --- a/lib/pacemaker/libpacemaker_private.h +++ b/lib/pacemaker/libpacemaker_private.h @@ -1002,6 +1002,9 @@ enum pcmk__node_availability { //! Disallow shutting down, standby, and maintenance nodes pcmk__node_usable = (1 << 0), + //! Disallow nodes with zero score + pcmk__node_no_zero = (1 << 1), + //! Disallow nodes with negative scores pcmk__node_no_negative = (1 << 2), diff --git a/lib/pacemaker/pcmk_sched_nodes.c b/lib/pacemaker/pcmk_sched_nodes.c index cdeb13a1aa3..73a845785e4 100644 --- a/lib/pacemaker/pcmk_sched_nodes.c +++ b/lib/pacemaker/pcmk_sched_nodes.c @@ -47,6 +47,10 @@ pcmk__node_available(const pcmk_node_t *node, uint32_t flags) } } + if (pcmk_is_set(flags, pcmk__node_no_zero) && (node->assign->score == 0)) { + return false; + } + if (pcmk_is_set(flags, pcmk__node_no_negative) && (node->assign->score < 0)) { return false; diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c index 4b7d11746ef..a5b1a1b3846 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c @@ -230,9 +230,10 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, chosen = best; if (!pcmk__is_unique_clone(rsc->priv->parent) - && (chosen->assign->score > 0) // Zero not acceptable - && pcmk__node_available(chosen, - pcmk__node_alive|pcmk__node_usable)) { + && pcmk__node_available(chosen, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_zero + |pcmk__node_no_negative)) { /* If the resource is already running on a node, prefer that node if * it is just as good as the chosen node. * From 247609b0a5cfeb8977d4b57886f3a6742fbd4151 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:06:47 -0600 Subject: [PATCH 05/10] Refactor: scheduler: add option for disallowing banned nodes Nothing uses it yet --- lib/pacemaker/libpacemaker_private.h | 3 +++ lib/pacemaker/pcmk_sched_nodes.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h index 02b012a05bd..3aac6935cd7 100644 --- a/lib/pacemaker/libpacemaker_private.h +++ b/lib/pacemaker/libpacemaker_private.h @@ -1008,6 +1008,9 @@ enum pcmk__node_availability { //! Disallow nodes with negative scores pcmk__node_no_negative = (1 << 2), + //! Disallow nodes with minus infinity scores + pcmk__node_no_banned = (1 << 3), + //! Disallow guest nodes whose guest resource is unrunnable pcmk__node_no_unrunnable_guest = (1 << 4), diff --git a/lib/pacemaker/pcmk_sched_nodes.c b/lib/pacemaker/pcmk_sched_nodes.c index 73a845785e4..5c9adc8fecf 100644 --- a/lib/pacemaker/pcmk_sched_nodes.c +++ b/lib/pacemaker/pcmk_sched_nodes.c @@ -56,6 +56,11 @@ pcmk__node_available(const pcmk_node_t *node, uint32_t flags) return false; } + if (pcmk_is_set(flags, pcmk__node_no_banned) + && (node->assign->score <= -PCMK_SCORE_INFINITY)) { + return false; + } + if (pcmk_is_set(flags, pcmk__node_no_unrunnable_guest) && pcmk__is_guest_or_bundle_node(node)) { pcmk_resource_t *guest = node->priv->remote->priv->launcher; From d48abd12bc7ddf35bcdb3688a9bfdbe893ad811f Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:14:45 -0600 Subject: [PATCH 06/10] Fix: scheduler: allow assigning to nodes with finite negative scores This allows resources to be active in cases where they would previously be stopped. Fixes T335 --- lib/pacemaker/pcmk_sched_primitive.c | 4 ++-- lib/pacemaker/pcmk_sched_resource.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c index a5b1a1b3846..324c204d8f3 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c @@ -208,7 +208,7 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, } else if (!pcmk__node_available(chosen, pcmk__node_alive |pcmk__node_usable - |pcmk__node_no_negative)) { + |pcmk__node_no_banned)) { pcmk__rsc_trace(rsc, "Preferred node %s for %s was unavailable", pcmk__node_name(chosen), rsc->id); chosen = NULL; @@ -250,7 +250,7 @@ assign_best_node(pcmk_resource_t *rsc, const pcmk_node_t *prefer, } else if (!pcmk__node_available(running, pcmk__node_alive |pcmk__node_usable - |pcmk__node_no_negative)) { + |pcmk__node_no_banned)) { pcmk__rsc_trace(rsc, "Current node for %s (%s) can't run resources", rsc->id, pcmk__node_name(running)); diff --git a/lib/pacemaker/pcmk_sched_resource.c b/lib/pacemaker/pcmk_sched_resource.c index f49778b3390..e9a46d00f49 100644 --- a/lib/pacemaker/pcmk_sched_resource.c +++ b/lib/pacemaker/pcmk_sched_resource.c @@ -440,7 +440,7 @@ pcmk__assign_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool force, // Allow graph to assume that guest node connections will come up && !pcmk__node_available(node, pcmk__node_alive |pcmk__node_usable - |pcmk__node_no_negative + |pcmk__node_no_banned |pcmk__node_exempt_guest)) { pcmk__rsc_debug(rsc, From 5f72eec4fc8e1e84b8841bea2fc513046aff901d Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:29:22 -0600 Subject: [PATCH 07/10] Test: cts-scheduler: update tests for assignment change Now that resources may be assigned to nodes with finite negative scores, two scheduler regression tests have improvements: In systemhealthp2, the stonith resource may now start, whereas before it was left stopped. There are two nodes, hs21c (with health status yellow, equivalent to -100 preference) and hs21d (which is unseen, so unclean and offline). There was no good reason to leave stonith stopped. In node-maintenance-1, rsc1 stays active where it is, whereas before it was stopped. rsc1 is started on node1 (where it has a -1 location preference), and rsc2 is started on node2 (where it has a -1 location preference), and node2 is unmanaged. Since node2 is unmanaged, rsc2 can't be moved away from it, and rsc1 has nowhere to move to even though it has a negative preference for its current node. Previously, rsc1 would be stopped even though it couldn't be recovered elsewhere. --- cts/scheduler/dot/node-maintenance-1.dot | 1 - cts/scheduler/dot/systemhealthp2.dot | 3 ++ cts/scheduler/exp/node-maintenance-1.exp | 9 ---- cts/scheduler/exp/systemhealthp2.exp | 48 ++++++++++++------- .../summary/node-maintenance-1.summary | 4 +- cts/scheduler/summary/systemhealthp2.summary | 4 +- 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/cts/scheduler/dot/node-maintenance-1.dot b/cts/scheduler/dot/node-maintenance-1.dot index 33dd16a4cf6..9c0dbdc1edb 100644 --- a/cts/scheduler/dot/node-maintenance-1.dot +++ b/cts/scheduler/dot/node-maintenance-1.dot @@ -1,4 +1,3 @@ digraph "g" { "Cancel rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/cts/scheduler/dot/systemhealthp2.dot b/cts/scheduler/dot/systemhealthp2.dot index 3d25561c2c3..8fb436136c4 100644 --- a/cts/scheduler/dot/systemhealthp2.dot +++ b/cts/scheduler/dot/systemhealthp2.dot @@ -11,6 +11,9 @@ "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black"] +"stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black"] } diff --git a/cts/scheduler/exp/node-maintenance-1.exp b/cts/scheduler/exp/node-maintenance-1.exp index fc031eb12a8..a409f24dc08 100644 --- a/cts/scheduler/exp/node-maintenance-1.exp +++ b/cts/scheduler/exp/node-maintenance-1.exp @@ -1,14 +1,5 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/systemhealthp2.exp b/cts/scheduler/exp/systemhealthp2.exp index 51d9650b166..c7f5981a193 100644 --- a/cts/scheduler/exp/systemhealthp2.exp +++ b/cts/scheduler/exp/systemhealthp2.exp @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + @@ -8,22 +24,22 @@ - + - + - + - + - + @@ -33,11 +49,11 @@ - + - + @@ -46,22 +62,22 @@ - + - + - + - + - + @@ -71,11 +87,11 @@ - + - + @@ -84,9 +100,9 @@ - + - + diff --git a/cts/scheduler/summary/node-maintenance-1.summary b/cts/scheduler/summary/node-maintenance-1.summary index eb75567721c..c235047c719 100644 --- a/cts/scheduler/summary/node-maintenance-1.summary +++ b/cts/scheduler/summary/node-maintenance-1.summary @@ -9,10 +9,8 @@ Current cluster status: * rsc2 (ocf:pacemaker:Dummy): Started node2 (maintenance) Transition Summary: - * Stop rsc1 ( node1 ) due to node availability Executing Cluster Transition: - * Resource action: rsc1 stop on node1 * Resource action: rsc2 cancel=10000 on node2 Revised Cluster Status: @@ -22,5 +20,5 @@ Revised Cluster Status: * Full List of Resources: * rsc_stonith (stonith:null): Started node1 - * rsc1 (ocf:pacemaker:Dummy): Stopped + * rsc1 (ocf:pacemaker:Dummy): Started node1 * rsc2 (ocf:pacemaker:Dummy): Started node2 (maintenance) diff --git a/cts/scheduler/summary/systemhealthp2.summary b/cts/scheduler/summary/systemhealthp2.summary index 9dba00189ee..e27fcf85872 100644 --- a/cts/scheduler/summary/systemhealthp2.summary +++ b/cts/scheduler/summary/systemhealthp2.summary @@ -10,6 +10,7 @@ Current cluster status: Transition Summary: * Fence (reboot) hs21d 'node is unclean' + * Start stonith-1 ( hs21c ) * Start apache_1 ( hs21c ) * Start nfs_1 ( hs21c ) @@ -18,6 +19,7 @@ Executing Cluster Transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) + * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c * Resource action: apache_1 monitor=10000 on hs21c @@ -29,6 +31,6 @@ Revised Cluster Status: * OFFLINE: [ hs21d ] * Full List of Resources: - * stonith-1 (stonith:dummy): Stopped + * stonith-1 (stonith:dummy): Started hs21c * apache_1 (ocf:heartbeat:apache): Started hs21c * nfs_1 (ocf:heartbeat:Filesystem): Started hs21c From c4752969946288cb66c00fc30a8c2e2531df7495 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:11:28 -0600 Subject: [PATCH 08/10] Refactor: scheduler: allow pcmk__any_node_available() to take flags All existing callers retain the same behavior --- lib/pacemaker/libpacemaker_private.h | 2 +- lib/pacemaker/pcmk_sched_colocation.c | 8 ++++++-- lib/pacemaker/pcmk_sched_nodes.c | 11 +++++------ lib/pacemaker/pcmk_sched_primitive.c | 5 ++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h index 3aac6935cd7..23dd72fcfac 100644 --- a/lib/pacemaker/libpacemaker_private.h +++ b/lib/pacemaker/libpacemaker_private.h @@ -1022,7 +1022,7 @@ G_GNUC_INTERNAL bool pcmk__node_available(const pcmk_node_t *node, uint32_t flags); G_GNUC_INTERNAL -bool pcmk__any_node_available(GHashTable *nodes); +bool pcmk__any_node_available(GHashTable *nodes, uint32_t flags); G_GNUC_INTERNAL GHashTable *pcmk__copy_node_table(GHashTable *nodes); diff --git a/lib/pacemaker/pcmk_sched_colocation.c b/lib/pacemaker/pcmk_sched_colocation.c index 3472d28adc8..ce76c7c6dd0 100644 --- a/lib/pacemaker/pcmk_sched_colocation.c +++ b/lib/pacemaker/pcmk_sched_colocation.c @@ -1417,7 +1417,9 @@ pcmk__apply_coloc_to_scores(pcmk_resource_t *dependent, if ((colocation->score <= -PCMK_SCORE_INFINITY) || (colocation->score >= PCMK_SCORE_INFINITY) - || pcmk__any_node_available(work)) { + || pcmk__any_node_available(work, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { g_hash_table_destroy(dependent->priv->allowed_nodes); dependent->priv->allowed_nodes = work; @@ -1839,7 +1841,9 @@ pcmk__add_colocated_node_scores(pcmk_resource_t *source_rsc, return; } - if (pcmk__any_node_available(work)) { + if (pcmk__any_node_available(work, pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { GList *colocations = NULL; if (pcmk_is_set(flags, pcmk__coloc_select_this_with)) { diff --git a/lib/pacemaker/pcmk_sched_nodes.c b/lib/pacemaker/pcmk_sched_nodes.c index 5c9adc8fecf..8a05ff6410c 100644 --- a/lib/pacemaker/pcmk_sched_nodes.c +++ b/lib/pacemaker/pcmk_sched_nodes.c @@ -356,12 +356,13 @@ pcmk__sort_nodes(GList *nodes, pcmk_node_t *active_node) * \brief Check whether any node is available to run resources * * \param[in] nodes Nodes to check + * \param[in] flags Group of enum pcmk__node_availability flags * - * \return true if any node in \p nodes is available to run resources, - * otherwise false + * \return true if any node in \p nodes is available to run resources + * per flags, otherwise false */ bool -pcmk__any_node_available(GHashTable *nodes) +pcmk__any_node_available(GHashTable *nodes, uint32_t flags) { GHashTableIter iter; const pcmk_node_t *node = NULL; @@ -371,9 +372,7 @@ pcmk__any_node_available(GHashTable *nodes) } g_hash_table_iter_init(&iter, nodes); while (g_hash_table_iter_next(&iter, NULL, (void **) &node)) { - if (pcmk__node_available(node, pcmk__node_alive - |pcmk__node_usable - |pcmk__node_no_negative)) { + if (pcmk__node_available(node, flags)) { return true; } } diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c index 324c204d8f3..80668582df1 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c @@ -329,7 +329,10 @@ apply_this_with(pcmk__colocation_t *colocation, pcmk_resource_t *rsc) // Apply the colocation score to this resource's allowed node scores rsc->priv->cmds->apply_coloc_score(rsc, other, colocation, true); if ((archive != NULL) - && !pcmk__any_node_available(rsc->priv->allowed_nodes)) { + && !pcmk__any_node_available(rsc->priv->allowed_nodes, + pcmk__node_alive + |pcmk__node_usable + |pcmk__node_no_negative)) { pcmk__rsc_info(rsc, "%s: Reverting scores from colocation with %s " "because no nodes allowed", From 72e5f983e9f08accc4d832cc980cb13130e6c3a2 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:31:33 -0600 Subject: [PATCH 09/10] Doc: scheduler: add TODO --- lib/pacemaker/pcmk_sched_colocation.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/pacemaker/pcmk_sched_colocation.c b/lib/pacemaker/pcmk_sched_colocation.c index ce76c7c6dd0..770eab09478 100644 --- a/lib/pacemaker/pcmk_sched_colocation.c +++ b/lib/pacemaker/pcmk_sched_colocation.c @@ -1841,6 +1841,11 @@ pcmk__add_colocated_node_scores(pcmk_resource_t *source_rsc, return; } + /* @TODO Using pcmk__node_banned here instead of pcmk__node_no_negative + * should allow more dependents to be active. Investigate the results of + * that on existing regression tests and come up with a new one that + * is targeted to it. + */ if (pcmk__any_node_available(work, pcmk__node_alive |pcmk__node_usable |pcmk__node_no_negative)) { From 03559afce74f3e9449e2528ff89d974c02a33681 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 15 Jan 2025 09:53:47 -0600 Subject: [PATCH 10/10] Refactor: scheduler: sort clone children only when needed Previously, clone children were sorted in pcmk__clone_create_probe(). However, the sort was only necessary when probing anonymous clones on nodes that wouldn't have an active instance, so now they are sorted only in that case, for a slight efficiency gain. --- cts/scheduler/exp/1494.exp | 4 +- cts/scheduler/exp/594.exp | 30 +-- cts/scheduler/exp/662.exp | 86 +++---- cts/scheduler/exp/797.exp | 70 +++--- cts/scheduler/exp/829.exp | 62 ++--- cts/scheduler/exp/a-demote-then-b-migrate.exp | 116 +++++----- .../exp/a-promote-then-b-migrate.exp | 80 +++---- cts/scheduler/exp/anon-instance-pending.exp | 112 ++++----- .../exp/anti-colocation-unpromoted.exp | 20 +- cts/scheduler/exp/asymmetric.exp | 12 +- cts/scheduler/exp/bug-1572-1.exp | 154 ++++++------- cts/scheduler/exp/bug-1572-2.exp | 92 ++++---- cts/scheduler/exp/bug-5143-ms-shuffle.exp | 68 +++--- .../exp/bug-5186-partial-migrate.exp | 12 +- cts/scheduler/exp/bug-cl-5168.exp | 68 +++--- cts/scheduler/exp/bug-cl-5247.exp | 124 +++++----- cts/scheduler/exp/bug-lf-2153.exp | 48 ++-- cts/scheduler/exp/bug-lf-2508.exp | 148 ++++++------ cts/scheduler/exp/bug-lf-2544.exp | 4 +- cts/scheduler/exp/bug-lf-2574.exp | 4 +- cts/scheduler/exp/bug-n-387749.exp | 60 ++--- cts/scheduler/exp/bug-pm-11.exp | 142 ++++++------ cts/scheduler/exp/bug-pm-12.exp | 178 +++++++------- cts/scheduler/exp/clone-anon-failcount.exp | 22 +- cts/scheduler/exp/clone-interleave-2.exp | 4 +- cts/scheduler/exp/clone-interleave-3.exp | 6 +- cts/scheduler/exp/clone-no-shuffle.exp | 100 ++++---- .../exp/clone-recover-no-shuffle-10.exp | 8 +- .../exp/clone-recover-no-shuffle-11.exp | 30 +-- .../exp/clone-recover-no-shuffle-7.exp | 72 +++--- .../exp/clone-recover-no-shuffle-8.exp | 212 ++++++++--------- cts/scheduler/exp/clone-require-all-4.exp | 4 +- cts/scheduler/exp/clone-require-all-6.exp | 4 +- .../exp/clone-require-all-no-interleave-3.exp | 14 +- .../exp/clone_min_interleave_stop_one.exp | 4 +- .../exp/clone_min_interleave_stop_two.exp | 4 +- cts/scheduler/exp/clone_min_stop_one.exp | 4 +- cts/scheduler/exp/clone_min_stop_two.exp | 8 +- cts/scheduler/exp/cloned-group.exp | 22 +- cts/scheduler/exp/cloned_start_one.exp | 16 +- cts/scheduler/exp/cloned_start_two.exp | 4 +- cts/scheduler/exp/cloned_stop_one.exp | 4 +- cts/scheduler/exp/cloned_stop_two.exp | 16 +- cts/scheduler/exp/colo_promoted_w_native.exp | 118 +++++----- .../exp/colo_unpromoted_w_native.exp | 118 +++++----- ...oc-optional-promoted-dependent-moves-2.exp | 52 ++--- cts/scheduler/exp/dc-fence-ordering.exp | 40 ++-- .../exp/failed-demote-recovery-promoted.exp | 174 +++++++------- cts/scheduler/exp/failed-probe-clone.exp | 20 +- cts/scheduler/exp/group-dependents.exp | 118 +++++----- cts/scheduler/exp/guest-node-cleanup.exp | 24 +- cts/scheduler/exp/inc10.exp | 64 ++--- cts/scheduler/exp/inc11.exp | 90 ++++---- cts/scheduler/exp/migrate-both-vms.exp | 62 ++--- cts/scheduler/exp/migrate-fencing.exp | 94 ++++---- cts/scheduler/exp/migrate-shutdown.exp | 34 +-- cts/scheduler/exp/notify-0.exp | 18 +- cts/scheduler/exp/notify-1.exp | 20 +- cts/scheduler/exp/notify-2.exp | 20 +- cts/scheduler/exp/notify-3.exp | 46 ++-- cts/scheduler/exp/on_fail_demote2.exp | 50 ++-- cts/scheduler/exp/promoted-1.exp | 122 +++++----- cts/scheduler/exp/promoted-10.exp | 218 +++++++++--------- cts/scheduler/exp/promoted-11.exp | 74 +++--- cts/scheduler/exp/promoted-2.exp | 184 +++++++-------- cts/scheduler/exp/promoted-3.exp | 162 ++++++------- cts/scheduler/exp/promoted-7.exp | 188 +++++++-------- cts/scheduler/exp/promoted-8.exp | 132 +++++------ cts/scheduler/exp/promoted-colocation.exp | 28 +-- cts/scheduler/exp/promoted-demote-2.exp | 64 ++--- cts/scheduler/exp/promoted-demote.exp | 60 ++--- .../exp/promoted-failed-demote-2.exp | 106 ++++----- cts/scheduler/exp/promoted-failed-demote.exp | 182 +++++++-------- cts/scheduler/exp/promoted-group.exp | 16 +- cts/scheduler/exp/promoted-move.exp | 116 +++++----- .../exp/promoted-partially-demoted-group.exp | 202 ++++++++-------- cts/scheduler/exp/promoted-with-blocked.exp | 100 ++++---- cts/scheduler/exp/rec-node-13.exp | 4 +- .../exp/remote-connection-unrecoverable.exp | 10 +- cts/scheduler/exp/remote-recover-all.exp | 136 +++++------ .../exp/remote-recover-connection.exp | 98 ++++---- .../exp/remote-recover-no-resources.exp | 98 ++++---- cts/scheduler/exp/remote-recover-unknown.exp | 98 ++++---- cts/scheduler/exp/remote-recovery.exp | 98 ++++---- cts/scheduler/exp/rsc-sets-clone.exp | 4 +- cts/scheduler/exp/rsc-sets-promoted.exp | 32 +-- cts/scheduler/exp/stonith-1.exp | 158 ++++++------- cts/scheduler/exp/stop-failure-no-quorum.exp | 4 +- .../exp/stop-failure-with-fencing.exp | 4 +- cts/scheduler/exp/ticket-promoted-17.exp | 4 +- cts/scheduler/exp/ticket-promoted-18.exp | 4 +- cts/scheduler/exp/ticket-promoted-2.exp | 30 +-- cts/scheduler/exp/ticket-promoted-20.exp | 4 +- cts/scheduler/exp/ticket-promoted-21.exp | 10 +- cts/scheduler/exp/ticket-promoted-23.exp | 4 +- cts/scheduler/exp/ticket-promoted-6.exp | 4 +- cts/scheduler/exp/ticket-promoted-9.exp | 10 +- cts/scheduler/exp/ticket-rsc-sets-10.exp | 4 +- cts/scheduler/exp/ticket-rsc-sets-13.exp | 4 +- cts/scheduler/exp/ticket-rsc-sets-14.exp | 4 +- cts/scheduler/exp/ticket-rsc-sets-3.exp | 4 +- cts/scheduler/exp/ticket-rsc-sets-7.exp | 4 +- cts/scheduler/exp/ticket-rsc-sets-9.exp | 4 +- cts/scheduler/summary/594.summary | 6 +- cts/scheduler/summary/662.summary | 4 +- cts/scheduler/summary/797.summary | 4 +- cts/scheduler/summary/829.summary | 2 +- .../summary/a-demote-then-b-migrate.summary | 14 +- .../summary/a-promote-then-b-migrate.summary | 4 +- .../summary/anon-instance-pending.summary | 6 +- .../anti-colocation-unpromoted.summary | 2 +- cts/scheduler/summary/asymmetric.summary | 2 +- cts/scheduler/summary/bug-1572-1.summary | 10 +- cts/scheduler/summary/bug-1572-2.summary | 8 +- .../summary/bug-5143-ms-shuffle.summary | 6 +- cts/scheduler/summary/bug-cl-5168.summary | 6 +- cts/scheduler/summary/bug-cl-5212.summary | 2 +- cts/scheduler/summary/bug-cl-5247.summary | 2 +- cts/scheduler/summary/bug-lf-2153.summary | 2 +- cts/scheduler/summary/bug-lf-2508.summary | 2 +- cts/scheduler/summary/bug-n-387749.summary | 4 +- cts/scheduler/summary/bug-pm-11.summary | 12 +- cts/scheduler/summary/bug-pm-12.summary | 14 +- .../summary/clone-no-shuffle.summary | 2 +- .../clone-recover-no-shuffle-7.summary | 4 +- .../clone-recover-no-shuffle-8.summary | 4 +- .../summary/cloned_start_one.summary | 4 +- cts/scheduler/summary/cloned_stop_two.summary | 4 +- .../summary/colo_promoted_w_native.summary | 10 +- .../summary/colo_unpromoted_w_native.summary | 10 +- ...ptional-promoted-dependent-moves-2.summary | 6 +- .../summary/dc-fence-ordering.summary | 4 +- .../failed-demote-recovery-promoted.summary | 8 +- .../summary/failed-probe-clone.summary | 2 +- .../summary/group-dependents.summary | 10 +- cts/scheduler/summary/inc10.summary | 2 +- cts/scheduler/summary/inc11.summary | 10 +- cts/scheduler/summary/migrate-fencing.summary | 2 +- .../summary/migrate-shutdown.summary | 4 +- cts/scheduler/summary/notify-3.summary | 2 +- cts/scheduler/summary/on_fail_demote2.summary | 6 +- cts/scheduler/summary/promoted-1.summary | 16 +- cts/scheduler/summary/promoted-10.summary | 16 +- cts/scheduler/summary/promoted-11.summary | 8 +- cts/scheduler/summary/promoted-2.summary | 14 +- cts/scheduler/summary/promoted-3.summary | 16 +- cts/scheduler/summary/promoted-7.summary | 6 +- cts/scheduler/summary/promoted-8.summary | 8 +- .../summary/promoted-demote-2.summary | 2 +- cts/scheduler/summary/promoted-demote.summary | 4 +- .../summary/promoted-failed-demote-2.summary | 2 +- .../summary/promoted-failed-demote.summary | 4 +- cts/scheduler/summary/promoted-move.summary | 14 +- .../promoted-partially-demoted-group.summary | 16 +- .../summary/promoted-with-blocked.summary | 6 +- .../summary/remote-recover-all.summary | 6 +- .../summary/remote-recover-connection.summary | 4 +- .../remote-recover-no-resources.summary | 4 +- .../summary/remote-recover-unknown.summary | 4 +- cts/scheduler/summary/remote-recovery.summary | 4 +- .../summary/rsc-sets-promoted.summary | 2 +- cts/scheduler/summary/stonith-1.summary | 12 +- .../summary/stop-failure-no-quorum.summary | 2 +- .../summary/stop-failure-with-fencing.summary | 2 +- .../summary/ticket-promoted-2.summary | 4 +- lib/pacemaker/pcmk_sched_clone.c | 4 +- 166 files changed, 3296 insertions(+), 3296 deletions(-) diff --git a/cts/scheduler/exp/1494.exp b/cts/scheduler/exp/1494.exp index 46820f74934..a2bfa50b6df 100644 --- a/cts/scheduler/exp/1494.exp +++ b/cts/scheduler/exp/1494.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/594.exp b/cts/scheduler/exp/594.exp index cef251ad320..deb0098283f 100644 --- a/cts/scheduler/exp/594.exp +++ b/cts/scheduler/exp/594.exp @@ -110,9 +110,9 @@ - - - + + + @@ -123,18 +123,18 @@ - - - + + + - - - + + + @@ -145,9 +145,9 @@ - - - + + + @@ -166,10 +166,10 @@ - + - + @@ -201,7 +201,7 @@ - + diff --git a/cts/scheduler/exp/662.exp b/cts/scheduler/exp/662.exp index 963f2fd258c..832d0ff0799 100644 --- a/cts/scheduler/exp/662.exp +++ b/cts/scheduler/exp/662.exp @@ -171,94 +171,94 @@ - - - + + + - - - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + + + + - - - + + + - - - + + + @@ -283,22 +283,22 @@ - + - + - + - + - + - + @@ -327,7 +327,7 @@ - + diff --git a/cts/scheduler/exp/797.exp b/cts/scheduler/exp/797.exp index d1e0de2ed0d..8fb6015d988 100644 --- a/cts/scheduler/exp/797.exp +++ b/cts/scheduler/exp/797.exp @@ -140,28 +140,18 @@ - - - + + + - - - - - - - - - - - + - - - + + + @@ -172,35 +162,41 @@ - + - + - + + + + + + + - + - + - + - - - + + + @@ -211,12 +207,16 @@ - - - + + + - + + + + + @@ -265,13 +265,13 @@ - + - + - + @@ -294,7 +294,7 @@ - + @@ -342,7 +342,7 @@ - + diff --git a/cts/scheduler/exp/829.exp b/cts/scheduler/exp/829.exp index 5d277e1bce0..480d34f5054 100644 --- a/cts/scheduler/exp/829.exp +++ b/cts/scheduler/exp/829.exp @@ -150,35 +150,14 @@ - - - - - - - - - - - - - - - - - - - - - - + - + @@ -187,7 +166,7 @@ - + @@ -196,7 +175,7 @@ - + @@ -205,15 +184,36 @@ - + - + + + + + + + + + + + + + + + + + + + + + + @@ -222,13 +222,13 @@ - + - + - + @@ -240,7 +240,7 @@ - + diff --git a/cts/scheduler/exp/a-demote-then-b-migrate.exp b/cts/scheduler/exp/a-demote-then-b-migrate.exp index 757149f93c5..a51df4e0f11 100644 --- a/cts/scheduler/exp/a-demote-then-b-migrate.exp +++ b/cts/scheduler/exp/a-demote-then-b-migrate.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -27,9 +27,9 @@ - - - + + + @@ -40,9 +40,9 @@ - - - + + + @@ -53,14 +53,14 @@ - - - + + + - + @@ -72,34 +72,34 @@ - - - + + + - + - + - - - + + + - - - + + + @@ -110,9 +110,9 @@ - - - + + + @@ -123,9 +123,9 @@ - - - + + + @@ -136,9 +136,9 @@ - - - + + + @@ -149,14 +149,14 @@ - - - + + + - + @@ -168,25 +168,25 @@ - - - + + + - + - + - - - + + + @@ -202,10 +202,10 @@ - + - + @@ -235,10 +235,10 @@ - + - + @@ -258,7 +258,7 @@ - + @@ -288,10 +288,10 @@ - + - + @@ -321,10 +321,10 @@ - + - + @@ -348,7 +348,7 @@ - + diff --git a/cts/scheduler/exp/a-promote-then-b-migrate.exp b/cts/scheduler/exp/a-promote-then-b-migrate.exp index bca053399f2..118e5f2e91e 100644 --- a/cts/scheduler/exp/a-promote-then-b-migrate.exp +++ b/cts/scheduler/exp/a-promote-then-b-migrate.exp @@ -1,33 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -38,9 +12,9 @@ - + - + @@ -51,25 +25,25 @@ - + - + - + - + - + @@ -83,7 +57,7 @@ - + @@ -92,6 +66,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,10 +103,10 @@ - + - + @@ -136,10 +136,10 @@ - + - + @@ -159,7 +159,7 @@ - + diff --git a/cts/scheduler/exp/anon-instance-pending.exp b/cts/scheduler/exp/anon-instance-pending.exp index 3acba37c55b..4370a85c7e0 100644 --- a/cts/scheduler/exp/anon-instance-pending.exp +++ b/cts/scheduler/exp/anon-instance-pending.exp @@ -27,22 +27,22 @@ - - - + + + - + - - - + + + @@ -53,22 +53,22 @@ - - - + + + - + - - - + + + @@ -79,22 +79,22 @@ - - - + + + - + - - - + + + @@ -105,22 +105,22 @@ - - - + + + - + - - - + + + @@ -131,22 +131,22 @@ - - - + + + - + - - - + + + @@ -157,22 +157,22 @@ - - - + + + - + - - - + + + @@ -183,22 +183,22 @@ - - - + + + - + - - - + + + @@ -218,25 +218,25 @@ - + - + - + - + - + - + - + diff --git a/cts/scheduler/exp/anti-colocation-unpromoted.exp b/cts/scheduler/exp/anti-colocation-unpromoted.exp index 8cf270e366d..3c40736efdb 100644 --- a/cts/scheduler/exp/anti-colocation-unpromoted.exp +++ b/cts/scheduler/exp/anti-colocation-unpromoted.exp @@ -1,27 +1,27 @@ - - - + + + - + - - - + + + - + @@ -33,7 +33,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/cts/scheduler/exp/asymmetric.exp b/cts/scheduler/exp/asymmetric.exp index 27ea8c562b7..d35a48a3b6f 100644 --- a/cts/scheduler/exp/asymmetric.exp +++ b/cts/scheduler/exp/asymmetric.exp @@ -1,18 +1,18 @@ - - - + + + - - - + + + diff --git a/cts/scheduler/exp/bug-1572-1.exp b/cts/scheduler/exp/bug-1572-1.exp index a5c7466ae7f..21714c0fdc8 100644 --- a/cts/scheduler/exp/bug-1572-1.exp +++ b/cts/scheduler/exp/bug-1572-1.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -25,171 +25,171 @@ - + - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + + + + - + - + - + - + - + - + - + + + + - + - - - + + + - - - - - - - + - - - + + + - - - - + - - - + + + - + - - - + + + - - - - + @@ -204,10 +204,10 @@ - + - + @@ -237,10 +237,10 @@ - + - + @@ -260,7 +260,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -416,10 +416,10 @@ - + - + @@ -500,10 +500,10 @@ - + - + @@ -759,7 +759,7 @@ - + diff --git a/cts/scheduler/exp/bug-1572-2.exp b/cts/scheduler/exp/bug-1572-2.exp index 23db4878f8b..68ea7c20fa6 100644 --- a/cts/scheduler/exp/bug-1572-2.exp +++ b/cts/scheduler/exp/bug-1572-2.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -25,76 +25,76 @@ - + - - - + + + - + - - - + + + - + - + - + - + - + - + - - - + + + - + - + - - - + + + - + - - - + + + @@ -105,14 +105,14 @@ - - - + + + - + @@ -127,10 +127,10 @@ - + - + @@ -160,10 +160,10 @@ - + - + @@ -183,7 +183,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -246,10 +246,10 @@ - + - + @@ -273,7 +273,7 @@ - + @@ -380,7 +380,7 @@ - + diff --git a/cts/scheduler/exp/bug-5143-ms-shuffle.exp b/cts/scheduler/exp/bug-5143-ms-shuffle.exp index 46454ca3c5b..fd7bdf35f78 100644 --- a/cts/scheduler/exp/bug-5143-ms-shuffle.exp +++ b/cts/scheduler/exp/bug-5143-ms-shuffle.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -27,69 +27,69 @@ - - - + + + + + + - + - + - + - + - + - - - + + + - + - - - + + + - - - - + - - - + + + - + @@ -104,10 +104,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + @@ -160,7 +160,7 @@ - + diff --git a/cts/scheduler/exp/bug-5186-partial-migrate.exp b/cts/scheduler/exp/bug-5186-partial-migrate.exp index ffacf34d8d0..c921bd09746 100644 --- a/cts/scheduler/exp/bug-5186-partial-migrate.exp +++ b/cts/scheduler/exp/bug-5186-partial-migrate.exp @@ -226,7 +226,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -331,7 +331,7 @@ - + diff --git a/cts/scheduler/exp/bug-cl-5168.exp b/cts/scheduler/exp/bug-cl-5168.exp index 7e9b39f8b10..84a9a9fd17d 100644 --- a/cts/scheduler/exp/bug-cl-5168.exp +++ b/cts/scheduler/exp/bug-cl-5168.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -27,69 +27,69 @@ - - - + + + + + + - + - + - + - + - + - - - + + + - + - - - + + + - - - - + - - - + + + - + @@ -104,10 +104,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + @@ -160,7 +160,7 @@ - + diff --git a/cts/scheduler/exp/bug-cl-5247.exp b/cts/scheduler/exp/bug-cl-5247.exp index 565f8c11207..37db10993e4 100644 --- a/cts/scheduler/exp/bug-cl-5247.exp +++ b/cts/scheduler/exp/bug-cl-5247.exp @@ -210,135 +210,135 @@ - - - + + + + - - - - + - + - - - + + + + - + - - - + + + + - - - - - - - + - + - - - + + + + - + - + - + - + - + - + + + + + + + - + - - - - + + + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + + + + - - - - + + + - - - - + - + @@ -403,7 +403,7 @@ - + @@ -487,7 +487,7 @@ - + diff --git a/cts/scheduler/exp/bug-lf-2153.exp b/cts/scheduler/exp/bug-lf-2153.exp index c7c0f1cbda5..1543052819f 100644 --- a/cts/scheduler/exp/bug-lf-2153.exp +++ b/cts/scheduler/exp/bug-lf-2153.exp @@ -1,53 +1,53 @@ - + - - - + + + - + - - - + + + - + - + - - - + + + - + - - - + + + - + @@ -62,7 +62,7 @@ - + @@ -92,10 +92,10 @@ - + - + @@ -115,7 +115,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -155,7 +155,7 @@ - + diff --git a/cts/scheduler/exp/bug-lf-2508.exp b/cts/scheduler/exp/bug-lf-2508.exp index 9cc9e447b22..2b016c30fff 100644 --- a/cts/scheduler/exp/bug-lf-2508.exp +++ b/cts/scheduler/exp/bug-lf-2508.exp @@ -154,25 +154,25 @@ - + - + - + - + - + @@ -184,28 +184,28 @@ - + - + - + - + - + @@ -217,7 +217,7 @@ - + @@ -234,123 +234,123 @@ - + - + - - - - + - + - + - - - + + + + + + + + + + + + + - - - - + - + - - - + + + + - + + + + - + - + - + + + + - + - + - + - + - - - - - - - - - - + - - - - + + + - + + + + - - - - + + + - - - - + @@ -362,7 +362,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -406,25 +406,25 @@ - + - + - + - + - + @@ -436,28 +436,28 @@ - + - + - + - + - + @@ -469,7 +469,7 @@ - + diff --git a/cts/scheduler/exp/bug-lf-2544.exp b/cts/scheduler/exp/bug-lf-2544.exp index e0193609d38..080e181604d 100644 --- a/cts/scheduler/exp/bug-lf-2544.exp +++ b/cts/scheduler/exp/bug-lf-2544.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/bug-lf-2574.exp b/cts/scheduler/exp/bug-lf-2574.exp index 7fb6327e271..f8d0b4e4cb7 100644 --- a/cts/scheduler/exp/bug-lf-2574.exp +++ b/cts/scheduler/exp/bug-lf-2574.exp @@ -36,7 +36,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/cts/scheduler/exp/bug-n-387749.exp b/cts/scheduler/exp/bug-n-387749.exp index 27a9ab5a9db..c34da7abeb2 100644 --- a/cts/scheduler/exp/bug-n-387749.exp +++ b/cts/scheduler/exp/bug-n-387749.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,31 +14,31 @@ - - - + + + - + - - - + + + - - - + + + @@ -49,22 +49,22 @@ - - - + + + - + - - - + + + @@ -89,10 +89,10 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -157,10 +157,10 @@ - + - + @@ -276,10 +276,10 @@ - + - + @@ -348,10 +348,10 @@ - + - + diff --git a/cts/scheduler/exp/bug-pm-11.exp b/cts/scheduler/exp/bug-pm-11.exp index b1354438f5b..e6efeb96a52 100644 --- a/cts/scheduler/exp/bug-pm-11.exp +++ b/cts/scheduler/exp/bug-pm-11.exp @@ -1,156 +1,156 @@ - + - - - - + - + - + - - - - + + + - + + + + - - - - + + + - + + + + + - - - + + + - + + + + + + + + - - - + + + + - + - - - + + + + - - - - - + - - - + + + + - - - - - - - - + - + - + + + + - - - - + + + - - - - + - - - + + + - + - - - + + + - - - + + + @@ -163,7 +163,7 @@ - + @@ -187,10 +187,10 @@ - + - + @@ -205,16 +205,16 @@ - + - + - + - + diff --git a/cts/scheduler/exp/bug-pm-12.exp b/cts/scheduler/exp/bug-pm-12.exp index 3b16119b82b..bc195e85470 100644 --- a/cts/scheduler/exp/bug-pm-12.exp +++ b/cts/scheduler/exp/bug-pm-12.exp @@ -1,256 +1,256 @@ - + - - - - + - + - + + + + - + - - - - + - + - - - - + - - - - + + + - + + + + - - - - + + + - - - - + - + - + + + + - + - + - + - - - + + + + - + + + + - - - + + + + - + + + + - - - + + + + - - - - + - - - + + + + - + + + + - + - + - + - + - - - - + - - - - + + + - + - + - - - - + + + - + - + - - - + + + - + - - - + + + - + - + @@ -262,7 +262,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -315,10 +315,10 @@ - + - + @@ -345,10 +345,10 @@ - + - + diff --git a/cts/scheduler/exp/clone-anon-failcount.exp b/cts/scheduler/exp/clone-anon-failcount.exp index 11b2efacc75..5e71c0e7e8e 100644 --- a/cts/scheduler/exp/clone-anon-failcount.exp +++ b/cts/scheduler/exp/clone-anon-failcount.exp @@ -398,25 +398,25 @@ - + - + - + - + - + @@ -428,30 +428,30 @@ - + - + - + - + - + @@ -466,7 +466,7 @@ - + diff --git a/cts/scheduler/exp/clone-interleave-2.exp b/cts/scheduler/exp/clone-interleave-2.exp index e6ab2e280a4..120f3398ad0 100644 --- a/cts/scheduler/exp/clone-interleave-2.exp +++ b/cts/scheduler/exp/clone-interleave-2.exp @@ -26,7 +26,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/cts/scheduler/exp/clone-interleave-3.exp b/cts/scheduler/exp/clone-interleave-3.exp index c88156a54bf..5f9539f3a32 100644 --- a/cts/scheduler/exp/clone-interleave-3.exp +++ b/cts/scheduler/exp/clone-interleave-3.exp @@ -26,7 +26,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/cts/scheduler/exp/clone-no-shuffle.exp b/cts/scheduler/exp/clone-no-shuffle.exp index 43b6ef4f57d..8c0a11ace26 100644 --- a/cts/scheduler/exp/clone-no-shuffle.exp +++ b/cts/scheduler/exp/clone-no-shuffle.exp @@ -35,122 +35,122 @@ - - - + + + - + - - - + + + - + + + + - - - + + + - + - - - + + + - - - - - - - - + - + - + - + - + - + - - - + + + - + - - - + + + - - - - + - - - + + + - + + + + - - - + + + - + + + + + @@ -213,7 +213,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -390,7 +390,7 @@ - + diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-10.exp b/cts/scheduler/exp/clone-recover-no-shuffle-10.exp index d1a5a3cb1ce..2a0a87dd3ea 100644 --- a/cts/scheduler/exp/clone-recover-no-shuffle-10.exp +++ b/cts/scheduler/exp/clone-recover-no-shuffle-10.exp @@ -1,20 +1,20 @@ - + - + - + @@ -33,7 +33,7 @@ - + diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-11.exp b/cts/scheduler/exp/clone-recover-no-shuffle-11.exp index 9d44a89f0f8..7bf3a3449a1 100644 --- a/cts/scheduler/exp/clone-recover-no-shuffle-11.exp +++ b/cts/scheduler/exp/clone-recover-no-shuffle-11.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -31,56 +31,56 @@ - + - + - + - + - + - + - + - + - + @@ -92,7 +92,7 @@ - + diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-7.exp b/cts/scheduler/exp/clone-recover-no-shuffle-7.exp index fa9059f93bd..bfb3666c2e8 100644 --- a/cts/scheduler/exp/clone-recover-no-shuffle-7.exp +++ b/cts/scheduler/exp/clone-recover-no-shuffle-7.exp @@ -1,86 +1,86 @@ - - - + + + - + + + + - - - + + + - + - + - - - + + + - + + + + + - - - + + + - - - - + - - - + + + - + - + - - - + + + - - - - - + @@ -90,7 +90,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-8.exp b/cts/scheduler/exp/clone-recover-no-shuffle-8.exp index df98313e1f4..690bd1eaaa2 100644 --- a/cts/scheduler/exp/clone-recover-no-shuffle-8.exp +++ b/cts/scheduler/exp/clone-recover-no-shuffle-8.exp @@ -1,262 +1,262 @@ - + - + - + - + - + - - - - + + + - + + + + + + + - - - - + + + - - - - - - - + - - - + + + - + + + + + + + + - - - + + + - + + + + - - - + + + - - - - + - - - + + + - + + + + + + + + - - - + + + + - + + + + - + - - - + + + + - + + + + - + - - - - + - + - + - + - - - + + + - - - - + - - - + + + - + + + + - + - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - - - - + - + - - - + + + - - - - - - - - + @@ -266,7 +266,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -316,7 +316,7 @@ - + diff --git a/cts/scheduler/exp/clone-require-all-4.exp b/cts/scheduler/exp/clone-require-all-4.exp index d3d6dca955b..5ba752f3df1 100644 --- a/cts/scheduler/exp/clone-require-all-4.exp +++ b/cts/scheduler/exp/clone-require-all-4.exp @@ -36,7 +36,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/cts/scheduler/exp/clone-require-all-6.exp b/cts/scheduler/exp/clone-require-all-6.exp index 183797779de..34015d1a366 100644 --- a/cts/scheduler/exp/clone-require-all-6.exp +++ b/cts/scheduler/exp/clone-require-all-6.exp @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/cts/scheduler/exp/clone-require-all-no-interleave-3.exp b/cts/scheduler/exp/clone-require-all-no-interleave-3.exp index 4b7f749eae0..69756486baf 100644 --- a/cts/scheduler/exp/clone-require-all-no-interleave-3.exp +++ b/cts/scheduler/exp/clone-require-all-no-interleave-3.exp @@ -196,27 +196,27 @@ - + - + - + - + @@ -225,7 +225,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -267,7 +267,7 @@ - + diff --git a/cts/scheduler/exp/clone_min_interleave_stop_one.exp b/cts/scheduler/exp/clone_min_interleave_stop_one.exp index 806ca43e559..2e13f48780b 100644 --- a/cts/scheduler/exp/clone_min_interleave_stop_one.exp +++ b/cts/scheduler/exp/clone_min_interleave_stop_one.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/clone_min_interleave_stop_two.exp b/cts/scheduler/exp/clone_min_interleave_stop_two.exp index 7cb61b7987c..d69fcd881d7 100644 --- a/cts/scheduler/exp/clone_min_interleave_stop_two.exp +++ b/cts/scheduler/exp/clone_min_interleave_stop_two.exp @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/cts/scheduler/exp/clone_min_stop_one.exp b/cts/scheduler/exp/clone_min_stop_one.exp index a1569ba43f9..198632a3cf0 100644 --- a/cts/scheduler/exp/clone_min_stop_one.exp +++ b/cts/scheduler/exp/clone_min_stop_one.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/clone_min_stop_two.exp b/cts/scheduler/exp/clone_min_stop_two.exp index 6638fe1acc4..7cb8cb00e0a 100644 --- a/cts/scheduler/exp/clone_min_stop_two.exp +++ b/cts/scheduler/exp/clone_min_stop_two.exp @@ -36,7 +36,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -68,10 +68,10 @@ - + - + diff --git a/cts/scheduler/exp/cloned-group.exp b/cts/scheduler/exp/cloned-group.exp index 5d0bbea23be..dc3280bd7b3 100644 --- a/cts/scheduler/exp/cloned-group.exp +++ b/cts/scheduler/exp/cloned-group.exp @@ -154,25 +154,25 @@ - + - + - + - + - + @@ -184,30 +184,30 @@ - + - + - + - + - + @@ -222,7 +222,7 @@ - + diff --git a/cts/scheduler/exp/cloned_start_one.exp b/cts/scheduler/exp/cloned_start_one.exp index bc2eacddfdd..47d9e2398e8 100644 --- a/cts/scheduler/exp/cloned_start_one.exp +++ b/cts/scheduler/exp/cloned_start_one.exp @@ -50,9 +50,9 @@ - - - + + + @@ -63,9 +63,9 @@ - - - + + + @@ -82,10 +82,10 @@ - + - + diff --git a/cts/scheduler/exp/cloned_start_two.exp b/cts/scheduler/exp/cloned_start_two.exp index 369fa8468d3..fb84e31c71d 100644 --- a/cts/scheduler/exp/cloned_start_two.exp +++ b/cts/scheduler/exp/cloned_start_two.exp @@ -79,7 +79,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/cts/scheduler/exp/cloned_stop_one.exp b/cts/scheduler/exp/cloned_stop_one.exp index f87b3f4ace7..b8178e5294a 100644 --- a/cts/scheduler/exp/cloned_stop_one.exp +++ b/cts/scheduler/exp/cloned_stop_one.exp @@ -65,7 +65,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/cts/scheduler/exp/cloned_stop_two.exp b/cts/scheduler/exp/cloned_stop_two.exp index df49ab2be9a..67aeb94d2a3 100644 --- a/cts/scheduler/exp/cloned_stop_two.exp +++ b/cts/scheduler/exp/cloned_stop_two.exp @@ -81,9 +81,9 @@ - - - + + + @@ -94,9 +94,9 @@ - - - + + + @@ -113,10 +113,10 @@ - + - + diff --git a/cts/scheduler/exp/colo_promoted_w_native.exp b/cts/scheduler/exp/colo_promoted_w_native.exp index 615c6ef97f9..97b28b07307 100644 --- a/cts/scheduler/exp/colo_promoted_w_native.exp +++ b/cts/scheduler/exp/colo_promoted_w_native.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -27,9 +27,9 @@ - - - + + + @@ -40,9 +40,9 @@ - - - + + + @@ -53,41 +53,34 @@ - - - + + + - - - - + - + - - - + + + - - - - - + - - - + + + @@ -98,9 +91,9 @@ - - - + + + @@ -111,9 +104,9 @@ - - - + + + @@ -124,9 +117,9 @@ - - - + + + @@ -137,28 +130,35 @@ - - - + + + - + - + + + + - - - + + + - + + + + + @@ -171,10 +171,10 @@ - + - + @@ -204,10 +204,10 @@ - + - + @@ -227,7 +227,7 @@ - + @@ -257,10 +257,10 @@ - + - + @@ -290,10 +290,10 @@ - + - + @@ -317,7 +317,7 @@ - + diff --git a/cts/scheduler/exp/colo_unpromoted_w_native.exp b/cts/scheduler/exp/colo_unpromoted_w_native.exp index e14c1ab3282..15dfd4c57c6 100644 --- a/cts/scheduler/exp/colo_unpromoted_w_native.exp +++ b/cts/scheduler/exp/colo_unpromoted_w_native.exp @@ -36,9 +36,9 @@ - - - + + + @@ -49,9 +49,9 @@ - - - + + + @@ -62,9 +62,9 @@ - - - + + + @@ -75,9 +75,9 @@ - - - + + + @@ -88,41 +88,34 @@ - - - + + + - - - - + - + - - - + + + - - - - - + - - - + + + @@ -133,9 +126,9 @@ - - - + + + @@ -146,9 +139,9 @@ - - - + + + @@ -159,9 +152,9 @@ - - - + + + @@ -172,28 +165,35 @@ - - - + + + - + - + + + + - - - + + + - + + + + + @@ -206,10 +206,10 @@ - + - + @@ -239,10 +239,10 @@ - + - + @@ -262,7 +262,7 @@ - + @@ -292,10 +292,10 @@ - + - + @@ -325,10 +325,10 @@ - + - + @@ -352,7 +352,7 @@ - + diff --git a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp index cad19276ce1..cf080f431f4 100644 --- a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp +++ b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp @@ -36,76 +36,76 @@ - - - + + + - + - - - + + + - + - + - - - + + + - - - + + + - + - - - + + + - + - + - - - + + + @@ -118,7 +118,7 @@ - + @@ -141,7 +141,7 @@ - + diff --git a/cts/scheduler/exp/dc-fence-ordering.exp b/cts/scheduler/exp/dc-fence-ordering.exp index b89efa91b4a..34a73569737 100644 --- a/cts/scheduler/exp/dc-fence-ordering.exp +++ b/cts/scheduler/exp/dc-fence-ordering.exp @@ -1,12 +1,17 @@ - - - - + + + + + + + + + @@ -14,7 +19,7 @@ - + @@ -23,25 +28,20 @@ - - - - + - - - + + + + - - - - + @@ -79,7 +79,7 @@ - + @@ -106,10 +106,10 @@ - + - + @@ -211,7 +211,7 @@ - + diff --git a/cts/scheduler/exp/failed-demote-recovery-promoted.exp b/cts/scheduler/exp/failed-demote-recovery-promoted.exp index 469c835aff2..d628b3949c6 100644 --- a/cts/scheduler/exp/failed-demote-recovery-promoted.exp +++ b/cts/scheduler/exp/failed-demote-recovery-promoted.exp @@ -1,9 +1,9 @@ - - - + + + @@ -14,9 +14,9 @@ - - - + + + @@ -25,174 +25,174 @@ - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + + + + + + + + + + - - - + + + - + + + + - + - + - + - + + + + - + - + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - - - - + - - - + + + - - - - + - + - - - + + + - - - - + - - - + + + - + @@ -207,10 +207,10 @@ - + - + @@ -240,10 +240,10 @@ - + - + @@ -270,7 +270,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -333,10 +333,10 @@ - + - + @@ -359,10 +359,10 @@ - + - + @@ -392,7 +392,7 @@ - + @@ -443,7 +443,7 @@ - + diff --git a/cts/scheduler/exp/failed-probe-clone.exp b/cts/scheduler/exp/failed-probe-clone.exp index 5fe1f04a709..39045867ac3 100644 --- a/cts/scheduler/exp/failed-probe-clone.exp +++ b/cts/scheduler/exp/failed-probe-clone.exp @@ -85,6 +85,15 @@ + + + + + + + + + @@ -97,7 +106,7 @@ - + @@ -106,15 +115,6 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/group-dependents.exp b/cts/scheduler/exp/group-dependents.exp index 62d2675762c..12b8c82dab1 100644 --- a/cts/scheduler/exp/group-dependents.exp +++ b/cts/scheduler/exp/group-dependents.exp @@ -1262,9 +1262,9 @@ - - - + + + @@ -1275,9 +1275,9 @@ - - - + + + @@ -1288,9 +1288,9 @@ - - - + + + @@ -1301,9 +1301,9 @@ - - - + + + @@ -1314,41 +1314,34 @@ - - - + + + - - - - + - + - - - + + + - - - - - + - - - + + + @@ -1359,9 +1352,9 @@ - - - + + + @@ -1372,9 +1365,9 @@ - - - + + + @@ -1385,9 +1378,9 @@ - - - + + + @@ -1398,28 +1391,35 @@ - - - + + + - + - + + + + - - - + + + - + + + + + @@ -1432,10 +1432,10 @@ - + - + @@ -1465,10 +1465,10 @@ - + - + @@ -1488,7 +1488,7 @@ - + @@ -1521,10 +1521,10 @@ - + - + @@ -1554,10 +1554,10 @@ - + - + @@ -1581,7 +1581,7 @@ - + diff --git a/cts/scheduler/exp/guest-node-cleanup.exp b/cts/scheduler/exp/guest-node-cleanup.exp index 72c40db7c36..dd0c99c9118 100644 --- a/cts/scheduler/exp/guest-node-cleanup.exp +++ b/cts/scheduler/exp/guest-node-cleanup.exp @@ -26,7 +26,7 @@ - + @@ -36,10 +36,10 @@ - + - + @@ -54,7 +54,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -79,13 +79,13 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -201,7 +201,7 @@ - + diff --git a/cts/scheduler/exp/inc10.exp b/cts/scheduler/exp/inc10.exp index 00351a08075..0b7e1de9cda 100644 --- a/cts/scheduler/exp/inc10.exp +++ b/cts/scheduler/exp/inc10.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -61,37 +61,37 @@ - + - - - + + + - + - - - + + + - + - - - + + + @@ -102,9 +102,9 @@ - - - + + + @@ -113,29 +113,29 @@ - + - - - + + + - + - - - + + + - + @@ -153,10 +153,10 @@ - + - + @@ -189,13 +189,13 @@ - + - + - + @@ -215,7 +215,7 @@ - + diff --git a/cts/scheduler/exp/inc11.exp b/cts/scheduler/exp/inc11.exp index c5237d8dac7..fbb80b104d4 100644 --- a/cts/scheduler/exp/inc11.exp +++ b/cts/scheduler/exp/inc11.exp @@ -47,65 +47,65 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - - - + + + - + - + - - - - - - - - + - - - + + + @@ -116,27 +116,27 @@ - - - + + + - - - + + + - - - + + + @@ -149,7 +149,7 @@ - + @@ -173,10 +173,10 @@ - + - + @@ -191,22 +191,22 @@ - + - + - + - + - + - + diff --git a/cts/scheduler/exp/migrate-both-vms.exp b/cts/scheduler/exp/migrate-both-vms.exp index fff13dbea27..c83ff7d8e4a 100644 --- a/cts/scheduler/exp/migrate-both-vms.exp +++ b/cts/scheduler/exp/migrate-both-vms.exp @@ -1,26 +1,26 @@ - + - + - + - + @@ -30,7 +30,7 @@ - + @@ -42,10 +42,10 @@ - + - + @@ -66,14 +66,14 @@ - + - + @@ -82,7 +82,7 @@ - + @@ -101,10 +101,10 @@ - + - + @@ -121,26 +121,26 @@ - + - + - + - + @@ -150,7 +150,7 @@ - + @@ -162,10 +162,10 @@ - + - + @@ -186,14 +186,14 @@ - + - + @@ -202,7 +202,7 @@ - + @@ -221,10 +221,10 @@ - + - + @@ -248,17 +248,17 @@ - + - + - + @@ -267,14 +267,14 @@ - + - + @@ -289,10 +289,10 @@ - + - + diff --git a/cts/scheduler/exp/migrate-fencing.exp b/cts/scheduler/exp/migrate-fencing.exp index a586284f2f2..22044bc8151 100644 --- a/cts/scheduler/exp/migrate-fencing.exp +++ b/cts/scheduler/exp/migrate-fencing.exp @@ -1,7 +1,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -437,7 +437,7 @@ - + @@ -458,83 +458,83 @@ - - - + + + + - - - - - - - + - - - + + + + - + - - - + + + - - - - - + - - - + + + + + + + + + + + - + + + + - - - - - - - - - - - - - + + + - + + + + + + + + @@ -544,7 +544,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -598,7 +598,7 @@ - + diff --git a/cts/scheduler/exp/migrate-shutdown.exp b/cts/scheduler/exp/migrate-shutdown.exp index 6a7071fed88..750e4f9eb17 100644 --- a/cts/scheduler/exp/migrate-shutdown.exp +++ b/cts/scheduler/exp/migrate-shutdown.exp @@ -210,12 +210,15 @@ - - - + + + + + + @@ -223,30 +226,27 @@ - + - - - - + - - - + + + - + @@ -271,7 +271,7 @@ - + @@ -298,10 +298,10 @@ - + - + @@ -388,7 +388,7 @@ - + @@ -415,7 +415,7 @@ - + diff --git a/cts/scheduler/exp/notify-0.exp b/cts/scheduler/exp/notify-0.exp index e9effa0f2ca..1f03e1879ec 100644 --- a/cts/scheduler/exp/notify-0.exp +++ b/cts/scheduler/exp/notify-0.exp @@ -49,6 +49,15 @@ + + + + + + + + + @@ -61,15 +70,6 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/notify-1.exp b/cts/scheduler/exp/notify-1.exp index f3760f6fed9..4f645248b5b 100644 --- a/cts/scheduler/exp/notify-1.exp +++ b/cts/scheduler/exp/notify-1.exp @@ -147,6 +147,15 @@ + + + + + + + + + @@ -159,7 +168,7 @@ - + @@ -172,15 +181,6 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/notify-2.exp b/cts/scheduler/exp/notify-2.exp index f3760f6fed9..4f645248b5b 100644 --- a/cts/scheduler/exp/notify-2.exp +++ b/cts/scheduler/exp/notify-2.exp @@ -147,6 +147,15 @@ + + + + + + + + + @@ -159,7 +168,7 @@ - + @@ -172,15 +181,6 @@ - - - - - - - - - diff --git a/cts/scheduler/exp/notify-3.exp b/cts/scheduler/exp/notify-3.exp index ada9ce5e45b..f028c11bbd7 100644 --- a/cts/scheduler/exp/notify-3.exp +++ b/cts/scheduler/exp/notify-3.exp @@ -310,6 +310,24 @@ + + + + + + + + + + + + + + + + + + @@ -322,7 +340,7 @@ - + @@ -335,33 +353,15 @@ - + - + - - - - - - - - - - - - - - - - - - @@ -423,10 +423,10 @@ - + - + diff --git a/cts/scheduler/exp/on_fail_demote2.exp b/cts/scheduler/exp/on_fail_demote2.exp index f7d16773fb3..c8f18b5869b 100644 --- a/cts/scheduler/exp/on_fail_demote2.exp +++ b/cts/scheduler/exp/on_fail_demote2.exp @@ -1,76 +1,76 @@ - - - + + + - + - - - + + + - + - + - - - + + + - - - + + + - + - - - + + + - + - + - - - + + + @@ -106,7 +106,7 @@ - + diff --git a/cts/scheduler/exp/promoted-1.exp b/cts/scheduler/exp/promoted-1.exp index b71965bb136..e0ef32f8fc6 100644 --- a/cts/scheduler/exp/promoted-1.exp +++ b/cts/scheduler/exp/promoted-1.exp @@ -1,56 +1,56 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - + - + - - - - - - - - + - - - + + + @@ -61,27 +61,27 @@ - - - + + + - - - + + + - - - + + + @@ -92,27 +92,27 @@ - - - + + + - - - + + + - - - + + + @@ -123,18 +123,18 @@ - - - + + + - - - + + + @@ -165,7 +165,7 @@ - + @@ -189,16 +189,16 @@ - + - + - + - + @@ -213,31 +213,31 @@ - + - + - + - + - + - + - + - + diff --git a/cts/scheduler/exp/promoted-10.exp b/cts/scheduler/exp/promoted-10.exp index 87be2f62c24..31bcb8d3349 100644 --- a/cts/scheduler/exp/promoted-10.exp +++ b/cts/scheduler/exp/promoted-10.exp @@ -109,9 +109,9 @@ - - - + + + @@ -122,9 +122,9 @@ - - - + + + @@ -135,9 +135,9 @@ - - - + + + @@ -148,14 +148,14 @@ - - - + + + - + @@ -167,9 +167,9 @@ - - - + + + @@ -180,27 +180,27 @@ - - - + + + - - - + + + - - - + + + @@ -211,9 +211,9 @@ - - - + + + @@ -224,9 +224,9 @@ - - - + + + @@ -237,14 +237,17 @@ - - - + + + - + + + + @@ -256,40 +259,56 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - + - + - + + + + + + + + + + @@ -298,11 +317,11 @@ - + - - - + + + @@ -311,11 +330,11 @@ - + - - - + + + @@ -324,19 +343,16 @@ - + - - - + + + - - - - + @@ -346,27 +362,11 @@ - - - - - - - - - - - - - - - - - - - + + + @@ -377,18 +377,18 @@ - - - + + + - - - + + + @@ -425,13 +425,13 @@ - + - + - + @@ -464,13 +464,13 @@ - + - + - + @@ -497,7 +497,7 @@ - + @@ -530,13 +530,13 @@ - + - + - + @@ -586,13 +586,13 @@ - + - + - + @@ -610,13 +610,13 @@ - + - + - + @@ -625,13 +625,13 @@ - + - + - + diff --git a/cts/scheduler/exp/promoted-11.exp b/cts/scheduler/exp/promoted-11.exp index 4a2e89630be..032bb00dbab 100644 --- a/cts/scheduler/exp/promoted-11.exp +++ b/cts/scheduler/exp/promoted-11.exp @@ -35,56 +35,56 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - + - + - - - - - - - - + - - - + + + @@ -95,18 +95,18 @@ - - - + + + - - - + + + @@ -119,7 +119,7 @@ - + @@ -143,10 +143,10 @@ - + - + @@ -161,16 +161,16 @@ - + - + - + - + diff --git a/cts/scheduler/exp/promoted-2.exp b/cts/scheduler/exp/promoted-2.exp index 31ce6deb054..a651ab3cc3c 100644 --- a/cts/scheduler/exp/promoted-2.exp +++ b/cts/scheduler/exp/promoted-2.exp @@ -87,9 +87,9 @@ - - - + + + @@ -100,9 +100,9 @@ - - - + + + @@ -113,9 +113,9 @@ - - - + + + @@ -126,9 +126,9 @@ - - - + + + @@ -139,27 +139,27 @@ - - - + + + - - - + + + - - - + + + @@ -170,9 +170,9 @@ - - - + + + @@ -183,9 +183,9 @@ - - - + + + @@ -196,95 +196,95 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - + - + - + - - - - - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - + - - - + + + @@ -295,18 +295,18 @@ - - - + + + - - - + + + @@ -343,13 +343,13 @@ - + - + - + @@ -382,13 +382,13 @@ - + - + - + @@ -415,7 +415,7 @@ - + @@ -448,13 +448,13 @@ - + - + - + @@ -504,13 +504,13 @@ - + - + - + @@ -528,13 +528,13 @@ - + - + - + @@ -543,13 +543,13 @@ - + - + - + diff --git a/cts/scheduler/exp/promoted-3.exp b/cts/scheduler/exp/promoted-3.exp index b71965bb136..92259d6406c 100644 --- a/cts/scheduler/exp/promoted-3.exp +++ b/cts/scheduler/exp/promoted-3.exp @@ -1,56 +1,56 @@ - - - + + + - + + + + - - - + + + - + + + + + - - - + + + - + - + - - - - - - - - + - - - + + + @@ -61,58 +61,45 @@ - - - + + + - - - + + + - - - + + + - - - - - + - - - + + + - - - - - - - - - - - - + + + @@ -121,38 +108,51 @@ + + + + + + + + + - - - + + + - - - + + + - + + + + + - - - + + + - - - + + + @@ -165,7 +165,7 @@ - + @@ -189,16 +189,16 @@ - + - + - + - + @@ -213,34 +213,34 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/cts/scheduler/exp/promoted-7.exp b/cts/scheduler/exp/promoted-7.exp index 773defeb461..5a3498e40cd 100644 --- a/cts/scheduler/exp/promoted-7.exp +++ b/cts/scheduler/exp/promoted-7.exp @@ -335,18 +335,6 @@ - - - - - - - - - - - - @@ -355,7 +343,7 @@ - + @@ -364,7 +352,7 @@ - + @@ -373,7 +361,7 @@ - + @@ -382,6 +370,18 @@ + + + + + + + + + + + + @@ -402,7 +402,7 @@ - + @@ -419,7 +419,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -428,16 +482,16 @@ - + - + - + @@ -450,9 +504,9 @@ - + - + @@ -465,87 +519,33 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -554,7 +554,7 @@ - + @@ -577,37 +577,37 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/cts/scheduler/exp/promoted-8.exp b/cts/scheduler/exp/promoted-8.exp index e5a19191eae..055dcfef14c 100644 --- a/cts/scheduler/exp/promoted-8.exp +++ b/cts/scheduler/exp/promoted-8.exp @@ -335,18 +335,6 @@ - - - - - - - - - - - - @@ -355,7 +343,7 @@ - + @@ -364,7 +352,7 @@ - + @@ -373,7 +361,7 @@ - + @@ -382,6 +370,18 @@ + + + + + + + + + + + + @@ -402,7 +402,7 @@ - + @@ -487,90 +487,90 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -606,34 +606,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -681,34 +681,34 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/cts/scheduler/exp/promoted-colocation.exp b/cts/scheduler/exp/promoted-colocation.exp index faf8f3d02ec..d317703a1f6 100644 --- a/cts/scheduler/exp/promoted-colocation.exp +++ b/cts/scheduler/exp/promoted-colocation.exp @@ -1,29 +1,20 @@ - - - - - - - - - - + - + - + - + @@ -34,6 +25,15 @@ + + + + + + + + + @@ -42,7 +42,7 @@ - + diff --git a/cts/scheduler/exp/promoted-demote-2.exp b/cts/scheduler/exp/promoted-demote-2.exp index d21a5ff69f1..471b1f5e70c 100644 --- a/cts/scheduler/exp/promoted-demote-2.exp +++ b/cts/scheduler/exp/promoted-demote-2.exp @@ -144,83 +144,83 @@ - - - + + + - + - - - + + + - + - + - - - + + + - - - - - + - - - + + + - + - - - + + + - + - + - - - + + + - + + + + + @@ -230,7 +230,7 @@ - + @@ -280,7 +280,7 @@ - + diff --git a/cts/scheduler/exp/promoted-demote.exp b/cts/scheduler/exp/promoted-demote.exp index 2df2140f4c7..0abcb7ebbfd 100644 --- a/cts/scheduler/exp/promoted-demote.exp +++ b/cts/scheduler/exp/promoted-demote.exp @@ -23,9 +23,9 @@ - - - + + + @@ -36,9 +36,9 @@ - - - + + + @@ -47,58 +47,58 @@ - + - + - + - + + + + - + - + - + - + - - - + + + - - - - + - - - + + + - + @@ -113,10 +113,10 @@ - + - + @@ -146,10 +146,10 @@ - + - + @@ -169,7 +169,7 @@ - + diff --git a/cts/scheduler/exp/promoted-failed-demote-2.exp b/cts/scheduler/exp/promoted-failed-demote-2.exp index 1565a998367..0398166d70c 100644 --- a/cts/scheduler/exp/promoted-failed-demote-2.exp +++ b/cts/scheduler/exp/promoted-failed-demote-2.exp @@ -1,104 +1,105 @@ - + - + - + - + - + - - - + + + - + - - - + + + + - + - + - - - + + + + - - - - - + - - + + - + - - + + - + + + + - + - - + + @@ -106,44 +107,43 @@ - - - - + + + - + + + + - - - - + + + - - - - - - - + - - - + + + - + + + + + @@ -153,7 +153,7 @@ - + @@ -177,7 +177,7 @@ - + diff --git a/cts/scheduler/exp/promoted-failed-demote.exp b/cts/scheduler/exp/promoted-failed-demote.exp index 2451c202eff..324bfe14947 100644 --- a/cts/scheduler/exp/promoted-failed-demote.exp +++ b/cts/scheduler/exp/promoted-failed-demote.exp @@ -1,75 +1,22 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -79,7 +26,7 @@ - + @@ -92,7 +39,7 @@ - + @@ -105,9 +52,9 @@ - + - + @@ -118,9 +65,9 @@ - + - + @@ -131,16 +78,16 @@ - + - + - + @@ -150,9 +97,9 @@ - + - + @@ -162,11 +109,11 @@ - + - + @@ -175,7 +122,7 @@ - + @@ -188,7 +135,7 @@ - + @@ -201,9 +148,9 @@ - + - + @@ -214,9 +161,9 @@ - + - + @@ -227,16 +174,16 @@ - + - + - + @@ -246,9 +193,9 @@ - + - + @@ -258,14 +205,14 @@ - + - + - + @@ -274,6 +221,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -345,7 +345,7 @@ - + @@ -375,10 +375,10 @@ - + - + @@ -408,13 +408,13 @@ - + - + - + @@ -434,7 +434,7 @@ - + diff --git a/cts/scheduler/exp/promoted-group.exp b/cts/scheduler/exp/promoted-group.exp index 171f0991464..8b07c70c01f 100644 --- a/cts/scheduler/exp/promoted-group.exp +++ b/cts/scheduler/exp/promoted-group.exp @@ -1,19 +1,19 @@ - + - + - + @@ -25,20 +25,20 @@ - + - + - + @@ -48,7 +48,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/cts/scheduler/exp/promoted-move.exp b/cts/scheduler/exp/promoted-move.exp index 4ae4d4d2667..b6bddea05d0 100644 --- a/cts/scheduler/exp/promoted-move.exp +++ b/cts/scheduler/exp/promoted-move.exp @@ -182,9 +182,9 @@ - - - + + + @@ -195,9 +195,9 @@ - - - + + + @@ -208,9 +208,9 @@ - - - + + + @@ -221,9 +221,9 @@ - - - + + + @@ -234,14 +234,14 @@ - - - + + + - + @@ -253,34 +253,34 @@ - - - + + + - + - + - - - + + + - - - + + + @@ -291,9 +291,9 @@ - - - + + + @@ -304,9 +304,9 @@ - - - + + + @@ -317,9 +317,9 @@ - - - + + + @@ -330,14 +330,14 @@ - - - + + + - + @@ -349,25 +349,25 @@ - - - + + + - + - + - - - + + + @@ -383,10 +383,10 @@ - + - + @@ -416,10 +416,10 @@ - + - + @@ -439,7 +439,7 @@ - + @@ -472,10 +472,10 @@ - + - + @@ -505,10 +505,10 @@ - + - + @@ -532,7 +532,7 @@ - + diff --git a/cts/scheduler/exp/promoted-partially-demoted-group.exp b/cts/scheduler/exp/promoted-partially-demoted-group.exp index cd87291430d..47c9b3a1faf 100644 --- a/cts/scheduler/exp/promoted-partially-demoted-group.exp +++ b/cts/scheduler/exp/promoted-partially-demoted-group.exp @@ -310,134 +310,134 @@ - + - + - + - + - + - + - - - + + + + - + - - - + + + - + + + + - - - - + + + - + + + + - - - - - - - - - - + - - - - + - + - + - + - + - - - + + + - + - + - - - + + + - - - - + + + + + + + + + + @@ -446,7 +446,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -493,9 +493,9 @@ - - - + + + @@ -506,9 +506,9 @@ - - - + + + @@ -519,9 +519,9 @@ - - - + + + @@ -532,9 +532,9 @@ - - - + + + @@ -545,14 +545,14 @@ - - - + + + - + @@ -564,22 +564,22 @@ - - - + + + - + - - - + + + @@ -590,9 +590,9 @@ - - - + + + @@ -603,9 +603,9 @@ - - - + + + @@ -616,9 +616,9 @@ - - - + + + @@ -629,14 +629,14 @@ - - - + + + - + @@ -648,14 +648,14 @@ - - - + + + - + @@ -670,10 +670,10 @@ - + - + @@ -703,10 +703,10 @@ - + - + @@ -726,7 +726,7 @@ - + @@ -759,10 +759,10 @@ - + - + @@ -792,10 +792,10 @@ - + - + @@ -819,7 +819,7 @@ - + diff --git a/cts/scheduler/exp/promoted-with-blocked.exp b/cts/scheduler/exp/promoted-with-blocked.exp index 2b2fc6e26f7..12c778176c6 100644 --- a/cts/scheduler/exp/promoted-with-blocked.exp +++ b/cts/scheduler/exp/promoted-with-blocked.exp @@ -46,20 +46,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -70,7 +92,7 @@ - + @@ -79,22 +101,22 @@ - + - + - + - + - + @@ -105,7 +127,7 @@ - + @@ -114,22 +136,22 @@ - + - + - + - + - + @@ -140,7 +162,7 @@ - + @@ -149,22 +171,22 @@ - + - + - + - + - + @@ -175,7 +197,7 @@ - + @@ -184,28 +206,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -214,19 +214,19 @@ - + - + - + - + - + diff --git a/cts/scheduler/exp/rec-node-13.exp b/cts/scheduler/exp/rec-node-13.exp index 83825b599b3..c190cf66cb5 100644 --- a/cts/scheduler/exp/rec-node-13.exp +++ b/cts/scheduler/exp/rec-node-13.exp @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/cts/scheduler/exp/remote-connection-unrecoverable.exp b/cts/scheduler/exp/remote-connection-unrecoverable.exp index 878cf075748..3bfe2b56e2a 100644 --- a/cts/scheduler/exp/remote-connection-unrecoverable.exp +++ b/cts/scheduler/exp/remote-connection-unrecoverable.exp @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -172,7 +172,7 @@ - + diff --git a/cts/scheduler/exp/remote-recover-all.exp b/cts/scheduler/exp/remote-recover-all.exp index 24dd495ae4e..cd2cc98f0d0 100644 --- a/cts/scheduler/exp/remote-recover-all.exp +++ b/cts/scheduler/exp/remote-recover-all.exp @@ -249,13 +249,26 @@ - + + + + + + + + + + + + + + - + @@ -265,9 +278,9 @@ - + - + @@ -280,19 +293,6 @@ - - - - - - - - - - - - - @@ -301,7 +301,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -346,106 +346,106 @@ - + - - - + + + + - - - - - - - + - - - + + + + - + + + + - - - + + + + - - - - + - + - - - + + + - + + + + - - - - + + + - + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + @@ -516,7 +516,7 @@ - + @@ -690,7 +690,7 @@ - + @@ -711,7 +711,7 @@ - + diff --git a/cts/scheduler/exp/remote-recover-connection.exp b/cts/scheduler/exp/remote-recover-connection.exp index efe8153cb5a..e6df2f23215 100644 --- a/cts/scheduler/exp/remote-recover-connection.exp +++ b/cts/scheduler/exp/remote-recover-connection.exp @@ -140,106 +140,106 @@ - + - - - + + + + - - - - - - - + - - - + + + + - + + + + - - - + + + + - - - - + - + - - - + + + - + + + + - - - - + + + - + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + @@ -310,7 +310,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -487,7 +487,7 @@ - + diff --git a/cts/scheduler/exp/remote-recover-no-resources.exp b/cts/scheduler/exp/remote-recover-no-resources.exp index f6f26fa464d..4e61e130e3b 100644 --- a/cts/scheduler/exp/remote-recover-no-resources.exp +++ b/cts/scheduler/exp/remote-recover-no-resources.exp @@ -257,106 +257,106 @@ - + - - - + + + + - - - - - - - + - - - + + + + - + + + + - - - + + + + - - - - + - + - - - + + + - + + + + - - - - + + + - + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + @@ -427,7 +427,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -613,7 +613,7 @@ - + diff --git a/cts/scheduler/exp/remote-recover-unknown.exp b/cts/scheduler/exp/remote-recover-unknown.exp index 16670f1562f..21bf6d47299 100644 --- a/cts/scheduler/exp/remote-recover-unknown.exp +++ b/cts/scheduler/exp/remote-recover-unknown.exp @@ -260,106 +260,106 @@ - + - - - + + + + - - - - - - - + - - - + + + + - + + + + - - - + + + + - - - - + - + - - - + + + - + + + + - - - - + + + - + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + @@ -430,7 +430,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -625,7 +625,7 @@ - + diff --git a/cts/scheduler/exp/remote-recovery.exp b/cts/scheduler/exp/remote-recovery.exp index efe8153cb5a..e6df2f23215 100644 --- a/cts/scheduler/exp/remote-recovery.exp +++ b/cts/scheduler/exp/remote-recovery.exp @@ -140,106 +140,106 @@ - + - - - + + + + - - - - - - - + - - - + + + + - + + + + - - - + + + + - - - - + - + - - - + + + - + + + + - - - - + + + - + - + + + + - + - - - - + + + - + - + - - - - + + + - + - + @@ -310,7 +310,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -487,7 +487,7 @@ - + diff --git a/cts/scheduler/exp/rsc-sets-clone.exp b/cts/scheduler/exp/rsc-sets-clone.exp index 0aefb4a8e4c..241b3f74735 100644 --- a/cts/scheduler/exp/rsc-sets-clone.exp +++ b/cts/scheduler/exp/rsc-sets-clone.exp @@ -45,7 +45,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/cts/scheduler/exp/rsc-sets-promoted.exp b/cts/scheduler/exp/rsc-sets-promoted.exp index fef2fcfbd35..d08b2dec511 100644 --- a/cts/scheduler/exp/rsc-sets-promoted.exp +++ b/cts/scheduler/exp/rsc-sets-promoted.exp @@ -1,43 +1,43 @@ - - - + + + - - - - + - + - + + + + - - - + + + - + @@ -49,7 +49,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/cts/scheduler/exp/stonith-1.exp b/cts/scheduler/exp/stonith-1.exp index 8941919e505..694d55c3b88 100644 --- a/cts/scheduler/exp/stonith-1.exp +++ b/cts/scheduler/exp/stonith-1.exp @@ -264,22 +264,22 @@ - - - + + + - + - - - + + + @@ -287,57 +287,46 @@ - + - - - - - - - - - - - + - + - - - - + + + - + - + - - - + + + - + - + - - - + + + @@ -345,17 +334,17 @@ - + - + - - + + @@ -367,24 +356,24 @@ - + - - - + + + - + - + - - - + + + @@ -396,24 +385,24 @@ - + - - - + + + - + - + - - - + + + @@ -425,24 +414,24 @@ - + - - - + + + - + - + - - - + + + @@ -450,25 +439,36 @@ - + + + + + + + + + + + - + - - - + + + + - + @@ -480,10 +480,10 @@ - + - + @@ -510,22 +510,22 @@ - + - + - + - + - + - + diff --git a/cts/scheduler/exp/stop-failure-no-quorum.exp b/cts/scheduler/exp/stop-failure-no-quorum.exp index ef1df3e0dc6..6d2b467a0bc 100644 --- a/cts/scheduler/exp/stop-failure-no-quorum.exp +++ b/cts/scheduler/exp/stop-failure-no-quorum.exp @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/cts/scheduler/exp/stop-failure-with-fencing.exp b/cts/scheduler/exp/stop-failure-with-fencing.exp index f8acf54fba6..536e49506b6 100644 --- a/cts/scheduler/exp/stop-failure-with-fencing.exp +++ b/cts/scheduler/exp/stop-failure-with-fencing.exp @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-17.exp b/cts/scheduler/exp/ticket-promoted-17.exp index cbdf478ad32..e50cb90139e 100644 --- a/cts/scheduler/exp/ticket-promoted-17.exp +++ b/cts/scheduler/exp/ticket-promoted-17.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-18.exp b/cts/scheduler/exp/ticket-promoted-18.exp index cbdf478ad32..e50cb90139e 100644 --- a/cts/scheduler/exp/ticket-promoted-18.exp +++ b/cts/scheduler/exp/ticket-promoted-18.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-2.exp b/cts/scheduler/exp/ticket-promoted-2.exp index 95246397ab0..434e5489ac8 100644 --- a/cts/scheduler/exp/ticket-promoted-2.exp +++ b/cts/scheduler/exp/ticket-promoted-2.exp @@ -1,38 +1,38 @@ - - - + + + - + + + + - + - - - - + - - - + + + @@ -49,7 +49,7 @@ - + @@ -73,10 +73,10 @@ - + - + diff --git a/cts/scheduler/exp/ticket-promoted-20.exp b/cts/scheduler/exp/ticket-promoted-20.exp index cbdf478ad32..e50cb90139e 100644 --- a/cts/scheduler/exp/ticket-promoted-20.exp +++ b/cts/scheduler/exp/ticket-promoted-20.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-21.exp b/cts/scheduler/exp/ticket-promoted-21.exp index 943faeea51e..96e3d93087e 100644 --- a/cts/scheduler/exp/ticket-promoted-21.exp +++ b/cts/scheduler/exp/ticket-promoted-21.exp @@ -22,7 +22,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-23.exp b/cts/scheduler/exp/ticket-promoted-23.exp index cbdf478ad32..e50cb90139e 100644 --- a/cts/scheduler/exp/ticket-promoted-23.exp +++ b/cts/scheduler/exp/ticket-promoted-23.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-6.exp b/cts/scheduler/exp/ticket-promoted-6.exp index cbdf478ad32..e50cb90139e 100644 --- a/cts/scheduler/exp/ticket-promoted-6.exp +++ b/cts/scheduler/exp/ticket-promoted-6.exp @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/cts/scheduler/exp/ticket-promoted-9.exp b/cts/scheduler/exp/ticket-promoted-9.exp index 943faeea51e..96e3d93087e 100644 --- a/cts/scheduler/exp/ticket-promoted-9.exp +++ b/cts/scheduler/exp/ticket-promoted-9.exp @@ -22,7 +22,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-10.exp b/cts/scheduler/exp/ticket-rsc-sets-10.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-10.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-10.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-13.exp b/cts/scheduler/exp/ticket-rsc-sets-13.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-13.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-13.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-14.exp b/cts/scheduler/exp/ticket-rsc-sets-14.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-14.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-14.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-3.exp b/cts/scheduler/exp/ticket-rsc-sets-3.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-3.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-3.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-7.exp b/cts/scheduler/exp/ticket-rsc-sets-7.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-7.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-7.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/exp/ticket-rsc-sets-9.exp b/cts/scheduler/exp/ticket-rsc-sets-9.exp index f8ba6090c11..7ea13525545 100644 --- a/cts/scheduler/exp/ticket-rsc-sets-9.exp +++ b/cts/scheduler/exp/ticket-rsc-sets-9.exp @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/cts/scheduler/summary/594.summary b/cts/scheduler/summary/594.summary index dc6db75e6e5..050986f7317 100644 --- a/cts/scheduler/summary/594.summary +++ b/cts/scheduler/summary/594.summary @@ -17,8 +17,8 @@ Transition Summary: * Fence (reboot) hadev3 'peer is no longer part of the cluster' * Move DcIPaddr ( hadev2 -> hadev1 ) * Move rsc_hadev2 ( hadev2 -> hadev1 ) - * Stop child_DoFencing:0 ( hadev2 ) due to node availability * Stop child_DoFencing:2 ( hadev1 ) due to node availability + * Stop child_DoFencing:0 ( hadev2 ) due to node availability Executing Cluster Transition: * Resource action: DcIPaddr stop on hadev2 @@ -26,14 +26,14 @@ Executing Cluster Transition: * Resource action: rsc_hadev3 monitor on hadev2 * Resource action: rsc_hadev2 stop on hadev2 * Resource action: rsc_hadev2 monitor on hadev1 - * Resource action: child_DoFencing:0 monitor on hadev1 * Resource action: child_DoFencing:2 monitor on hadev2 + * Resource action: child_DoFencing:0 monitor on hadev1 * Pseudo action: DoFencing_stop_0 * Fencing hadev3 (reboot) * Resource action: DcIPaddr start on hadev1 * Resource action: rsc_hadev2 start on hadev1 - * Resource action: child_DoFencing:0 stop on hadev2 * Resource action: child_DoFencing:2 stop on hadev1 + * Resource action: child_DoFencing:0 stop on hadev2 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on hadev2 * Resource action: DcIPaddr monitor=5000 on hadev1 diff --git a/cts/scheduler/summary/662.summary b/cts/scheduler/summary/662.summary index 1ad51a498b5..9fd2acb0374 100644 --- a/cts/scheduler/summary/662.summary +++ b/cts/scheduler/summary/662.summary @@ -34,8 +34,6 @@ Executing Cluster Transition: * Resource action: rsc_c001n03 monitor on c001n02 * Resource action: rsc_c001n04 monitor on c001n09 * Resource action: rsc_c001n04 monitor on c001n03 - * Resource action: child_DoFencing:0 monitor on c001n09 - * Resource action: child_DoFencing:0 monitor on c001n04 * Resource action: child_DoFencing:1 monitor on c001n04 * Resource action: child_DoFencing:1 monitor on c001n02 * Resource action: child_DoFencing:2 monitor on c001n09 @@ -43,6 +41,8 @@ Executing Cluster Transition: * Resource action: child_DoFencing:3 monitor on c001n04 * Resource action: child_DoFencing:3 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n02 + * Resource action: child_DoFencing:0 monitor on c001n09 + * Resource action: child_DoFencing:0 monitor on c001n04 * Pseudo action: DoFencing_stop_0 * Resource action: rsc_c001n02 start on c001n03 * Resource action: child_DoFencing:0 stop on c001n02 diff --git a/cts/scheduler/summary/797.summary b/cts/scheduler/summary/797.summary index d31572ba3db..c109543138c 100644 --- a/cts/scheduler/summary/797.summary +++ b/cts/scheduler/summary/797.summary @@ -21,8 +21,8 @@ Transition Summary: * Stop rsc_c001n02 ( c001n02 ) due to no quorum * Stop rsc_c001n03 ( c001n03 ) due to no quorum * Stop rsc_c001n01 ( c001n01 ) due to no quorum - * Restart child_DoFencing:0 ( c001n01 ) * Stop child_DoFencing:1 ( c001n02 ) due to node availability + * Restart child_DoFencing:0 ( c001n01 ) Executing Cluster Transition: * Resource action: DcIPaddr monitor on c001n02 @@ -45,9 +45,9 @@ Executing Cluster Transition: * Resource action: child_DoFencing:3 monitor on c001n01 * Pseudo action: DoFencing_stop_0 * Resource action: DcIPaddr delete on c001n03 + * Resource action: child_DoFencing:1 stop on c001n02 * Resource action: child_DoFencing:0 stop on c001n03 * Resource action: child_DoFencing:0 stop on c001n01 - * Resource action: child_DoFencing:1 stop on c001n02 * Pseudo action: DoFencing_stopped_0 * Pseudo action: DoFencing_start_0 * Cluster action: do_shutdown on c001n02 diff --git a/cts/scheduler/summary/829.summary b/cts/scheduler/summary/829.summary index f51849ea909..62011cbea1c 100644 --- a/cts/scheduler/summary/829.summary +++ b/cts/scheduler/summary/829.summary @@ -32,12 +32,12 @@ Executing Cluster Transition: * Resource action: rsc_c001n03 monitor on c001n01 * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 - * Resource action: child_DoFencing:0 monitor on c001n01 * Resource action: child_DoFencing:1 monitor on c001n01 * Resource action: child_DoFencing:2 monitor on c001n08 * Resource action: child_DoFencing:2 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n01 + * Resource action: child_DoFencing:0 monitor on c001n01 * Pseudo action: DoFencing_stop_0 * Fencing c001n02 (reboot) * Pseudo action: rsc_c001n02_stop_0 diff --git a/cts/scheduler/summary/a-demote-then-b-migrate.summary b/cts/scheduler/summary/a-demote-then-b-migrate.summary index 32c136e777e..67596de98a9 100644 --- a/cts/scheduler/summary/a-demote-then-b-migrate.summary +++ b/cts/scheduler/summary/a-demote-then-b-migrate.summary @@ -9,28 +9,28 @@ Current cluster status: * rsc2 (ocf:pacemaker:Dummy): Started node1 Transition Summary: - * Demote rsc1:0 ( Promoted -> Unpromoted node1 ) * Promote rsc1:1 ( Unpromoted -> Promoted node2 ) + * Demote rsc1:0 ( Promoted -> Unpromoted node1 ) * Migrate rsc2 ( node1 -> node2 ) Executing Cluster Transition: - * Resource action: rsc1:1 cancel=5000 on node1 * Resource action: rsc1:0 cancel=10000 on node2 + * Resource action: rsc1:1 cancel=5000 on node1 * Pseudo action: ms1_pre_notify_demote_0 - * Resource action: rsc1:1 notify on node1 * Resource action: rsc1:0 notify on node2 + * Resource action: rsc1:1 notify on node1 * Pseudo action: ms1_confirmed-pre_notify_demote_0 * Pseudo action: ms1_demote_0 * Resource action: rsc1:1 demote on node1 * Pseudo action: ms1_demoted_0 * Pseudo action: ms1_post_notify_demoted_0 - * Resource action: rsc1:1 notify on node1 * Resource action: rsc1:0 notify on node2 + * Resource action: rsc1:1 notify on node1 * Pseudo action: ms1_confirmed-post_notify_demoted_0 * Pseudo action: ms1_pre_notify_promote_0 * Resource action: rsc2 migrate_to on node1 - * Resource action: rsc1:1 notify on node1 * Resource action: rsc1:0 notify on node2 + * Resource action: rsc1:1 notify on node1 * Pseudo action: ms1_confirmed-pre_notify_promote_0 * Resource action: rsc2 migrate_from on node2 * Resource action: rsc2 stop on node1 @@ -40,11 +40,11 @@ Executing Cluster Transition: * Resource action: rsc1:0 promote on node2 * Pseudo action: ms1_promoted_0 * Pseudo action: ms1_post_notify_promoted_0 - * Resource action: rsc1:1 notify on node1 * Resource action: rsc1:0 notify on node2 + * Resource action: rsc1:1 notify on node1 * Pseudo action: ms1_confirmed-post_notify_promoted_0 - * Resource action: rsc1:1 monitor=10000 on node1 * Resource action: rsc1:0 monitor=5000 on node2 + * Resource action: rsc1:1 monitor=10000 on node1 Revised Cluster Status: * Node List: diff --git a/cts/scheduler/summary/a-promote-then-b-migrate.summary b/cts/scheduler/summary/a-promote-then-b-migrate.summary index 6489a4ff8e3..f4efa87ff93 100644 --- a/cts/scheduler/summary/a-promote-then-b-migrate.summary +++ b/cts/scheduler/summary/a-promote-then-b-migrate.summary @@ -15,15 +15,15 @@ Transition Summary: Executing Cluster Transition: * Resource action: rsc1:1 cancel=10000 on node2 * Pseudo action: ms1_pre_notify_promote_0 - * Resource action: rsc1:0 notify on node1 * Resource action: rsc1:1 notify on node2 + * Resource action: rsc1:0 notify on node1 * Pseudo action: ms1_confirmed-pre_notify_promote_0 * Pseudo action: ms1_promote_0 * Resource action: rsc1:1 promote on node2 * Pseudo action: ms1_promoted_0 * Pseudo action: ms1_post_notify_promoted_0 - * Resource action: rsc1:0 notify on node1 * Resource action: rsc1:1 notify on node2 + * Resource action: rsc1:0 notify on node1 * Pseudo action: ms1_confirmed-post_notify_promoted_0 * Resource action: rsc2 migrate_to on node1 * Resource action: rsc1:1 monitor=5000 on node2 diff --git a/cts/scheduler/summary/anon-instance-pending.summary b/cts/scheduler/summary/anon-instance-pending.summary index 379fbce6124..b2ea606eb33 100644 --- a/cts/scheduler/summary/anon-instance-pending.summary +++ b/cts/scheduler/summary/anon-instance-pending.summary @@ -30,13 +30,13 @@ Current cluster status: * Stopped: [ node4 node5 node6 node7 node8 node9 node10 node11 ] Transition Summary: - * Start clone1rsc:4 ( node9 ) * Start clone1rsc:5 ( node10 ) * Start clone1rsc:6 ( node11 ) * Start clone1rsc:7 ( node5 ) * Start clone1rsc:8 ( node6 ) * Start clone1rsc:9 ( node7 ) * Start clone1rsc:10 ( node8 ) + * Start clone1rsc:4 ( node9 ) * Start clone2rsc:2 ( node10 ) * Start clone2rsc:3 ( node11 ) * Start clone2rsc:4 ( node3 ) @@ -85,13 +85,13 @@ Executing Cluster Transition: * Pseudo action: clone4_stop_0 * Pseudo action: clone5_start_0 * Resource action: clone1rsc start on node4 - * Resource action: clone1rsc start on node9 * Resource action: clone1rsc start on node10 * Resource action: clone1rsc start on node11 * Resource action: clone1rsc start on node5 * Resource action: clone1rsc start on node6 * Resource action: clone1rsc start on node7 * Resource action: clone1rsc start on node8 + * Resource action: clone1rsc start on node9 * Pseudo action: clone1_running_0 * Resource action: clone2rsc start on node4 * Resource action: clone2rsc start on node10 @@ -147,13 +147,13 @@ Executing Cluster Transition: * Resource action: clone5rsc2 start on node8 * Resource action: clone5rsc3 start on node8 * Resource action: clone1rsc monitor=10000 on node4 - * Resource action: clone1rsc monitor=10000 on node9 * Resource action: clone1rsc monitor=10000 on node10 * Resource action: clone1rsc monitor=10000 on node11 * Resource action: clone1rsc monitor=10000 on node5 * Resource action: clone1rsc monitor=10000 on node6 * Resource action: clone1rsc monitor=10000 on node7 * Resource action: clone1rsc monitor=10000 on node8 + * Resource action: clone1rsc monitor=10000 on node9 * Resource action: clone2rsc monitor=10000 on node4 * Resource action: clone2rsc monitor=10000 on node10 * Resource action: clone2rsc monitor=10000 on node11 diff --git a/cts/scheduler/summary/anti-colocation-unpromoted.summary b/cts/scheduler/summary/anti-colocation-unpromoted.summary index a7087bc8192..5eb1b845da1 100644 --- a/cts/scheduler/summary/anti-colocation-unpromoted.summary +++ b/cts/scheduler/summary/anti-colocation-unpromoted.summary @@ -10,8 +10,8 @@ Current cluster status: * dummy1 (ocf:pacemaker:Dummy): Started sle12sp2-1 Transition Summary: - * Demote state1:0 ( Promoted -> Unpromoted sle12sp2-1 ) * Promote state1:1 ( Unpromoted -> Promoted sle12sp2-2 ) + * Demote state1:0 ( Promoted -> Unpromoted sle12sp2-1 ) * Move dummy1 ( sle12sp2-1 -> sle12sp2-2 ) Executing Cluster Transition: diff --git a/cts/scheduler/summary/asymmetric.summary b/cts/scheduler/summary/asymmetric.summary index f9c8f7e202f..e153caf03e4 100644 --- a/cts/scheduler/summary/asymmetric.summary +++ b/cts/scheduler/summary/asymmetric.summary @@ -12,8 +12,8 @@ Current cluster status: Transition Summary: Executing Cluster Transition: - * Resource action: ebe3fb6e-7778-426e-be58-190ab1ff3dd3:1 monitor=19000 on puma1 * Resource action: ebe3fb6e-7778-426e-be58-190ab1ff3dd3:0 monitor=20000 on puma3 + * Resource action: ebe3fb6e-7778-426e-be58-190ab1ff3dd3:1 monitor=19000 on puma1 * Resource action: drbd_target_poolA monitor on puma3 * Resource action: drbd_target_poolA monitor on puma1 diff --git a/cts/scheduler/summary/bug-1572-1.summary b/cts/scheduler/summary/bug-1572-1.summary index 16870b2286e..8a1517cf5bf 100644 --- a/cts/scheduler/summary/bug-1572-1.summary +++ b/cts/scheduler/summary/bug-1572-1.summary @@ -12,8 +12,8 @@ Current cluster status: * IPaddr_147_81_84_133 (ocf:heartbeat:IPaddr): Started arc-tkincaidlx.wsicorp.com Transition Summary: - * Stop rsc_drbd_7788:0 ( Unpromoted arc-dknightlx ) due to node availability * Restart rsc_drbd_7788:1 ( Promoted arc-tkincaidlx.wsicorp.com ) due to resource definition change + * Stop rsc_drbd_7788:0 ( Unpromoted arc-dknightlx ) due to node availability * Restart fs_mirror ( arc-tkincaidlx.wsicorp.com ) due to required ms_drbd_7788 notified * Restart pgsql_5555 ( arc-tkincaidlx.wsicorp.com ) due to required fs_mirror start * Restart IPaddr_147_81_84_133 ( arc-tkincaidlx.wsicorp.com ) due to required pgsql_5555 start @@ -22,8 +22,8 @@ Executing Cluster Transition: * Pseudo action: ms_drbd_7788_pre_notify_demote_0 * Pseudo action: grp_pgsql_mirror_stop_0 * Resource action: IPaddr_147_81_84_133 stop on arc-tkincaidlx.wsicorp.com - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-pre_notify_demote_0 * Resource action: pgsql_5555 stop on arc-tkincaidlx.wsicorp.com * Resource action: fs_mirror stop on arc-tkincaidlx.wsicorp.com @@ -32,16 +32,16 @@ Executing Cluster Transition: * Resource action: rsc_drbd_7788:1 demote on arc-tkincaidlx.wsicorp.com * Pseudo action: ms_drbd_7788_demoted_0 * Pseudo action: ms_drbd_7788_post_notify_demoted_0 - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-post_notify_demoted_0 * Pseudo action: ms_drbd_7788_pre_notify_stop_0 - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-pre_notify_stop_0 * Pseudo action: ms_drbd_7788_stop_0 - * Resource action: rsc_drbd_7788:0 stop on arc-dknightlx * Resource action: rsc_drbd_7788:1 stop on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 stop on arc-dknightlx * Pseudo action: ms_drbd_7788_stopped_0 * Cluster action: do_shutdown on arc-dknightlx * Pseudo action: ms_drbd_7788_post_notify_stopped_0 diff --git a/cts/scheduler/summary/bug-1572-2.summary b/cts/scheduler/summary/bug-1572-2.summary index c161239be2c..d68a7af02d2 100644 --- a/cts/scheduler/summary/bug-1572-2.summary +++ b/cts/scheduler/summary/bug-1572-2.summary @@ -12,8 +12,8 @@ Current cluster status: * IPaddr_147_81_84_133 (ocf:heartbeat:IPaddr): Started arc-tkincaidlx.wsicorp.com Transition Summary: - * Stop rsc_drbd_7788:0 ( Unpromoted arc-dknightlx ) due to node availability * Demote rsc_drbd_7788:1 ( Promoted -> Unpromoted arc-tkincaidlx.wsicorp.com ) + * Stop rsc_drbd_7788:0 ( Unpromoted arc-dknightlx ) due to node availability * Stop fs_mirror ( arc-tkincaidlx.wsicorp.com ) due to node availability * Stop pgsql_5555 ( arc-tkincaidlx.wsicorp.com ) due to node availability * Stop IPaddr_147_81_84_133 ( arc-tkincaidlx.wsicorp.com ) due to node availability @@ -22,8 +22,8 @@ Executing Cluster Transition: * Pseudo action: ms_drbd_7788_pre_notify_demote_0 * Pseudo action: grp_pgsql_mirror_stop_0 * Resource action: IPaddr_147_81_84_133 stop on arc-tkincaidlx.wsicorp.com - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-pre_notify_demote_0 * Resource action: pgsql_5555 stop on arc-tkincaidlx.wsicorp.com * Resource action: fs_mirror stop on arc-tkincaidlx.wsicorp.com @@ -32,12 +32,12 @@ Executing Cluster Transition: * Resource action: rsc_drbd_7788:1 demote on arc-tkincaidlx.wsicorp.com * Pseudo action: ms_drbd_7788_demoted_0 * Pseudo action: ms_drbd_7788_post_notify_demoted_0 - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-post_notify_demoted_0 * Pseudo action: ms_drbd_7788_pre_notify_stop_0 - * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com + * Resource action: rsc_drbd_7788:0 notify on arc-dknightlx * Pseudo action: ms_drbd_7788_confirmed-pre_notify_stop_0 * Pseudo action: ms_drbd_7788_stop_0 * Resource action: rsc_drbd_7788:0 stop on arc-dknightlx diff --git a/cts/scheduler/summary/bug-5143-ms-shuffle.summary b/cts/scheduler/summary/bug-5143-ms-shuffle.summary index 18f2566aa5c..37040d66705 100644 --- a/cts/scheduler/summary/bug-5143-ms-shuffle.summary +++ b/cts/scheduler/summary/bug-5143-ms-shuffle.summary @@ -34,18 +34,18 @@ Transition Summary: Executing Cluster Transition: * Pseudo action: ms-r1_pre_notify_promote_0 - * Resource action: drbd-r1 notify on hex-2 * Resource action: drbd-r1 notify on hex-3 + * Resource action: drbd-r1 notify on hex-2 * Pseudo action: ms-r1_confirmed-pre_notify_promote_0 * Pseudo action: ms-r1_promote_0 * Resource action: drbd-r1 promote on hex-3 * Pseudo action: ms-r1_promoted_0 * Pseudo action: ms-r1_post_notify_promoted_0 - * Resource action: drbd-r1 notify on hex-2 * Resource action: drbd-r1 notify on hex-3 + * Resource action: drbd-r1 notify on hex-2 * Pseudo action: ms-r1_confirmed-post_notify_promoted_0 - * Resource action: drbd-r1 monitor=29000 on hex-2 * Resource action: drbd-r1 monitor=31000 on hex-3 + * Resource action: drbd-r1 monitor=29000 on hex-2 Revised Cluster Status: * Node List: diff --git a/cts/scheduler/summary/bug-cl-5168.summary b/cts/scheduler/summary/bug-cl-5168.summary index 11064b0f4e2..5bc52c2a414 100644 --- a/cts/scheduler/summary/bug-cl-5168.summary +++ b/cts/scheduler/summary/bug-cl-5168.summary @@ -32,18 +32,18 @@ Transition Summary: Executing Cluster Transition: * Pseudo action: ms-r1_pre_notify_promote_0 - * Resource action: drbd-r1 notify on hex-2 * Resource action: drbd-r1 notify on hex-3 + * Resource action: drbd-r1 notify on hex-2 * Pseudo action: ms-r1_confirmed-pre_notify_promote_0 * Pseudo action: ms-r1_promote_0 * Resource action: drbd-r1 promote on hex-3 * Pseudo action: ms-r1_promoted_0 * Pseudo action: ms-r1_post_notify_promoted_0 - * Resource action: drbd-r1 notify on hex-2 * Resource action: drbd-r1 notify on hex-3 + * Resource action: drbd-r1 notify on hex-2 * Pseudo action: ms-r1_confirmed-post_notify_promoted_0 - * Resource action: drbd-r1 monitor=29000 on hex-2 * Resource action: drbd-r1 monitor=31000 on hex-3 + * Resource action: drbd-r1 monitor=29000 on hex-2 Revised Cluster Status: * Node List: diff --git a/cts/scheduler/summary/bug-cl-5212.summary b/cts/scheduler/summary/bug-cl-5212.summary index 7cbe97558b6..dd453d61f27 100644 --- a/cts/scheduler/summary/bug-cl-5212.summary +++ b/cts/scheduler/summary/bug-cl-5212.summary @@ -24,8 +24,8 @@ Transition Summary: * Stop prmStonith1-1 ( srv02 ) blocked * Stop prmStonith2-1 ( srv01 ) blocked * Stop prmStonith3-1 ( srv01 ) due to node availability (blocked) - * Stop pgsql:0 ( Unpromoted srv02 ) due to node availability (blocked) * Stop pgsql:1 ( Promoted srv01 ) due to node availability (blocked) + * Stop pgsql:0 ( Unpromoted srv02 ) due to node availability (blocked) * Stop prmPingd:0 ( srv02 ) due to node availability (blocked) * Stop prmPingd:1 ( srv01 ) due to node availability (blocked) diff --git a/cts/scheduler/summary/bug-cl-5247.summary b/cts/scheduler/summary/bug-cl-5247.summary index b18bdd8b919..09a56b81fc2 100644 --- a/cts/scheduler/summary/bug-cl-5247.summary +++ b/cts/scheduler/summary/bug-cl-5247.summary @@ -62,8 +62,8 @@ Executing Cluster Transition: * Resource action: vip-master monitor=10000 on pgsr01 * Resource action: vip-rep monitor=10000 on pgsr01 * Resource action: pgsql notify on pgsr01 - * Pseudo action: msPostgresql_confirmed-post_notify_stopped_0 * Pseudo action: pgsql_notified_0 + * Pseudo action: msPostgresql_confirmed-post_notify_stopped_0 * Resource action: pgsql monitor=9000 on pgsr01 Using the original execution date of: 2015-08-12 02:53:40Z diff --git a/cts/scheduler/summary/bug-lf-2153.summary b/cts/scheduler/summary/bug-lf-2153.summary index 631e73ac9be..af26a597148 100644 --- a/cts/scheduler/summary/bug-lf-2153.summary +++ b/cts/scheduler/summary/bug-lf-2153.summary @@ -25,8 +25,8 @@ Transition Summary: Executing Cluster Transition: * Pseudo action: ms_drbd_iscsivg01_pre_notify_stop_0 * Pseudo action: cl_tgtd_stop_0 - * Resource action: res_drbd_iscsivg01:0 notify on bob * Resource action: res_drbd_iscsivg01:1 notify on alice + * Resource action: res_drbd_iscsivg01:0 notify on bob * Pseudo action: ms_drbd_iscsivg01_confirmed-pre_notify_stop_0 * Pseudo action: ms_drbd_iscsivg01_stop_0 * Resource action: res_tgtd:0 stop on bob diff --git a/cts/scheduler/summary/bug-lf-2508.summary b/cts/scheduler/summary/bug-lf-2508.summary index 0563f737059..aceac593ff2 100644 --- a/cts/scheduler/summary/bug-lf-2508.summary +++ b/cts/scheduler/summary/bug-lf-2508.summary @@ -41,9 +41,9 @@ Transition Summary: * Move Dummy02 ( srv02 -> srv04 ) * Stop prmStonith1-1:1 ( srv02 ) due to node availability * Stop prmStonith1-3:1 ( srv02 ) due to node availability + * Start prmStonith3-3:1 ( srv01 ) * Stop prmStonith3-1:0 ( srv02 ) due to node availability * Stop prmStonith3-3:0 ( srv02 ) due to node availability - * Start prmStonith3-3:1 ( srv01 ) * Stop prmStonith4-1:1 ( srv02 ) due to node availability * Stop prmStonith4-3:1 ( srv02 ) due to node availability diff --git a/cts/scheduler/summary/bug-n-387749.summary b/cts/scheduler/summary/bug-n-387749.summary index 17275a12205..375ae86d26c 100644 --- a/cts/scheduler/summary/bug-n-387749.summary +++ b/cts/scheduler/summary/bug-n-387749.summary @@ -18,8 +18,8 @@ Transition Summary: * Move resource_nfsserver_single ( power720-2 -> power720-1 ) Executing Cluster Transition: - * Resource action: export_home_ocfs2:0 monitor on power720-1 * Resource action: export_home_ocfs2:1 monitor on power720-1 + * Resource action: export_home_ocfs2:0 monitor on power720-1 * Resource action: export_home_ocfs2:2 monitor on power720-1 * Pseudo action: export_home_ocfs2_clone_set_pre_notify_start_0 * Pseudo action: group_nfs_stop_0 @@ -34,8 +34,8 @@ Executing Cluster Transition: * Pseudo action: export_home_ocfs2_clone_set_running_0 * Pseudo action: group_nfs_stopped_0 * Pseudo action: export_home_ocfs2_clone_set_post_notify_running_0 - * Resource action: export_home_ocfs2:0 notify on power720-1 * Resource action: export_home_ocfs2:1 notify on power720-2 + * Resource action: export_home_ocfs2:0 notify on power720-1 * Pseudo action: export_home_ocfs2_clone_set_confirmed-post_notify_running_0 * Pseudo action: group_nfs_start_0 * Resource action: resource_ipaddr1_single start on power720-1 diff --git a/cts/scheduler/summary/bug-pm-11.summary b/cts/scheduler/summary/bug-pm-11.summary index c3f8f5b3af0..546d5cbb65f 100644 --- a/cts/scheduler/summary/bug-pm-11.summary +++ b/cts/scheduler/summary/bug-pm-11.summary @@ -12,21 +12,21 @@ Current cluster status: * stateful-2:1 (ocf:heartbeat:Stateful): Stopped Transition Summary: - * Start stateful-2:0 ( node-b ) * Promote stateful-2:1 ( Stopped -> Promoted node-a ) + * Start stateful-2:0 ( node-b ) Executing Cluster Transition: - * Resource action: stateful-2:0 monitor on node-b - * Resource action: stateful-2:0 monitor on node-a * Resource action: stateful-2:1 monitor on node-b * Resource action: stateful-2:1 monitor on node-a + * Resource action: stateful-2:0 monitor on node-b + * Resource action: stateful-2:0 monitor on node-a * Pseudo action: ms-sf_start_0 - * Pseudo action: group:0_start_0 - * Resource action: stateful-2:0 start on node-b * Pseudo action: group:1_start_0 * Resource action: stateful-2:1 start on node-a - * Pseudo action: group:0_running_0 + * Pseudo action: group:0_start_0 + * Resource action: stateful-2:0 start on node-b * Pseudo action: group:1_running_0 + * Pseudo action: group:0_running_0 * Pseudo action: ms-sf_running_0 * Pseudo action: ms-sf_promote_0 * Pseudo action: group:1_promote_0 diff --git a/cts/scheduler/summary/bug-pm-12.summary b/cts/scheduler/summary/bug-pm-12.summary index 8defffe8d68..422eb09f702 100644 --- a/cts/scheduler/summary/bug-pm-12.summary +++ b/cts/scheduler/summary/bug-pm-12.summary @@ -12,8 +12,8 @@ Current cluster status: * stateful-2:1 (ocf:heartbeat:Stateful): Promoted node-a Transition Summary: - * Restart stateful-2:0 ( Unpromoted node-b ) due to resource definition change * Restart stateful-2:1 ( Promoted node-a ) due to resource definition change + * Restart stateful-2:0 ( Unpromoted node-b ) due to resource definition change Executing Cluster Transition: * Pseudo action: ms-sf_demote_0 @@ -22,20 +22,20 @@ Executing Cluster Transition: * Pseudo action: group:1_demoted_0 * Pseudo action: ms-sf_demoted_0 * Pseudo action: ms-sf_stop_0 - * Pseudo action: group:0_stop_0 - * Resource action: stateful-2:0 stop on node-b * Pseudo action: group:1_stop_0 * Resource action: stateful-2:1 stop on node-a - * Pseudo action: group:0_stopped_0 + * Pseudo action: group:0_stop_0 + * Resource action: stateful-2:0 stop on node-b * Pseudo action: group:1_stopped_0 + * Pseudo action: group:0_stopped_0 * Pseudo action: ms-sf_stopped_0 * Pseudo action: ms-sf_start_0 - * Pseudo action: group:0_start_0 - * Resource action: stateful-2:0 start on node-b * Pseudo action: group:1_start_0 * Resource action: stateful-2:1 start on node-a - * Pseudo action: group:0_running_0 + * Pseudo action: group:0_start_0 + * Resource action: stateful-2:0 start on node-b * Pseudo action: group:1_running_0 + * Pseudo action: group:0_running_0 * Pseudo action: ms-sf_running_0 * Pseudo action: ms-sf_promote_0 * Pseudo action: group:1_promote_0 diff --git a/cts/scheduler/summary/clone-no-shuffle.summary b/cts/scheduler/summary/clone-no-shuffle.summary index e9b61b6f5f4..b9125c6941b 100644 --- a/cts/scheduler/summary/clone-no-shuffle.summary +++ b/cts/scheduler/summary/clone-no-shuffle.summary @@ -11,8 +11,8 @@ Current cluster status: Transition Summary: * Start stonith-1 ( dktest1sles10 ) - * Stop drbd1:0 ( Promoted dktest2sles10 ) due to node availability * Start drbd1:1 ( dktest1sles10 ) + * Stop drbd1:0 ( Promoted dktest2sles10 ) due to node availability * Stop testip ( dktest2sles10 ) due to node availability Executing Cluster Transition: diff --git a/cts/scheduler/summary/clone-recover-no-shuffle-7.summary b/cts/scheduler/summary/clone-recover-no-shuffle-7.summary index 77445700f04..8ec1a17f3fb 100644 --- a/cts/scheduler/summary/clone-recover-no-shuffle-7.summary +++ b/cts/scheduler/summary/clone-recover-no-shuffle-7.summary @@ -10,8 +10,8 @@ Current cluster status: * Stopped: [ node1 ] Transition Summary: - * Demote dummy:1 ( Promoted -> Unpromoted node2 ) * Promote dummy:2 ( Stopped -> Promoted node1 ) + * Demote dummy:1 ( Promoted -> Unpromoted node2 ) Executing Cluster Transition: * Resource action: dummy cancel=10000 on node2 @@ -19,8 +19,8 @@ Executing Cluster Transition: * Resource action: dummy demote on node2 * Pseudo action: dummy-clone_demoted_0 * Pseudo action: dummy-clone_start_0 - * Resource action: dummy monitor=11000 on node2 * Resource action: dummy start on node1 + * Resource action: dummy monitor=11000 on node2 * Pseudo action: dummy-clone_running_0 * Pseudo action: dummy-clone_promote_0 * Resource action: dummy promote on node1 diff --git a/cts/scheduler/summary/clone-recover-no-shuffle-8.summary b/cts/scheduler/summary/clone-recover-no-shuffle-8.summary index 878f24801dd..b52daea7564 100644 --- a/cts/scheduler/summary/clone-recover-no-shuffle-8.summary +++ b/cts/scheduler/summary/clone-recover-no-shuffle-8.summary @@ -10,10 +10,10 @@ Current cluster status: * Stopped: [ node1 ] Transition Summary: - * Demote rsc1:1 ( Promoted -> Unpromoted node2 ) - * Demote rsc2:1 ( Promoted -> Unpromoted node2 ) * Promote rsc1:2 ( Stopped -> Promoted node1 ) * Promote rsc2:2 ( Stopped -> Promoted node1 ) + * Demote rsc1:1 ( Promoted -> Unpromoted node2 ) + * Demote rsc2:1 ( Promoted -> Unpromoted node2 ) Executing Cluster Transition: * Resource action: rsc1 cancel=10000 on node2 diff --git a/cts/scheduler/summary/cloned_start_one.summary b/cts/scheduler/summary/cloned_start_one.summary index f3bed715c45..a37f86f0d5a 100644 --- a/cts/scheduler/summary/cloned_start_one.summary +++ b/cts/scheduler/summary/cloned_start_one.summary @@ -14,16 +14,16 @@ Current cluster status: Transition Summary: * Start FAKECLONE:0 ( c7auto1 ) - * Stop FAKECLONE2:0 ( c7auto3 ) due to node availability * Stop FAKECLONE2:1 ( c7auto4 ) due to unrunnable clone-one-or-more:order-FAKECLONE-clone-FAKECLONE2-clone-mandatory + * Stop FAKECLONE2:0 ( c7auto3 ) due to node availability Executing Cluster Transition: * Pseudo action: FAKECLONE-clone_start_0 * Pseudo action: FAKECLONE2-clone_stop_0 * Resource action: FAKECLONE start on c7auto1 * Pseudo action: FAKECLONE-clone_running_0 - * Resource action: FAKECLONE2 stop on c7auto3 * Resource action: FAKECLONE2 stop on c7auto4 + * Resource action: FAKECLONE2 stop on c7auto3 * Pseudo action: FAKECLONE2-clone_stopped_0 * Resource action: FAKECLONE monitor=10000 on c7auto1 diff --git a/cts/scheduler/summary/cloned_stop_two.summary b/cts/scheduler/summary/cloned_stop_two.summary index 53795f5488b..ad6c6804377 100644 --- a/cts/scheduler/summary/cloned_stop_two.summary +++ b/cts/scheduler/summary/cloned_stop_two.summary @@ -16,13 +16,13 @@ Current cluster status: Transition Summary: * Stop FAKECLONE:1 ( c7auto2 ) due to node availability * Stop FAKECLONE:2 ( c7auto3 ) due to node availability - * Stop FAKECLONE2:0 ( c7auto3 ) due to node availability * Stop FAKECLONE2:1 ( c7auto4 ) due to unrunnable clone-one-or-more:order-FAKECLONE-clone-FAKECLONE2-clone-mandatory + * Stop FAKECLONE2:0 ( c7auto3 ) due to node availability Executing Cluster Transition: * Pseudo action: FAKECLONE2-clone_stop_0 - * Resource action: FAKECLONE2 stop on c7auto3 * Resource action: FAKECLONE2 stop on c7auto4 + * Resource action: FAKECLONE2 stop on c7auto3 * Pseudo action: FAKECLONE2-clone_stopped_0 * Pseudo action: FAKECLONE-clone_stop_0 * Resource action: FAKECLONE stop on c7auto2 diff --git a/cts/scheduler/summary/colo_promoted_w_native.summary b/cts/scheduler/summary/colo_promoted_w_native.summary index ad67078d880..c463ca887f7 100644 --- a/cts/scheduler/summary/colo_promoted_w_native.summary +++ b/cts/scheduler/summary/colo_promoted_w_native.summary @@ -9,32 +9,32 @@ Current cluster status: * Unpromoted: [ node1 ] Transition Summary: - * Demote MS_RSC_NATIVE:0 ( Promoted -> Unpromoted node2 ) * Promote MS_RSC_NATIVE:1 ( Unpromoted -> Promoted node1 ) + * Demote MS_RSC_NATIVE:0 ( Promoted -> Unpromoted node2 ) Executing Cluster Transition: * Resource action: MS_RSC_NATIVE:1 cancel=15000 on node1 * Pseudo action: MS_RSC_pre_notify_demote_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-pre_notify_demote_0 * Pseudo action: MS_RSC_demote_0 * Resource action: MS_RSC_NATIVE:0 demote on node2 * Pseudo action: MS_RSC_demoted_0 * Pseudo action: MS_RSC_post_notify_demoted_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-post_notify_demoted_0 * Pseudo action: MS_RSC_pre_notify_promote_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-pre_notify_promote_0 * Pseudo action: MS_RSC_promote_0 * Resource action: MS_RSC_NATIVE:1 promote on node1 * Pseudo action: MS_RSC_promoted_0 * Pseudo action: MS_RSC_post_notify_promoted_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-post_notify_promoted_0 * Resource action: MS_RSC_NATIVE:0 monitor=15000 on node2 diff --git a/cts/scheduler/summary/colo_unpromoted_w_native.summary b/cts/scheduler/summary/colo_unpromoted_w_native.summary index 42df383b82d..c32d0768d36 100644 --- a/cts/scheduler/summary/colo_unpromoted_w_native.summary +++ b/cts/scheduler/summary/colo_unpromoted_w_native.summary @@ -10,35 +10,35 @@ Current cluster status: Transition Summary: * Move A ( node1 -> node2 ) - * Demote MS_RSC_NATIVE:0 ( Promoted -> Unpromoted node2 ) * Promote MS_RSC_NATIVE:1 ( Unpromoted -> Promoted node1 ) + * Demote MS_RSC_NATIVE:0 ( Promoted -> Unpromoted node2 ) Executing Cluster Transition: * Resource action: A stop on node1 * Resource action: MS_RSC_NATIVE:1 cancel=15000 on node1 * Pseudo action: MS_RSC_pre_notify_demote_0 * Resource action: A start on node2 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-pre_notify_demote_0 * Pseudo action: MS_RSC_demote_0 * Resource action: A monitor=10000 on node2 * Resource action: MS_RSC_NATIVE:0 demote on node2 * Pseudo action: MS_RSC_demoted_0 * Pseudo action: MS_RSC_post_notify_demoted_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-post_notify_demoted_0 * Pseudo action: MS_RSC_pre_notify_promote_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-pre_notify_promote_0 * Pseudo action: MS_RSC_promote_0 * Resource action: MS_RSC_NATIVE:1 promote on node1 * Pseudo action: MS_RSC_promoted_0 * Pseudo action: MS_RSC_post_notify_promoted_0 - * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 + * Resource action: MS_RSC_NATIVE:0 notify on node2 * Pseudo action: MS_RSC_confirmed-post_notify_promoted_0 * Resource action: MS_RSC_NATIVE:0 monitor=15000 on node2 diff --git a/cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary b/cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary index d7142d54fa4..d1e7b9247b6 100644 --- a/cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary +++ b/cts/scheduler/summary/coloc-optional-promoted-dependent-moves-2.summary @@ -10,21 +10,21 @@ Current cluster status: Transition Summary: * Move coloc_primary ( fastvm-fedora39-22 -> fastvm-fedora39-23 ) - * Demote coloc_dependent:0 ( Promoted -> Unpromoted fastvm-fedora39-22 ) * Promote coloc_dependent:1 ( Unpromoted -> Promoted fastvm-fedora39-23 ) + * Demote coloc_dependent:0 ( Promoted -> Unpromoted fastvm-fedora39-22 ) Executing Cluster Transition: * Resource action: coloc_primary stop on fastvm-fedora39-22 - * Resource action: coloc_dependent cancel=10000 on fastvm-fedora39-22 * Resource action: coloc_dependent cancel=11000 on fastvm-fedora39-23 + * Resource action: coloc_dependent cancel=10000 on fastvm-fedora39-22 * Pseudo action: coloc_dependent-clone_demote_0 * Resource action: coloc_primary start on fastvm-fedora39-23 * Resource action: coloc_dependent demote on fastvm-fedora39-22 * Pseudo action: coloc_dependent-clone_demoted_0 * Pseudo action: coloc_dependent-clone_promote_0 * Resource action: coloc_primary monitor=10000 on fastvm-fedora39-23 - * Resource action: coloc_dependent monitor=11000 on fastvm-fedora39-22 * Resource action: coloc_dependent promote on fastvm-fedora39-23 + * Resource action: coloc_dependent monitor=11000 on fastvm-fedora39-22 * Pseudo action: coloc_dependent-clone_promoted_0 * Resource action: coloc_dependent monitor=10000 on fastvm-fedora39-23 diff --git a/cts/scheduler/summary/dc-fence-ordering.summary b/cts/scheduler/summary/dc-fence-ordering.summary index 0261cad5978..ca349919410 100644 --- a/cts/scheduler/summary/dc-fence-ordering.summary +++ b/cts/scheduler/summary/dc-fence-ordering.summary @@ -29,8 +29,8 @@ Current cluster status: Transition Summary: * Fence (reboot) rhel7-1 'petulant failed there' - * Stop stateful-1:0 ( Unpromoted rhel7-5 ) due to node availability * Stop stateful-1:1 ( Promoted rhel7-1 ) due to node availability + * Stop stateful-1:0 ( Unpromoted rhel7-5 ) due to node availability * Stop stateful-1:2 ( Unpromoted rhel7-2 ) due to node availability * Stop stateful-1:3 ( Unpromoted rhel7-4 ) due to node availability * Stop r192.168.122.207 ( rhel7-1 ) due to node availability @@ -46,8 +46,8 @@ Executing Cluster Transition: * Pseudo action: stateful-1_demote_0 * Pseudo action: promotable-1_demoted_0 * Pseudo action: promotable-1_stop_0 - * Resource action: stateful-1 stop on rhel7-5 * Pseudo action: stateful-1_stop_0 + * Resource action: stateful-1 stop on rhel7-5 * Resource action: stateful-1 stop on rhel7-2 * Resource action: stateful-1 stop on rhel7-4 * Pseudo action: promotable-1_stopped_0 diff --git a/cts/scheduler/summary/failed-demote-recovery-promoted.summary b/cts/scheduler/summary/failed-demote-recovery-promoted.summary index 2d11c460508..44508081c56 100644 --- a/cts/scheduler/summary/failed-demote-recovery-promoted.summary +++ b/cts/scheduler/summary/failed-demote-recovery-promoted.summary @@ -15,8 +15,8 @@ Transition Summary: Executing Cluster Transition: * Pseudo action: DB2_HADR-master_pre_notify_stop_0 - * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Resource action: DB2_HADR notify on fastvm-rhel-7-4-96 + * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Pseudo action: DB2_HADR-master_confirmed-pre_notify_stop_0 * Pseudo action: DB2_HADR-master_stop_0 * Resource action: DB2_HADR stop on fastvm-rhel-7-4-96 @@ -31,19 +31,19 @@ Executing Cluster Transition: * Resource action: DB2_HADR start on fastvm-rhel-7-4-96 * Pseudo action: DB2_HADR-master_running_0 * Pseudo action: DB2_HADR-master_post_notify_running_0 - * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Resource action: DB2_HADR notify on fastvm-rhel-7-4-96 + * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Pseudo action: DB2_HADR-master_confirmed-post_notify_running_0 * Pseudo action: DB2_HADR-master_pre_notify_promote_0 - * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Resource action: DB2_HADR notify on fastvm-rhel-7-4-96 + * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Pseudo action: DB2_HADR-master_confirmed-pre_notify_promote_0 * Pseudo action: DB2_HADR-master_promote_0 * Resource action: DB2_HADR promote on fastvm-rhel-7-4-96 * Pseudo action: DB2_HADR-master_promoted_0 * Pseudo action: DB2_HADR-master_post_notify_promoted_0 - * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Resource action: DB2_HADR notify on fastvm-rhel-7-4-96 + * Resource action: DB2_HADR notify on fastvm-rhel-7-4-95 * Pseudo action: DB2_HADR-master_confirmed-post_notify_promoted_0 * Resource action: DB2_HADR monitor=22000 on fastvm-rhel-7-4-96 Using the original execution date of: 2017-11-30 12:37:50Z diff --git a/cts/scheduler/summary/failed-probe-clone.summary b/cts/scheduler/summary/failed-probe-clone.summary index 90d4b790ffb..1a0e2b45bb7 100644 --- a/cts/scheduler/summary/failed-probe-clone.summary +++ b/cts/scheduler/summary/failed-probe-clone.summary @@ -23,8 +23,8 @@ Executing Cluster Transition: * Cluster action: clear_failcount for ping-2 on cluster02 * Cluster action: clear_failcount for ping-2 on cluster01 * Pseudo action: ping-2-clone_start_0 - * Cluster action: clear_failcount for ping-3 on cluster01 * Cluster action: clear_failcount for ping-3 on cluster02 + * Cluster action: clear_failcount for ping-3 on cluster01 * Pseudo action: ping-3-clone_stop_0 * Resource action: ping-2 start on cluster02 * Pseudo action: ping-2-clone_running_0 diff --git a/cts/scheduler/summary/group-dependents.summary b/cts/scheduler/summary/group-dependents.summary index 33652555477..aad38ceed5b 100644 --- a/cts/scheduler/summary/group-dependents.summary +++ b/cts/scheduler/summary/group-dependents.summary @@ -49,8 +49,8 @@ Transition Summary: * Migrate ip_voip_vlan855 ( asttest1 -> asttest2 ) * Migrate ip_voip_vlan856 ( asttest1 -> asttest2 ) * Move fs_drbd ( asttest1 -> asttest2 ) - * Demote drbd:0 ( Promoted -> Unpromoted asttest1 ) * Promote drbd:1 ( Unpromoted -> Promoted asttest2 ) + * Demote drbd:0 ( Promoted -> Unpromoted asttest1 ) Executing Cluster Transition: * Pseudo action: voip_stop_0 @@ -79,8 +79,8 @@ Executing Cluster Transition: * Resource action: ip_voip_vlan854 migrate_from on asttest2 * Resource action: ip_voip_vlan855 migrate_from on asttest2 * Resource action: ip_voip_vlan856 migrate_from on asttest2 - * Resource action: drbd:0 notify on asttest1 * Resource action: drbd:1 notify on asttest2 + * Resource action: drbd:0 notify on asttest1 * Pseudo action: ms_drbd_confirmed-pre_notify_demote_0 * Resource action: dahdi migrate_from on asttest2 * Resource action: dahdi stop on asttest1 @@ -105,19 +105,19 @@ Executing Cluster Transition: * Resource action: drbd:0 demote on asttest1 * Pseudo action: ms_drbd_demoted_0 * Pseudo action: ms_drbd_post_notify_demoted_0 - * Resource action: drbd:0 notify on asttest1 * Resource action: drbd:1 notify on asttest2 + * Resource action: drbd:0 notify on asttest1 * Pseudo action: ms_drbd_confirmed-post_notify_demoted_0 * Pseudo action: ms_drbd_pre_notify_promote_0 - * Resource action: drbd:0 notify on asttest1 * Resource action: drbd:1 notify on asttest2 + * Resource action: drbd:0 notify on asttest1 * Pseudo action: ms_drbd_confirmed-pre_notify_promote_0 * Pseudo action: ms_drbd_promote_0 * Resource action: drbd:1 promote on asttest2 * Pseudo action: ms_drbd_promoted_0 * Pseudo action: ms_drbd_post_notify_promoted_0 - * Resource action: drbd:0 notify on asttest1 * Resource action: drbd:1 notify on asttest2 + * Resource action: drbd:0 notify on asttest1 * Pseudo action: ms_drbd_confirmed-post_notify_promoted_0 * Resource action: fs_drbd start on asttest2 * Resource action: drbd:0 monitor=31000 on asttest1 diff --git a/cts/scheduler/summary/inc10.summary b/cts/scheduler/summary/inc10.summary index 1037e6c5a67..0541374a10b 100644 --- a/cts/scheduler/summary/inc10.summary +++ b/cts/scheduler/summary/inc10.summary @@ -19,9 +19,9 @@ Executing Cluster Transition: * Resource action: child_DoFencing:2 stop on xen-2 * Pseudo action: DoFencing_stopped_0 * Resource action: ocfs2:1 notify on xen-3 - * Resource action: ocfs2:1 notify on xen-2 * Resource action: ocfs2:3 notify on xen-1 * Resource action: ocfs2:0 notify on xen-4 + * Resource action: ocfs2:1 notify on xen-2 * Pseudo action: ocfs2-clone_confirmed-pre_notify_stop_0 * Pseudo action: ocfs2-clone_stop_0 * Resource action: ocfs2:1 stop on xen-2 diff --git a/cts/scheduler/summary/inc11.summary b/cts/scheduler/summary/inc11.summary index 1149123210f..593ea773db3 100644 --- a/cts/scheduler/summary/inc11.summary +++ b/cts/scheduler/summary/inc11.summary @@ -10,23 +10,23 @@ Current cluster status: Transition Summary: * Start simple-rsc ( node2 ) - * Start child_rsc1:0 ( node1 ) * Promote child_rsc1:1 ( Stopped -> Promoted node2 ) + * Start child_rsc1:0 ( node1 ) Executing Cluster Transition: * Resource action: simple-rsc monitor on node2 * Resource action: simple-rsc monitor on node1 * Resource action: simple-rsc monitor on node0 - * Resource action: child_rsc1:0 monitor on node2 - * Resource action: child_rsc1:0 monitor on node1 - * Resource action: child_rsc1:0 monitor on node0 * Resource action: child_rsc1:1 monitor on node2 * Resource action: child_rsc1:1 monitor on node1 * Resource action: child_rsc1:1 monitor on node0 + * Resource action: child_rsc1:0 monitor on node2 + * Resource action: child_rsc1:0 monitor on node1 + * Resource action: child_rsc1:0 monitor on node0 * Pseudo action: rsc1_start_0 * Resource action: simple-rsc start on node2 - * Resource action: child_rsc1:0 start on node1 * Resource action: child_rsc1:1 start on node2 + * Resource action: child_rsc1:0 start on node1 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:1 promote on node2 diff --git a/cts/scheduler/summary/migrate-fencing.summary b/cts/scheduler/summary/migrate-fencing.summary index 500c78a3b53..1e48cf8c5a1 100644 --- a/cts/scheduler/summary/migrate-fencing.summary +++ b/cts/scheduler/summary/migrate-fencing.summary @@ -32,8 +32,8 @@ Transition Summary: * Move lsb-dummy ( pcmk-4 -> pcmk-1 ) * Migrate migrator ( pcmk-1 -> pcmk-3 ) * Stop ping-1:0 ( pcmk-4 ) due to node availability - * Stop stateful-1:0 ( Promoted pcmk-4 ) due to node availability * Promote stateful-1:1 ( Unpromoted -> Promoted pcmk-1 ) + * Stop stateful-1:0 ( Promoted pcmk-4 ) due to node availability Executing Cluster Transition: * Pseudo action: Fencing_stop_0 diff --git a/cts/scheduler/summary/migrate-shutdown.summary b/cts/scheduler/summary/migrate-shutdown.summary index 985b554c227..e3ab731014d 100644 --- a/cts/scheduler/summary/migrate-shutdown.summary +++ b/cts/scheduler/summary/migrate-shutdown.summary @@ -35,8 +35,8 @@ Transition Summary: * Stop ping-1:0 ( pcmk-1 ) due to node availability * Stop ping-1:1 ( pcmk-2 ) due to node availability * Stop ping-1:2 ( pcmk-4 ) due to node availability - * Stop stateful-1:0 ( Unpromoted pcmk-1 ) due to node availability * Stop stateful-1:1 ( Promoted pcmk-2 ) due to node availability + * Stop stateful-1:0 ( Unpromoted pcmk-1 ) due to node availability * Stop stateful-1:2 ( Unpromoted pcmk-4 ) due to node availability Executing Cluster Transition: @@ -62,8 +62,8 @@ Executing Cluster Transition: * Resource action: stateful-1:0 demote on pcmk-2 * Pseudo action: master-1_demoted_0 * Pseudo action: master-1_stop_0 - * Resource action: stateful-1:2 stop on pcmk-1 * Resource action: stateful-1:0 stop on pcmk-2 + * Resource action: stateful-1:2 stop on pcmk-1 * Resource action: stateful-1:3 stop on pcmk-4 * Pseudo action: master-1_stopped_0 * Cluster action: do_shutdown on pcmk-4 diff --git a/cts/scheduler/summary/notify-3.summary b/cts/scheduler/summary/notify-3.summary index 56586923e4c..e7f31b41eb2 100644 --- a/cts/scheduler/summary/notify-3.summary +++ b/cts/scheduler/summary/notify-3.summary @@ -18,9 +18,9 @@ Executing Cluster Transition: * Resource action: child_rsc1:0 monitor on node2 * Resource action: child_rsc1:1 monitor on node1 * Pseudo action: rsc1_pre_notify_stop_0 - * Resource action: child_rsc2:0 monitor on node2 * Resource action: child_rsc2:1 monitor on node2 * Resource action: child_rsc2:1 monitor on node1 + * Resource action: child_rsc2:0 monitor on node2 * Pseudo action: rsc2_pre_notify_stop_0 * Resource action: child_rsc1:0 notify on node1 * Resource action: child_rsc1:1 notify on node2 diff --git a/cts/scheduler/summary/on_fail_demote2.summary b/cts/scheduler/summary/on_fail_demote2.summary index 0ec0ea35fd0..dd0a0772f59 100644 --- a/cts/scheduler/summary/on_fail_demote2.summary +++ b/cts/scheduler/summary/on_fail_demote2.summary @@ -13,18 +13,18 @@ Current cluster status: * Unpromoted: [ rhel7-1 rhel7-2 rhel7-3 rhel7-5 ] Transition Summary: - * Demote rsc1:0 ( Promoted -> Unpromoted rhel7-4 ) * Promote rsc1:1 ( Unpromoted -> Promoted rhel7-3 ) + * Demote rsc1:0 ( Promoted -> Unpromoted rhel7-4 ) Executing Cluster Transition: - * Resource action: rsc1 cancel=10000 on rhel7-4 * Resource action: rsc1 cancel=11000 on rhel7-3 + * Resource action: rsc1 cancel=10000 on rhel7-4 * Pseudo action: rsc1-clone_demote_0 * Resource action: rsc1 demote on rhel7-4 * Pseudo action: rsc1-clone_demoted_0 * Pseudo action: rsc1-clone_promote_0 - * Resource action: rsc1 monitor=11000 on rhel7-4 * Resource action: rsc1 promote on rhel7-3 + * Resource action: rsc1 monitor=11000 on rhel7-4 * Pseudo action: rsc1-clone_promoted_0 * Resource action: rsc1 monitor=10000 on rhel7-3 Using the original execution date of: 2020-06-16 19:23:21Z diff --git a/cts/scheduler/summary/promoted-1.summary b/cts/scheduler/summary/promoted-1.summary index 839de37f1bb..9fabc83c180 100644 --- a/cts/scheduler/summary/promoted-1.summary +++ b/cts/scheduler/summary/promoted-1.summary @@ -11,27 +11,27 @@ Current cluster status: * child_rsc1:4 (ocf:heartbeat:apache): Stopped Transition Summary: - * Start child_rsc1:0 ( node1 ) * Promote child_rsc1:1 ( Stopped -> Promoted node2 ) - * Start child_rsc1:2 ( node1 ) * Start child_rsc1:3 ( node2 ) + * Start child_rsc1:0 ( node1 ) + * Start child_rsc1:2 ( node1 ) Executing Cluster Transition: - * Resource action: child_rsc1:0 monitor on node2 - * Resource action: child_rsc1:0 monitor on node1 * Resource action: child_rsc1:1 monitor on node2 * Resource action: child_rsc1:1 monitor on node1 - * Resource action: child_rsc1:2 monitor on node2 - * Resource action: child_rsc1:2 monitor on node1 * Resource action: child_rsc1:3 monitor on node2 * Resource action: child_rsc1:3 monitor on node1 + * Resource action: child_rsc1:0 monitor on node2 + * Resource action: child_rsc1:0 monitor on node1 + * Resource action: child_rsc1:2 monitor on node2 + * Resource action: child_rsc1:2 monitor on node1 * Resource action: child_rsc1:4 monitor on node2 * Resource action: child_rsc1:4 monitor on node1 * Pseudo action: rsc1_start_0 - * Resource action: child_rsc1:0 start on node1 * Resource action: child_rsc1:1 start on node2 - * Resource action: child_rsc1:2 start on node1 * Resource action: child_rsc1:3 start on node2 + * Resource action: child_rsc1:0 start on node1 + * Resource action: child_rsc1:2 start on node1 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:1 promote on node2 diff --git a/cts/scheduler/summary/promoted-10.summary b/cts/scheduler/summary/promoted-10.summary index 7efbce92b6e..bc6af0e8b3b 100644 --- a/cts/scheduler/summary/promoted-10.summary +++ b/cts/scheduler/summary/promoted-10.summary @@ -12,40 +12,40 @@ Current cluster status: Transition Summary: * Promote child_rsc1:0 ( Stopped -> Promoted node1 ) - * Start child_rsc1:1 ( node2 ) * Start child_rsc1:2 ( node1 ) * Promote child_rsc1:3 ( Stopped -> Promoted node2 ) + * Start child_rsc1:1 ( node2 ) Executing Cluster Transition: * Resource action: child_rsc1:0 monitor on node2 * Resource action: child_rsc1:0 monitor on node1 - * Resource action: child_rsc1:1 monitor on node2 - * Resource action: child_rsc1:1 monitor on node1 * Resource action: child_rsc1:2 monitor on node2 * Resource action: child_rsc1:2 monitor on node1 * Resource action: child_rsc1:3 monitor on node2 * Resource action: child_rsc1:3 monitor on node1 + * Resource action: child_rsc1:1 monitor on node2 + * Resource action: child_rsc1:1 monitor on node1 * Resource action: child_rsc1:4 monitor on node2 * Resource action: child_rsc1:4 monitor on node1 * Pseudo action: rsc1_pre_notify_start_0 * Pseudo action: rsc1_confirmed-pre_notify_start_0 * Pseudo action: rsc1_start_0 * Resource action: child_rsc1:0 start on node1 - * Resource action: child_rsc1:1 start on node2 * Resource action: child_rsc1:2 start on node1 * Resource action: child_rsc1:3 start on node2 + * Resource action: child_rsc1:1 start on node2 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_post_notify_running_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-post_notify_running_0 * Pseudo action: rsc1_pre_notify_promote_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-pre_notify_promote_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:0 promote on node1 @@ -53,14 +53,14 @@ Executing Cluster Transition: * Pseudo action: rsc1_promoted_0 * Pseudo action: rsc1_post_notify_promoted_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-post_notify_promoted_0 * Resource action: child_rsc1:0 monitor=11000 on node1 - * Resource action: child_rsc1:1 monitor=1000 on node2 * Resource action: child_rsc1:2 monitor=1000 on node1 * Resource action: child_rsc1:3 monitor=11000 on node2 + * Resource action: child_rsc1:1 monitor=1000 on node2 Revised Cluster Status: * Node List: diff --git a/cts/scheduler/summary/promoted-11.summary b/cts/scheduler/summary/promoted-11.summary index 6999bb1af01..6d7b547fd3a 100644 --- a/cts/scheduler/summary/promoted-11.summary +++ b/cts/scheduler/summary/promoted-11.summary @@ -10,20 +10,20 @@ Current cluster status: Transition Summary: * Start simple-rsc ( node2 ) - * Start child_rsc1:0 ( node1 ) * Promote child_rsc1:1 ( Stopped -> Promoted node2 ) + * Start child_rsc1:0 ( node1 ) Executing Cluster Transition: * Resource action: simple-rsc monitor on node2 * Resource action: simple-rsc monitor on node1 - * Resource action: child_rsc1:0 monitor on node2 - * Resource action: child_rsc1:0 monitor on node1 * Resource action: child_rsc1:1 monitor on node2 * Resource action: child_rsc1:1 monitor on node1 + * Resource action: child_rsc1:0 monitor on node2 + * Resource action: child_rsc1:0 monitor on node1 * Pseudo action: rsc1_start_0 * Resource action: simple-rsc start on node2 - * Resource action: child_rsc1:0 start on node1 * Resource action: child_rsc1:1 start on node2 + * Resource action: child_rsc1:0 start on node1 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:1 promote on node2 diff --git a/cts/scheduler/summary/promoted-2.summary b/cts/scheduler/summary/promoted-2.summary index 58e3e2ec824..698066f4ae4 100644 --- a/cts/scheduler/summary/promoted-2.summary +++ b/cts/scheduler/summary/promoted-2.summary @@ -12,40 +12,40 @@ Current cluster status: Transition Summary: * Promote child_rsc1:0 ( Stopped -> Promoted node1 ) - * Start child_rsc1:1 ( node2 ) * Start child_rsc1:2 ( node1 ) * Promote child_rsc1:3 ( Stopped -> Promoted node2 ) + * Start child_rsc1:1 ( node2 ) Executing Cluster Transition: * Resource action: child_rsc1:0 monitor on node2 * Resource action: child_rsc1:0 monitor on node1 - * Resource action: child_rsc1:1 monitor on node2 - * Resource action: child_rsc1:1 monitor on node1 * Resource action: child_rsc1:2 monitor on node2 * Resource action: child_rsc1:2 monitor on node1 * Resource action: child_rsc1:3 monitor on node2 * Resource action: child_rsc1:3 monitor on node1 + * Resource action: child_rsc1:1 monitor on node2 + * Resource action: child_rsc1:1 monitor on node1 * Resource action: child_rsc1:4 monitor on node2 * Resource action: child_rsc1:4 monitor on node1 * Pseudo action: rsc1_pre_notify_start_0 * Pseudo action: rsc1_confirmed-pre_notify_start_0 * Pseudo action: rsc1_start_0 * Resource action: child_rsc1:0 start on node1 - * Resource action: child_rsc1:1 start on node2 * Resource action: child_rsc1:2 start on node1 * Resource action: child_rsc1:3 start on node2 + * Resource action: child_rsc1:1 start on node2 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_post_notify_running_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-post_notify_running_0 * Pseudo action: rsc1_pre_notify_promote_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-pre_notify_promote_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:0 promote on node1 @@ -53,9 +53,9 @@ Executing Cluster Transition: * Pseudo action: rsc1_promoted_0 * Pseudo action: rsc1_post_notify_promoted_0 * Resource action: child_rsc1:0 notify on node1 - * Resource action: child_rsc1:1 notify on node2 * Resource action: child_rsc1:2 notify on node1 * Resource action: child_rsc1:3 notify on node2 + * Resource action: child_rsc1:1 notify on node2 * Pseudo action: rsc1_confirmed-post_notify_promoted_0 Revised Cluster Status: diff --git a/cts/scheduler/summary/promoted-3.summary b/cts/scheduler/summary/promoted-3.summary index 839de37f1bb..3d227ec6425 100644 --- a/cts/scheduler/summary/promoted-3.summary +++ b/cts/scheduler/summary/promoted-3.summary @@ -11,27 +11,27 @@ Current cluster status: * child_rsc1:4 (ocf:heartbeat:apache): Stopped Transition Summary: - * Start child_rsc1:0 ( node1 ) * Promote child_rsc1:1 ( Stopped -> Promoted node2 ) - * Start child_rsc1:2 ( node1 ) * Start child_rsc1:3 ( node2 ) + * Start child_rsc1:0 ( node1 ) + * Start child_rsc1:2 ( node1 ) Executing Cluster Transition: - * Resource action: child_rsc1:0 monitor on node2 - * Resource action: child_rsc1:0 monitor on node1 * Resource action: child_rsc1:1 monitor on node2 * Resource action: child_rsc1:1 monitor on node1 - * Resource action: child_rsc1:2 monitor on node2 - * Resource action: child_rsc1:2 monitor on node1 * Resource action: child_rsc1:3 monitor on node2 * Resource action: child_rsc1:3 monitor on node1 * Resource action: child_rsc1:4 monitor on node2 * Resource action: child_rsc1:4 monitor on node1 + * Resource action: child_rsc1:0 monitor on node2 + * Resource action: child_rsc1:0 monitor on node1 + * Resource action: child_rsc1:2 monitor on node2 + * Resource action: child_rsc1:2 monitor on node1 * Pseudo action: rsc1_start_0 - * Resource action: child_rsc1:0 start on node1 * Resource action: child_rsc1:1 start on node2 - * Resource action: child_rsc1:2 start on node1 * Resource action: child_rsc1:3 start on node2 + * Resource action: child_rsc1:0 start on node1 + * Resource action: child_rsc1:2 start on node1 * Pseudo action: rsc1_running_0 * Pseudo action: rsc1_promote_0 * Resource action: child_rsc1:1 promote on node2 diff --git a/cts/scheduler/summary/promoted-7.summary b/cts/scheduler/summary/promoted-7.summary index a1ddea5d994..7b87b373dda 100644 --- a/cts/scheduler/summary/promoted-7.summary +++ b/cts/scheduler/summary/promoted-7.summary @@ -50,15 +50,15 @@ Executing Cluster Transition: * Resource action: child_DoFencing:3 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n02 * Pseudo action: DoFencing_stop_0 - * Resource action: ocf_msdummy:4 monitor on c001n08 - * Resource action: ocf_msdummy:4 monitor on c001n03 - * Resource action: ocf_msdummy:4 monitor on c001n02 * Resource action: ocf_msdummy:5 monitor on c001n08 * Resource action: ocf_msdummy:5 monitor on c001n02 * Resource action: ocf_msdummy:6 monitor on c001n08 * Resource action: ocf_msdummy:6 monitor on c001n03 * Resource action: ocf_msdummy:7 monitor on c001n03 * Resource action: ocf_msdummy:7 monitor on c001n02 + * Resource action: ocf_msdummy:4 monitor on c001n08 + * Resource action: ocf_msdummy:4 monitor on c001n03 + * Resource action: ocf_msdummy:4 monitor on c001n02 * Pseudo action: master_rsc_1_demote_0 * Fencing c001n01 (reboot) * Pseudo action: DcIPaddr_stop_0 diff --git a/cts/scheduler/summary/promoted-8.summary b/cts/scheduler/summary/promoted-8.summary index ed646ed589b..1c80e259257 100644 --- a/cts/scheduler/summary/promoted-8.summary +++ b/cts/scheduler/summary/promoted-8.summary @@ -49,16 +49,16 @@ Executing Cluster Transition: * Resource action: child_DoFencing:3 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n02 * Pseudo action: DoFencing_stop_0 + * Resource action: ocf_msdummy:6 monitor on c001n08 + * Resource action: ocf_msdummy:6 monitor on c001n03 + * Resource action: ocf_msdummy:7 monitor on c001n03 + * Resource action: ocf_msdummy:7 monitor on c001n02 * Resource action: ocf_msdummy:4 monitor on c001n08 * Resource action: ocf_msdummy:4 monitor on c001n03 * Resource action: ocf_msdummy:4 monitor on c001n02 * Resource action: ocf_msdummy:5 monitor on c001n08 * Resource action: ocf_msdummy:5 monitor on c001n03 * Resource action: ocf_msdummy:5 monitor on c001n02 - * Resource action: ocf_msdummy:6 monitor on c001n08 - * Resource action: ocf_msdummy:6 monitor on c001n03 - * Resource action: ocf_msdummy:7 monitor on c001n03 - * Resource action: ocf_msdummy:7 monitor on c001n02 * Pseudo action: master_rsc_1_demote_0 * Fencing c001n01 (reboot) * Pseudo action: DcIPaddr_stop_0 diff --git a/cts/scheduler/summary/promoted-demote-2.summary b/cts/scheduler/summary/promoted-demote-2.summary index e371d3f1c16..63a3c84abbe 100644 --- a/cts/scheduler/summary/promoted-demote-2.summary +++ b/cts/scheduler/summary/promoted-demote-2.summary @@ -25,8 +25,8 @@ Transition Summary: * Start r192.168.122.106 ( pcmk-2 ) * Start r192.168.122.107 ( pcmk-2 ) * Start lsb-dummy ( pcmk-2 ) - * Recover stateful-1:0 ( Unpromoted pcmk-1 ) * Promote stateful-1:1 ( Unpromoted -> Promoted pcmk-2 ) + * Recover stateful-1:0 ( Unpromoted pcmk-1 ) Executing Cluster Transition: * Resource action: stateful-1:0 cancel=15000 on pcmk-2 diff --git a/cts/scheduler/summary/promoted-demote.summary b/cts/scheduler/summary/promoted-demote.summary index d5955c22e51..3e441377ae1 100644 --- a/cts/scheduler/summary/promoted-demote.summary +++ b/cts/scheduler/summary/promoted-demote.summary @@ -31,15 +31,15 @@ Executing Cluster Transition: * Resource action: named_address stop on cxa1 * Pseudo action: named_drbd_pre_notify_promote_0 * Resource action: named_address start on cxb1 - * Resource action: named_drbd_node:1 notify on cxa1 * Resource action: named_drbd_node:0 notify on cxb1 + * Resource action: named_drbd_node:1 notify on cxa1 * Pseudo action: named_drbd_confirmed-pre_notify_promote_0 * Pseudo action: named_drbd_promote_0 * Resource action: named_drbd_node:0 promote on cxb1 * Pseudo action: named_drbd_promoted_0 * Pseudo action: named_drbd_post_notify_promoted_0 - * Resource action: named_drbd_node:1 notify on cxa1 * Resource action: named_drbd_node:0 notify on cxb1 + * Resource action: named_drbd_node:1 notify on cxa1 * Pseudo action: named_drbd_confirmed-post_notify_promoted_0 * Resource action: named_drbd_node:0 monitor=10000 on cxb1 diff --git a/cts/scheduler/summary/promoted-failed-demote-2.summary b/cts/scheduler/summary/promoted-failed-demote-2.summary index 3f317fabeaa..f5fe30b3ab1 100644 --- a/cts/scheduler/summary/promoted-failed-demote-2.summary +++ b/cts/scheduler/summary/promoted-failed-demote-2.summary @@ -12,9 +12,9 @@ Current cluster status: * stateful-2:1 (ocf:heartbeat:Stateful): Unpromoted dl380g5a Transition Summary: - * Stop stateful-1:0 ( Unpromoted dl380g5b ) due to node availability * Promote stateful-1:1 ( Unpromoted -> Promoted dl380g5a ) * Promote stateful-2:1 ( Unpromoted -> Promoted dl380g5a ) + * Stop stateful-1:0 ( Unpromoted dl380g5b ) due to node availability Executing Cluster Transition: * Resource action: stateful-1:1 cancel=20000 on dl380g5a diff --git a/cts/scheduler/summary/promoted-failed-demote.summary b/cts/scheduler/summary/promoted-failed-demote.summary index 70b3e1b2cff..ab071d986de 100644 --- a/cts/scheduler/summary/promoted-failed-demote.summary +++ b/cts/scheduler/summary/promoted-failed-demote.summary @@ -12,17 +12,17 @@ Current cluster status: * stateful-2:1 (ocf:heartbeat:Stateful): Unpromoted dl380g5a Transition Summary: - * Stop stateful-1:0 ( Unpromoted dl380g5b ) due to node availability * Promote stateful-1:1 ( Unpromoted -> Promoted dl380g5a ) * Promote stateful-2:1 ( Unpromoted -> Promoted dl380g5a ) + * Stop stateful-1:0 ( Unpromoted dl380g5b ) due to node availability Executing Cluster Transition: * Resource action: stateful-1:1 cancel=20000 on dl380g5a * Resource action: stateful-2:1 cancel=20000 on dl380g5a * Pseudo action: ms-sf_pre_notify_stop_0 - * Resource action: stateful-1:0 notify on dl380g5b * Resource action: stateful-1:1 notify on dl380g5a * Resource action: stateful-2:1 notify on dl380g5a + * Resource action: stateful-1:0 notify on dl380g5b * Pseudo action: ms-sf_confirmed-pre_notify_stop_0 * Pseudo action: ms-sf_stop_0 * Pseudo action: group:0_stop_0 diff --git a/cts/scheduler/summary/promoted-move.summary b/cts/scheduler/summary/promoted-move.summary index 4782edb5510..1ac9a840264 100644 --- a/cts/scheduler/summary/promoted-move.summary +++ b/cts/scheduler/summary/promoted-move.summary @@ -15,44 +15,44 @@ Transition Summary: * Recover dummy01 ( bl460g1n13 -> bl460g1n14 ) * Move dummy02 ( bl460g1n13 -> bl460g1n14 ) * Start dummy03 ( bl460g1n14 ) - * Demote prmDRBD:0 ( Promoted -> Unpromoted bl460g1n13 ) * Promote prmDRBD:1 ( Unpromoted -> Promoted bl460g1n14 ) + * Demote prmDRBD:0 ( Promoted -> Unpromoted bl460g1n13 ) Executing Cluster Transition: * Pseudo action: grpDRBD_stop_0 * Resource action: dummy02 stop on bl460g1n13 - * Resource action: prmDRBD:0 cancel=10000 on bl460g1n13 * Resource action: prmDRBD:1 cancel=20000 on bl460g1n14 + * Resource action: prmDRBD:0 cancel=10000 on bl460g1n13 * Pseudo action: msDRBD_pre_notify_demote_0 * Resource action: dummy01 stop on bl460g1n13 - * Resource action: prmDRBD:0 notify on bl460g1n13 * Resource action: prmDRBD:1 notify on bl460g1n14 + * Resource action: prmDRBD:0 notify on bl460g1n13 * Pseudo action: msDRBD_confirmed-pre_notify_demote_0 * Pseudo action: grpDRBD_stopped_0 * Pseudo action: msDRBD_demote_0 * Resource action: prmDRBD:0 demote on bl460g1n13 * Pseudo action: msDRBD_demoted_0 * Pseudo action: msDRBD_post_notify_demoted_0 - * Resource action: prmDRBD:0 notify on bl460g1n13 * Resource action: prmDRBD:1 notify on bl460g1n14 + * Resource action: prmDRBD:0 notify on bl460g1n13 * Pseudo action: msDRBD_confirmed-post_notify_demoted_0 * Pseudo action: msDRBD_pre_notify_promote_0 - * Resource action: prmDRBD:0 notify on bl460g1n13 * Resource action: prmDRBD:1 notify on bl460g1n14 + * Resource action: prmDRBD:0 notify on bl460g1n13 * Pseudo action: msDRBD_confirmed-pre_notify_promote_0 * Pseudo action: msDRBD_promote_0 * Resource action: prmDRBD:1 promote on bl460g1n14 * Pseudo action: msDRBD_promoted_0 * Pseudo action: msDRBD_post_notify_promoted_0 - * Resource action: prmDRBD:0 notify on bl460g1n13 * Resource action: prmDRBD:1 notify on bl460g1n14 + * Resource action: prmDRBD:0 notify on bl460g1n13 * Pseudo action: msDRBD_confirmed-post_notify_promoted_0 * Pseudo action: grpDRBD_start_0 * Resource action: dummy01 start on bl460g1n14 * Resource action: dummy02 start on bl460g1n14 * Resource action: dummy03 start on bl460g1n14 - * Resource action: prmDRBD:0 monitor=20000 on bl460g1n13 * Resource action: prmDRBD:1 monitor=10000 on bl460g1n14 + * Resource action: prmDRBD:0 monitor=20000 on bl460g1n13 * Pseudo action: grpDRBD_running_0 * Resource action: dummy01 monitor=10000 on bl460g1n14 * Resource action: dummy02 monitor=10000 on bl460g1n14 diff --git a/cts/scheduler/summary/promoted-partially-demoted-group.summary b/cts/scheduler/summary/promoted-partially-demoted-group.summary index b85c805711d..0ae615642f8 100644 --- a/cts/scheduler/summary/promoted-partially-demoted-group.summary +++ b/cts/scheduler/summary/promoted-partially-demoted-group.summary @@ -27,11 +27,11 @@ Transition Summary: * Move vip-165 ( sd01-1 -> sd01-0 ) * Move cdev-pool-0-iscsi-target ( sd01-1 -> sd01-0 ) * Move cdev-pool-0-iscsi-lun-1 ( sd01-1 -> sd01-0 ) - * Demote vip-164-fw:0 ( Promoted -> Unpromoted sd01-1 ) * Promote vip-164-fw:1 ( Unpromoted -> Promoted sd01-0 ) * Promote vip-165-fw:1 ( Unpromoted -> Promoted sd01-0 ) - * Demote cdev-pool-0-drbd:0 ( Promoted -> Unpromoted sd01-1 ) + * Demote vip-164-fw:0 ( Promoted -> Unpromoted sd01-1 ) * Promote cdev-pool-0-drbd:1 ( Unpromoted -> Promoted sd01-0 ) + * Demote cdev-pool-0-drbd:0 ( Promoted -> Unpromoted sd01-1 ) Executing Cluster Transition: * Resource action: vip-165-fw monitor=10000 on sd01-1 @@ -39,8 +39,8 @@ Executing Cluster Transition: * Pseudo action: ms-cdev-pool-0-drbd_pre_notify_demote_0 * Pseudo action: cdev-pool-0-iscsi-vips-fw:0_demote_0 * Resource action: vip-164-fw demote on sd01-1 - * Resource action: cdev-pool-0-drbd notify on sd01-1 * Resource action: cdev-pool-0-drbd notify on sd01-0 + * Resource action: cdev-pool-0-drbd notify on sd01-1 * Pseudo action: ms-cdev-pool-0-drbd_confirmed-pre_notify_demote_0 * Pseudo action: cdev-pool-0-iscsi-vips-fw:0_demoted_0 * Resource action: vip-164-fw monitor=10000 on sd01-1 @@ -57,25 +57,25 @@ Executing Cluster Transition: * Resource action: cdev-pool-0-drbd demote on sd01-1 * Pseudo action: ms-cdev-pool-0-drbd_demoted_0 * Pseudo action: ms-cdev-pool-0-drbd_post_notify_demoted_0 - * Resource action: cdev-pool-0-drbd notify on sd01-1 * Resource action: cdev-pool-0-drbd notify on sd01-0 + * Resource action: cdev-pool-0-drbd notify on sd01-1 * Pseudo action: ms-cdev-pool-0-drbd_confirmed-post_notify_demoted_0 * Pseudo action: ms-cdev-pool-0-drbd_pre_notify_promote_0 - * Resource action: cdev-pool-0-drbd notify on sd01-1 * Resource action: cdev-pool-0-drbd notify on sd01-0 + * Resource action: cdev-pool-0-drbd notify on sd01-1 * Pseudo action: ms-cdev-pool-0-drbd_confirmed-pre_notify_promote_0 * Pseudo action: ms-cdev-pool-0-drbd_promote_0 * Resource action: cdev-pool-0-drbd promote on sd01-0 * Pseudo action: ms-cdev-pool-0-drbd_promoted_0 * Pseudo action: ms-cdev-pool-0-drbd_post_notify_promoted_0 - * Resource action: cdev-pool-0-drbd notify on sd01-1 * Resource action: cdev-pool-0-drbd notify on sd01-0 + * Resource action: cdev-pool-0-drbd notify on sd01-1 * Pseudo action: ms-cdev-pool-0-drbd_confirmed-post_notify_promoted_0 * Pseudo action: cdev-pool-0-iscsi-export_start_0 * Resource action: cdev-pool-0-iscsi-target start on sd01-0 * Resource action: cdev-pool-0-iscsi-lun-1 start on sd01-0 - * Resource action: cdev-pool-0-drbd monitor=20000 on sd01-1 * Resource action: cdev-pool-0-drbd monitor=10000 on sd01-0 + * Resource action: cdev-pool-0-drbd monitor=20000 on sd01-1 * Pseudo action: cdev-pool-0-iscsi-export_running_0 * Resource action: cdev-pool-0-iscsi-target monitor=10000 on sd01-0 * Resource action: cdev-pool-0-iscsi-lun-1 monitor=10000 on sd01-0 @@ -86,10 +86,10 @@ Executing Cluster Transition: * Resource action: vip-164 monitor=30000 on sd01-0 * Resource action: vip-165 monitor=30000 on sd01-0 * Pseudo action: ms-cdev-pool-0-iscsi-vips-fw_promote_0 - * Pseudo action: cdev-pool-0-iscsi-vips-fw:0_promote_0 * Pseudo action: cdev-pool-0-iscsi-vips-fw:1_promote_0 * Resource action: vip-164-fw promote on sd01-0 * Resource action: vip-165-fw promote on sd01-0 + * Pseudo action: cdev-pool-0-iscsi-vips-fw:0_promote_0 * Pseudo action: cdev-pool-0-iscsi-vips-fw:1_promoted_0 * Pseudo action: ms-cdev-pool-0-iscsi-vips-fw_promoted_0 diff --git a/cts/scheduler/summary/promoted-with-blocked.summary b/cts/scheduler/summary/promoted-with-blocked.summary index 82177a9a6a2..d532ba95dd9 100644 --- a/cts/scheduler/summary/promoted-with-blocked.summary +++ b/cts/scheduler/summary/promoted-with-blocked.summary @@ -13,11 +13,11 @@ Current cluster status: Transition Summary: * Start rsc1 ( node2 ) due to unrunnable rsc3 start (blocked) + * Promote rsc2:4 ( Stopped -> Promoted node2 ) due to colocation with rsc1 (blocked) * Start rsc2:0 ( node3 ) * Start rsc2:1 ( node4 ) * Start rsc2:2 ( node5 ) * Start rsc2:3 ( node1 ) - * Promote rsc2:4 ( Stopped -> Promoted node2 ) due to colocation with rsc1 (blocked) Executing Cluster Transition: * Resource action: rsc1 monitor on node5 @@ -25,22 +25,22 @@ Executing Cluster Transition: * Resource action: rsc1 monitor on node3 * Resource action: rsc1 monitor on node2 * Resource action: rsc1 monitor on node1 + * Resource action: rsc2:4 monitor on node2 * Resource action: rsc2:0 monitor on node3 * Resource action: rsc2:1 monitor on node4 * Resource action: rsc2:2 monitor on node5 * Resource action: rsc2:3 monitor on node1 - * Resource action: rsc2:4 monitor on node2 * Pseudo action: rsc2-clone_start_0 * Resource action: rsc3 monitor on node5 * Resource action: rsc3 monitor on node4 * Resource action: rsc3 monitor on node3 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 + * Resource action: rsc2:4 start on node2 * Resource action: rsc2:0 start on node3 * Resource action: rsc2:1 start on node4 * Resource action: rsc2:2 start on node5 * Resource action: rsc2:3 start on node1 - * Resource action: rsc2:4 start on node2 * Pseudo action: rsc2-clone_running_0 * Resource action: rsc2:0 monitor=10000 on node3 * Resource action: rsc2:1 monitor=10000 on node4 diff --git a/cts/scheduler/summary/remote-recover-all.summary b/cts/scheduler/summary/remote-recover-all.summary index 257301a3d73..969b8c06a97 100644 --- a/cts/scheduler/summary/remote-recover-all.summary +++ b/cts/scheduler/summary/remote-recover-all.summary @@ -66,9 +66,9 @@ Executing Cluster Transition: * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq-clone_confirmed-pre_notify_stop_0 - * Pseudo action: redis_post_notify_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_post_notify_stop_0 * Pseudo action: redis-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 @@ -84,8 +84,8 @@ Executing Cluster Transition: * Resource action: galera-0 start on controller-2 * Pseudo action: rabbitmq_post_notify_stop_0 * Pseudo action: rabbitmq-clone_stop_0 - * Pseudo action: galera_stop_0 * Resource action: galera monitor=10000 on galera-0 + * Pseudo action: galera_stop_0 * Pseudo action: galera-master_stopped_0 * Pseudo action: redis-master_post_notify_stopped_0 * Pseudo action: ip-172.17.1.14_stop_0 @@ -97,13 +97,13 @@ Executing Cluster Transition: * Pseudo action: rabbitmq-clone_stopped_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_notified_0 * Pseudo action: redis-master_confirmed-post_notify_stopped_0 * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 * Resource action: ip-172.17.4.11 start on controller-2 * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 * Pseudo action: rabbitmq-clone_post_notify_stopped_0 - * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 diff --git a/cts/scheduler/summary/remote-recover-connection.summary b/cts/scheduler/summary/remote-recover-connection.summary index fd6900dd961..a166a5425b6 100644 --- a/cts/scheduler/summary/remote-recover-connection.summary +++ b/cts/scheduler/summary/remote-recover-connection.summary @@ -63,9 +63,9 @@ Executing Cluster Transition: * Resource action: rabbitmq monitor=10000 on messaging-1 * Resource action: galera monitor=10000 on galera-2 * Resource action: galera monitor=10000 on galera-0 - * Pseudo action: redis_post_notify_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_post_notify_stop_0 * Pseudo action: redis-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 @@ -84,11 +84,11 @@ Executing Cluster Transition: * Pseudo action: ip-172.17.4.11_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_notified_0 * Pseudo action: redis-master_confirmed-post_notify_stopped_0 * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 * Resource action: ip-172.17.4.11 start on controller-2 - * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 diff --git a/cts/scheduler/summary/remote-recover-no-resources.summary b/cts/scheduler/summary/remote-recover-no-resources.summary index d5978be4496..1875f41e1e5 100644 --- a/cts/scheduler/summary/remote-recover-no-resources.summary +++ b/cts/scheduler/summary/remote-recover-no-resources.summary @@ -63,9 +63,9 @@ Executing Cluster Transition: * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq-clone_confirmed-pre_notify_stop_0 - * Pseudo action: redis_post_notify_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_post_notify_stop_0 * Pseudo action: redis-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 @@ -90,6 +90,7 @@ Executing Cluster Transition: * Pseudo action: rabbitmq-clone_post_notify_stopped_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_notified_0 * Pseudo action: redis-master_confirmed-post_notify_stopped_0 * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 @@ -98,7 +99,6 @@ Executing Cluster Transition: * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq_notified_0 * Pseudo action: rabbitmq-clone_confirmed-post_notify_stopped_0 - * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 diff --git a/cts/scheduler/summary/remote-recover-unknown.summary b/cts/scheduler/summary/remote-recover-unknown.summary index c68915878db..174db09a161 100644 --- a/cts/scheduler/summary/remote-recover-unknown.summary +++ b/cts/scheduler/summary/remote-recover-unknown.summary @@ -64,9 +64,9 @@ Executing Cluster Transition: * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq-clone_confirmed-pre_notify_stop_0 - * Pseudo action: redis_post_notify_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_post_notify_stop_0 * Pseudo action: redis-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 @@ -92,6 +92,7 @@ Executing Cluster Transition: * Pseudo action: rabbitmq-clone_post_notify_stopped_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_notified_0 * Pseudo action: redis-master_confirmed-post_notify_stopped_0 * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 @@ -100,7 +101,6 @@ Executing Cluster Transition: * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq_notified_0 * Pseudo action: rabbitmq-clone_confirmed-post_notify_stopped_0 - * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 diff --git a/cts/scheduler/summary/remote-recovery.summary b/cts/scheduler/summary/remote-recovery.summary index fd6900dd961..a166a5425b6 100644 --- a/cts/scheduler/summary/remote-recovery.summary +++ b/cts/scheduler/summary/remote-recovery.summary @@ -63,9 +63,9 @@ Executing Cluster Transition: * Resource action: rabbitmq monitor=10000 on messaging-1 * Resource action: galera monitor=10000 on galera-2 * Resource action: galera monitor=10000 on galera-0 - * Pseudo action: redis_post_notify_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_post_notify_stop_0 * Pseudo action: redis-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 @@ -84,11 +84,11 @@ Executing Cluster Transition: * Pseudo action: ip-172.17.4.11_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 + * Pseudo action: redis_notified_0 * Pseudo action: redis-master_confirmed-post_notify_stopped_0 * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 * Resource action: ip-172.17.4.11 start on controller-2 - * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 diff --git a/cts/scheduler/summary/rsc-sets-promoted.summary b/cts/scheduler/summary/rsc-sets-promoted.summary index af78ecbaa39..4a40628a559 100644 --- a/cts/scheduler/summary/rsc-sets-promoted.summary +++ b/cts/scheduler/summary/rsc-sets-promoted.summary @@ -12,8 +12,8 @@ Current cluster status: * rsc3 (ocf:pacemaker:Dummy): Started node1 Transition Summary: - * Stop rsc:0 ( Promoted node1 ) due to node availability * Promote rsc:1 ( Unpromoted -> Promoted node2 ) + * Stop rsc:0 ( Promoted node1 ) due to node availability * Move rsc1 ( node1 -> node2 ) * Move rsc2 ( node1 -> node2 ) * Move rsc3 ( node1 -> node2 ) diff --git a/cts/scheduler/summary/stonith-1.summary b/cts/scheduler/summary/stonith-1.summary index dfb4be43ee4..958342bf9c5 100644 --- a/cts/scheduler/summary/stonith-1.summary +++ b/cts/scheduler/summary/stonith-1.summary @@ -34,12 +34,12 @@ Transition Summary: * Move migrator ( sles-3 -> sles-4 ) * Move rsc_sles-3 ( sles-3 -> sles-4 ) * Move child_DoFencing:2 ( sles-3 -> sles-4 ) + * Move ocf_msdummy:2 ( sles-3 -> sles-2 Unpromoted ) + * Move ocf_msdummy:5 ( sles-3 -> sles-2 Unpromoted ) * Start ocf_msdummy:0 ( sles-4 ) * Start ocf_msdummy:1 ( sles-1 ) - * Move ocf_msdummy:2 ( sles-3 -> sles-2 Unpromoted ) * Start ocf_msdummy:3 ( sles-4 ) * Start ocf_msdummy:4 ( sles-1 ) - * Move ocf_msdummy:5 ( sles-3 -> sles-2 Unpromoted ) Executing Cluster Transition: * Pseudo action: group-1_start_0 @@ -69,19 +69,19 @@ Executing Cluster Transition: * Resource action: migrator monitor=10000 on sles-4 * Resource action: rsc_sles-3 monitor=5000 on sles-4 * Resource action: child_DoFencing:2 monitor=60000 on sles-4 + * Resource action: ocf_msdummy:2 start on sles-2 + * Resource action: ocf_msdummy:5 start on sles-2 * Resource action: ocf_msdummy:0 start on sles-4 * Resource action: ocf_msdummy:1 start on sles-1 - * Resource action: ocf_msdummy:2 start on sles-2 * Resource action: ocf_msdummy:3 start on sles-4 * Resource action: ocf_msdummy:4 start on sles-1 - * Resource action: ocf_msdummy:5 start on sles-2 * Pseudo action: master_rsc_1_running_0 + * Resource action: ocf_msdummy:2 monitor=5000 on sles-2 + * Resource action: ocf_msdummy:5 monitor=5000 on sles-2 * Resource action: ocf_msdummy:0 monitor=5000 on sles-4 * Resource action: ocf_msdummy:1 monitor=5000 on sles-1 - * Resource action: ocf_msdummy:2 monitor=5000 on sles-2 * Resource action: ocf_msdummy:3 monitor=5000 on sles-4 * Resource action: ocf_msdummy:4 monitor=5000 on sles-1 - * Resource action: ocf_msdummy:5 monitor=5000 on sles-2 Revised Cluster Status: * Node List: diff --git a/cts/scheduler/summary/stop-failure-no-quorum.summary b/cts/scheduler/summary/stop-failure-no-quorum.summary index e76827ddfc2..12027238122 100644 --- a/cts/scheduler/summary/stop-failure-no-quorum.summary +++ b/cts/scheduler/summary/stop-failure-no-quorum.summary @@ -20,8 +20,8 @@ Current cluster status: Transition Summary: * Fence (reboot) pcmk-2 'clvm:0 failed there' * Start dlm:0 ( pcmk-1 ) due to no quorum (blocked) - * Stop clvm:0 ( pcmk-2 ) due to node availability * Start clvm:2 ( pcmk-1 ) due to no quorum (blocked) + * Stop clvm:0 ( pcmk-2 ) due to node availability * Start ClusterIP ( pcmk-1 ) due to no quorum (blocked) * Start Fencing ( pcmk-1 ) due to no quorum (blocked) diff --git a/cts/scheduler/summary/stop-failure-with-fencing.summary b/cts/scheduler/summary/stop-failure-with-fencing.summary index 437708ef2e2..78d761c437d 100644 --- a/cts/scheduler/summary/stop-failure-with-fencing.summary +++ b/cts/scheduler/summary/stop-failure-with-fencing.summary @@ -17,8 +17,8 @@ Current cluster status: Transition Summary: * Fence (reboot) pcmk-2 'clvm:0 failed there' * Start dlm:0 ( pcmk-1 ) due to no quorum (blocked) - * Stop clvm:0 ( pcmk-2 ) due to node availability * Start clvm:1 ( pcmk-1 ) due to no quorum (blocked) + * Stop clvm:0 ( pcmk-2 ) due to node availability * Start ClusterIP ( pcmk-1 ) due to no quorum (blocked) * Start Fencing ( pcmk-1 ) due to no quorum (blocked) diff --git a/cts/scheduler/summary/ticket-promoted-2.summary b/cts/scheduler/summary/ticket-promoted-2.summary index dc67f96156b..fb3fd89bab8 100644 --- a/cts/scheduler/summary/ticket-promoted-2.summary +++ b/cts/scheduler/summary/ticket-promoted-2.summary @@ -8,13 +8,13 @@ Current cluster status: * Stopped: [ node1 node2 ] Transition Summary: - * Start rsc1:0 ( node2 ) * Promote rsc1:1 ( Stopped -> Promoted node1 ) + * Start rsc1:0 ( node2 ) Executing Cluster Transition: * Pseudo action: ms1_start_0 - * Resource action: rsc1:0 start on node2 * Resource action: rsc1:1 start on node1 + * Resource action: rsc1:0 start on node2 * Pseudo action: ms1_running_0 * Pseudo action: ms1_promote_0 * Resource action: rsc1:1 promote on node1 diff --git a/lib/pacemaker/pcmk_sched_clone.c b/lib/pacemaker/pcmk_sched_clone.c index 4f86621cbd0..18b7474db29 100644 --- a/lib/pacemaker/pcmk_sched_clone.c +++ b/lib/pacemaker/pcmk_sched_clone.c @@ -572,6 +572,8 @@ probe_anonymous_clone(pcmk_resource_t *clone, pcmk_node_t *node) // Otherwise, use the first clone instance if (child == NULL) { + clone->priv->children = g_list_sort(clone->priv->children, + pcmk__cmp_instance_number); child = clone->priv->children->data; } @@ -621,8 +623,6 @@ pcmk__clone_create_probe(pcmk_resource_t *rsc, pcmk_node_t *node) } } - rsc->priv->children = g_list_sort(rsc->priv->children, - pcmk__cmp_instance_number); if (pcmk_is_set(rsc->flags, pcmk__rsc_unique)) { return pcmk__probe_resource_list(rsc->priv->children, node); } else {