diff --git a/pengine/group.c b/pengine/group.c index c0f5e59b4f..57cfc4b303 100644 --- a/pengine/group.c +++ b/pengine/group.c @@ -1,537 +1,538 @@ /* * Copyright (C) 2004 Andrew Beekhof * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include #include #include #include #include #include #define VARIANT_GROUP 1 #include node_t * group_color(resource_t *rsc, pe_working_set_t *data_set) { node_t *node = NULL; node_t *group_node = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); if(is_not_set(rsc->flags, pe_rsc_provisional)) { return rsc->allocated_to; } crm_debug_2("Processing %s", rsc->id); if(is_set(rsc->flags, pe_rsc_allocating)) { crm_debug("Dependancy loop detected involving %s", rsc->id); return NULL; } if(group_data->first_child == NULL) { /* nothign to allocate */ clear_bit(rsc->flags, pe_rsc_provisional); return NULL; } set_bit(rsc->flags, pe_rsc_allocating); rsc->role = group_data->first_child->role; group_data->first_child->rsc_cons = g_list_concat( group_data->first_child->rsc_cons, rsc->rsc_cons); rsc->rsc_cons = NULL; dump_node_scores(scores_log_level, rsc, __PRETTY_FUNCTION__, rsc->allowed_nodes); slist_iter( child_rsc, resource_t, rsc->children, lpc, node = child_rsc->cmds->color(child_rsc, data_set); if(group_node == NULL) { group_node = node; } ); rsc->next_role = group_data->first_child->next_role; clear_bit(rsc->flags, pe_rsc_allocating); clear_bit(rsc->flags, pe_rsc_provisional); if(group_data->colocated) { return group_node; } return NULL; } void group_update_pseudo_status(resource_t *parent, resource_t *child); void group_create_actions(resource_t *rsc, pe_working_set_t *data_set) { action_t *op = NULL; const char *value = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_2("Creating actions for %s", rsc->id); slist_iter( child_rsc, resource_t, rsc->children, lpc, child_rsc->cmds->create_actions(child_rsc, data_set); group_update_pseudo_status(rsc, child_rsc); ); op = start_action(rsc, NULL, TRUE/* !group_data->child_starting */); op->pseudo = TRUE; op->runnable = TRUE; op = custom_action(rsc, started_key(rsc), CRMD_ACTION_STARTED, NULL, TRUE/* !group_data->child_starting */, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; op = stop_action(rsc, NULL, TRUE/* !group_data->child_stopping */); op->pseudo = TRUE; op->runnable = TRUE; op = custom_action(rsc, stopped_key(rsc), CRMD_ACTION_STOPPED, NULL, TRUE/* !group_data->child_stopping */, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; value = g_hash_table_lookup(rsc->parameters, crm_meta_name("stateful")); if(crm_is_true(value)) { op = custom_action(rsc, demote_key(rsc), CRMD_ACTION_DEMOTE, NULL, TRUE, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; op = custom_action(rsc, demoted_key(rsc), CRMD_ACTION_DEMOTED, NULL, TRUE, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; op = custom_action(rsc, promote_key(rsc), CRMD_ACTION_PROMOTE, NULL, TRUE, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; op = custom_action(rsc, promoted_key(rsc), CRMD_ACTION_PROMOTED, NULL, TRUE, TRUE, data_set); op->pseudo = TRUE; op->runnable = TRUE; } rsc->actions = rsc->actions; /* rsc->actions = NULL; */ } void group_update_pseudo_status(resource_t *parent, resource_t *child) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, parent); if(group_data->ordered == FALSE) { /* If this group is not ordered, then leave the meta-actions as optional */ return; } if(group_data->child_stopping && group_data->child_starting) { return; } slist_iter( action, action_t, child->actions, lpc, if(action->optional) { continue; } if(safe_str_eq(CRMD_ACTION_STOP, action->task) && action->runnable) { group_data->child_stopping = TRUE; crm_debug_3("Based on %s the group is stopping", action->uuid); } else if(safe_str_eq(CRMD_ACTION_START, action->task) && action->runnable) { group_data->child_starting = TRUE; crm_debug_3("Based on %s the group is starting", action->uuid); } ); } void group_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { const char *value = NULL; gboolean stateful = FALSE; resource_t *last_rsc = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); native_internal_constraints(rsc, data_set); value = g_hash_table_lookup(rsc->parameters, crm_meta_name("stateful")); stateful = crm_is_true(value); custom_action_order( rsc, stopped_key(rsc), NULL, rsc, start_key(rsc), NULL, pe_order_optional, data_set); custom_action_order( rsc, stop_key(rsc), NULL, rsc, stopped_key(rsc), NULL, pe_order_runnable_left|pe_order_implies_right|pe_order_implies_left, data_set); custom_action_order( rsc, start_key(rsc), NULL, rsc, started_key(rsc), NULL, pe_order_runnable_left, data_set); slist_iter( child_rsc, resource_t, rsc->children, lpc, int stop = pe_order_shutdown|pe_order_implies_right; int stopped = pe_order_implies_right_printed; int start = pe_order_implies_right|pe_order_runnable_left; int started = pe_order_runnable_left|pe_order_implies_right|pe_order_implies_right_printed; child_rsc->cmds->internal_constraints(child_rsc, data_set); if(last_rsc == NULL) { stop |= pe_order_implies_left; stopped = pe_order_implies_right; } else if(group_data->colocated) { rsc_colocation_new( "group:internal_colocation", NULL, INFINITY, child_rsc, last_rsc, NULL, NULL, data_set); } if(stateful) { custom_action_order(rsc, demote_key(rsc), NULL, child_rsc, demote_key(child_rsc), NULL, stop|pe_order_implies_left_printed, data_set); custom_action_order(child_rsc, demote_key(child_rsc), NULL, rsc, demoted_key(rsc), NULL, stopped, data_set); custom_action_order(child_rsc, promote_key(child_rsc), NULL, rsc, promoted_key(rsc), NULL, started, data_set); custom_action_order(rsc, promote_key(rsc), NULL, child_rsc, promote_key(child_rsc), NULL, pe_order_implies_left_printed, data_set); } + order_start_start(rsc, child_rsc, pe_order_implies_left_printed); order_stop_stop(rsc, child_rsc, stop|pe_order_implies_left_printed); custom_action_order(child_rsc, stop_key(child_rsc), NULL, rsc, stopped_key(rsc), NULL, stopped, data_set); custom_action_order(child_rsc, start_key(child_rsc), NULL, rsc, started_key(rsc), NULL, started, data_set); if(group_data->ordered == FALSE) { order_start_start(rsc, child_rsc, start|pe_order_implies_left_printed); if(stateful) { custom_action_order(rsc, promote_key(rsc), NULL, child_rsc, promote_key(child_rsc), NULL, start|pe_order_implies_left_printed, data_set); } } else if(last_rsc != NULL) { child_rsc->restart_type = pe_restart_restart; order_start_start(last_rsc, child_rsc, start); order_stop_stop(child_rsc, last_rsc, pe_order_implies_left); if(stateful) { custom_action_order(last_rsc, promote_key(last_rsc), NULL, child_rsc, promote_key(child_rsc), NULL, start, data_set); custom_action_order(child_rsc, demote_key(child_rsc), NULL, last_rsc, demote_key(last_rsc), NULL, pe_order_implies_left, data_set); } } else { /* If anyone in the group is starting, then * pe_order_implies_right will cause _everyone_ in the group * to be sent a start action * But this is safe since starting something that is already * started is required to be "safe" */ int flags = pe_order_implies_left|pe_order_implies_right|pe_order_runnable_right|pe_order_runnable_left; order_start_start(rsc, child_rsc, flags); if(stateful) { custom_action_order(rsc, promote_key(rsc), NULL, child_rsc, promote_key(child_rsc), NULL, flags, data_set); } } last_rsc = child_rsc; ); if(group_data->ordered && last_rsc != NULL) { int stop_stop_flags = pe_order_implies_right; int stop_stopped_flags = pe_order_implies_left; order_stop_stop(rsc, last_rsc, stop_stop_flags); custom_action_order(last_rsc, stop_key(last_rsc), NULL, rsc, stopped_key(rsc), NULL, stop_stopped_flags, data_set); if(stateful) { custom_action_order(rsc, demote_key(rsc), NULL, last_rsc, demote_key(last_rsc), NULL, stop_stop_flags, data_set); custom_action_order(last_rsc, demote_key(last_rsc), NULL, rsc, demoted_key(rsc), NULL, stop_stopped_flags, data_set); } } } void group_rsc_colocation_lh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { group_variant_data_t *group_data = NULL; if(rsc_lh == NULL) { pe_err("rsc_lh was NULL for %s", constraint->id); return; } else if(rsc_rh == NULL) { pe_err("rsc_rh was NULL for %s", constraint->id); return; } crm_debug_4("Processing constraints from %s", rsc_lh->id); get_group_variant_data(group_data, rsc_lh); if(group_data->colocated) { group_data->first_child->cmds->rsc_colocation_lh( group_data->first_child, rsc_rh, constraint); return; } else if(constraint->score >= INFINITY) { crm_config_err("%s: Cannot perform manditory colocation" " between non-colocated group and %s", rsc_lh->id, rsc_rh->id); return; } slist_iter( child_rsc, resource_t, rsc_lh->children, lpc, child_rsc->cmds->rsc_colocation_lh( child_rsc, rsc_rh, constraint); ); } void group_rsc_colocation_rh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc_rh); CRM_CHECK(rsc_lh->variant == pe_native, return); crm_debug_3("Processing RH of constraint %s", constraint->id); print_resource(LOG_DEBUG_3, "LHS", rsc_lh, TRUE); if(is_set(rsc_rh->flags, pe_rsc_provisional)) { return; } else if(group_data->colocated && group_data->first_child) { group_data->first_child->cmds->rsc_colocation_rh( rsc_lh, group_data->first_child, constraint); return; } else if(constraint->score >= INFINITY) { crm_config_err("%s: Cannot perform manditory colocation with" " non-colocated group: %s", rsc_lh->id, rsc_rh->id); return; } slist_iter( child_rsc, resource_t, rsc_rh->children, lpc, child_rsc->cmds->rsc_colocation_rh( rsc_lh, child_rsc, constraint); ); } void group_rsc_order_lh(resource_t *rsc, order_constraint_t *order, pe_working_set_t *data_set) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_2("%s->%s", order->lh_action_task, order->rh_action_task); if(order->rh_rsc != NULL && (rsc == order->rh_rsc || rsc == order->rh_rsc->parent)) { native_rsc_order_lh(rsc, order, data_set); return; } #if 0 if(order->type != pe_order_optional) { native_rsc_order_lh(rsc, order, data_set); } if(order->type & pe_order_implies_left) { native_rsc_order_lh(group_data->first_child, order, data_set); } #endif convert_non_atomic_task(rsc, order, TRUE); native_rsc_order_lh(rsc, order, data_set); } void group_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_2("%s->%s", lh_action->uuid, order->rh_action_task); if(rsc == NULL) { return; } if(safe_str_eq(CRM_OP_PROBED, lh_action->uuid)) { slist_iter( child_rsc, resource_t, rsc->children, lpc, child_rsc->cmds->rsc_order_rh(lh_action, child_rsc, order); ); if(rsc->fns->state(rsc, TRUE) < RSC_ROLE_STARTED && rsc->fns->state(rsc, FALSE) > RSC_ROLE_STOPPED) { order->type |= pe_order_implies_right; } } else if(lh_action->rsc != NULL && lh_action->rsc != rsc && lh_action->rsc != rsc->parent && lh_action->rsc->parent != rsc) { char *tmp = NULL; char *task_s = NULL; int interval = 0; enum action_tasks task = 0; parse_op_key(order->lh_action_task, &tmp, &task_s, &interval); task = text2task(task_s); crm_free(task_s); crm_free(tmp); switch(task) { case no_action: case monitor_rsc: case action_notify: case action_notified: case shutdown_crm: case stonith_node: break; case stop_rsc: case stopped_rsc: case action_demote: case action_demoted: order->type |= pe_order_complex_left; break; case start_rsc: case started_rsc: case action_promote: case action_promoted: order->type |= pe_order_complex_right; break; } } native_rsc_order_rh(lh_action, rsc, order); } void group_rsc_location(resource_t *rsc, rsc_to_node_t *constraint) { GListPtr saved = constraint->node_list_rh; GListPtr zero = node_list_dup(constraint->node_list_rh, TRUE, FALSE); gboolean reset_scores = TRUE; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug("Processing rsc_location %s for %s", constraint->id, rsc->id); slist_iter( child_rsc, resource_t, rsc->children, lpc, child_rsc->cmds->rsc_location(child_rsc, constraint); if(group_data->colocated && reset_scores) { reset_scores = FALSE; constraint->node_list_rh = zero; } ); constraint->node_list_rh = saved; pe_free_shallow_adv(zero, TRUE); } void group_expand(resource_t *rsc, pe_working_set_t *data_set) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_3("Processing actions from %s", rsc->id); CRM_CHECK(rsc != NULL, return); native_expand(rsc, data_set); slist_iter( child_rsc, resource_t, rsc->children, lpc, child_rsc->cmds->expand(child_rsc, data_set); ); } GListPtr group_merge_weights( resource_t *rsc, const char *rhs, GListPtr nodes, int factor, gboolean allow_rollback) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); if(is_set(rsc->flags, pe_rsc_merging)) { crm_debug("Breaking dependancy loop with %s at %s", rsc->id, rhs); return nodes; } else if(is_not_set(rsc->flags, pe_rsc_provisional) || can_run_any(nodes) == FALSE) { return nodes; } set_bit(rsc->flags, pe_rsc_merging); nodes = group_data->first_child->cmds->merge_weights( group_data->first_child, rhs, nodes, factor, allow_rollback); slist_iter( constraint, rsc_colocation_t, rsc->rsc_cons_lhs, lpc, nodes = native_merge_weights( constraint->rsc_lh, rsc->id, nodes, constraint->score/INFINITY, allow_rollback); ); clear_bit(rsc->flags, pe_rsc_merging); return nodes; } diff --git a/pengine/testcases/994-2.dot b/pengine/testcases/994-2.dot index 0cbf395fce..17b980d3b0 100644 --- a/pengine/testcases/994-2.dot +++ b/pengine/testcases/994-2.dot @@ -1,22 +1,27 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "depends_start_0 paul" [ style=bold color="green" fontcolor="black" ] "depends_stop_0 paul" -> "all_stopped" [ style = bold] "depends_stop_0 paul" -> "depends_start_0 paul" [ style = bold] "depends_stop_0 paul" -> "group_1_stop_0" [ style = bold] "depends_stop_0 paul" [ style=bold color="green" fontcolor="black" ] "group_1_running_0" -> "depends_start_0 paul" [ style = bold] "group_1_running_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_start_0" -> "group_1_running_0" [ style = bold] +"group_1_start_0" -> "postfix_9_start_0 paul" [ style = bold] +"group_1_start_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_stop_0" -> "group_1_start_0" [ style = bold] "group_1_stop_0" -> "group_1_stopped_0" [ style = bold] "group_1_stop_0" -> "postfix_9_stop_0 paul" [ style = bold] "group_1_stop_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_stopped_0" -> "group_1_start_0" [ style = bold] "group_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "postfix_9_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ] "postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold] "postfix_9_start_0 paul" -> "postfix_9_monitor_120000 paul" [ style = bold] "postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ] "postfix_9_stop_0 paul" -> "all_stopped" [ style = bold] "postfix_9_stop_0 paul" -> "group_1_stopped_0" [ style = bold] "postfix_9_stop_0 paul" -> "postfix_9_start_0 paul" [ style = bold] "postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/994-2.exp b/pengine/testcases/994-2.exp index ce432b102c..4d437f529a 100644 --- a/pengine/testcases/994-2.exp +++ b/pengine/testcases/994-2.exp @@ -1,121 +1,142 @@ + + + + + + + + + + + + + + + + + + - + - + - + - + - + + + + - + - + - + diff --git a/pengine/testcases/994.dot b/pengine/testcases/994.dot index 7845eec809..0f0c4aa598 100644 --- a/pengine/testcases/994.dot +++ b/pengine/testcases/994.dot @@ -1,16 +1,21 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_1_running_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_start_0" -> "group_1_running_0" [ style = bold] +"group_1_start_0" -> "postfix_9_start_0 paul" [ style = bold] +"group_1_start_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_stop_0" -> "group_1_start_0" [ style = bold] "group_1_stop_0" -> "group_1_stopped_0" [ style = bold] "group_1_stop_0" -> "postfix_9_stop_0 paul" [ style = bold] "group_1_stop_0" [ style=bold color="green" fontcolor="orange" ] +"group_1_stopped_0" -> "group_1_start_0" [ style = bold] "group_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "postfix_9_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ] "postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold] "postfix_9_start_0 paul" -> "postfix_9_monitor_120000 paul" [ style = bold] "postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ] "postfix_9_stop_0 paul" -> "all_stopped" [ style = bold] "postfix_9_stop_0 paul" -> "group_1_stopped_0" [ style = bold] "postfix_9_stop_0 paul" -> "postfix_9_start_0 paul" [ style = bold] "postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/994.exp b/pengine/testcases/994.exp index 8cb864f710..88a5422589 100644 --- a/pengine/testcases/994.exp +++ b/pengine/testcases/994.exp @@ -1,89 +1,110 @@ + + + + + + + + + + + + + + + + + + - + - + - + - + - + + + + - + diff --git a/pengine/testcases/bug-1572-1.dot b/pengine/testcases/bug-1572-1.dot index ad04693dc6..cd7ddbee1d 100644 --- a/pengine/testcases/bug-1572-1.dot +++ b/pengine/testcases/bug-1572-1.dot @@ -1,152 +1,154 @@ digraph "g" { "IPaddr_147_81_84_133_monitor_25000 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" -> "IPaddr_147_81_84_133_monitor_25000 arc-tkincaidlx.wsicorp.com" [ style = bold] "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "grp_pgsql_mirror_running_0" [ style=bold color="green" fontcolor="orange" ] +"grp_pgsql_mirror_start_0" -> "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_start_0" -> "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_start_0" -> "grp_pgsql_mirror_running_0" [ style = bold] +"grp_pgsql_mirror_start_0" -> "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_start_0" [ style=bold color="green" fontcolor="orange" ] "grp_pgsql_mirror_stop_0" -> "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_stop_0" -> "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_stop_0" -> "grp_pgsql_mirror_start_0" [ style = bold] "grp_pgsql_mirror_stop_0" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "grp_pgsql_mirror_stop_0" -> "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "grp_pgsql_mirror_stop_0" [ style=bold color="green" fontcolor="orange" ] "grp_pgsql_mirror_stopped_0" -> "grp_pgsql_mirror_start_0" [ style = bold] "grp_pgsql_mirror_stopped_0" -> "ms_drbd_7788_demote_0" [ style = bold] "grp_pgsql_mirror_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_demote_0" -> "ms_drbd_7788_pre_notify_stop_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_demote_0" -> "ms_drbd_7788_stop_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_promote_0" -> "grp_pgsql_mirror_start_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_start_0" -> "ms_drbd_7788_pre_notify_promote_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_start_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_stop_0" -> "ms_drbd_7788_pre_notify_start_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stop_0" -> "ms_drbd_7788_start_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-pre_notify_demote_0" -> "ms_drbd_7788_demote_0" [ style = bold] "ms_drbd_7788_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-pre_notify_promote_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-pre_notify_start_0" -> "ms_drbd_7788_start_0" [ style = bold] "ms_drbd_7788_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-pre_notify_stop_0" -> "ms_drbd_7788_stop_0" [ style = bold] "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_demote_0" -> "ms_drbd_7788_demoted_0" [ style = bold] "ms_drbd_7788_demote_0" -> "ms_drbd_7788_stop_0" [ style = bold] "ms_drbd_7788_demote_0" -> "rsc_drbd_7788:1_demote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_demoted_0" -> "ms_drbd_7788_post_notify_demote_0" [ style = bold] "ms_drbd_7788_demoted_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_demoted_0" -> "ms_drbd_7788_start_0" [ style = bold] "ms_drbd_7788_demoted_0" -> "ms_drbd_7788_stop_0" [ style = bold] "ms_drbd_7788_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_post_notify_demote_0" -> "ms_drbd_7788_confirmed-post_notify_demote_0" [ style = bold] "ms_drbd_7788_post_notify_demote_0" -> "rsc_drbd_7788:0_post_notify_demote_0 arc-dknightlx" [ style = bold] "ms_drbd_7788_post_notify_demote_0" -> "rsc_drbd_7788:1_post_notify_demote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_post_notify_promote_0" -> "ms_drbd_7788_confirmed-post_notify_promote_0" [ style = bold] "ms_drbd_7788_post_notify_promote_0" -> "rsc_drbd_7788:1_post_notify_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_post_notify_start_0" -> "ms_drbd_7788_confirmed-post_notify_start_0" [ style = bold] "ms_drbd_7788_post_notify_start_0" -> "rsc_drbd_7788:1_post_notify_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_post_notify_stop_0" -> "ms_drbd_7788_confirmed-post_notify_stop_0" [ style = bold] "ms_drbd_7788_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_pre_notify_demote_0" -> "ms_drbd_7788_confirmed-pre_notify_demote_0" [ style = bold] "ms_drbd_7788_pre_notify_demote_0" -> "rsc_drbd_7788:0_pre_notify_demote_0 arc-dknightlx" [ style = bold] "ms_drbd_7788_pre_notify_demote_0" -> "rsc_drbd_7788:1_pre_notify_demote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_pre_notify_promote_0" -> "ms_drbd_7788_confirmed-pre_notify_promote_0" [ style = bold] "ms_drbd_7788_pre_notify_promote_0" -> "rsc_drbd_7788:1_pre_notify_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_pre_notify_start_0" -> "ms_drbd_7788_confirmed-pre_notify_start_0" [ style = bold] "ms_drbd_7788_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_pre_notify_stop_0" -> "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style = bold] "ms_drbd_7788_pre_notify_stop_0" -> "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" [ style = bold] "ms_drbd_7788_pre_notify_stop_0" -> "rsc_drbd_7788:1_pre_notify_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_promote_0" -> "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_promoted_0" -> "grp_pgsql_mirror_start_0" [ style = bold] "ms_drbd_7788_promoted_0" -> "ms_drbd_7788_post_notify_promote_0" [ style = bold] "ms_drbd_7788_promoted_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_running_0" -> "ms_drbd_7788_post_notify_start_0" [ style = bold] "ms_drbd_7788_running_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_running_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_start_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_start_0" -> "ms_drbd_7788_running_0" [ style = bold] "ms_drbd_7788_start_0" -> "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_stop_0" -> "ms_drbd_7788_start_0" [ style = bold] "ms_drbd_7788_stop_0" -> "ms_drbd_7788_stopped_0" [ style = bold] "ms_drbd_7788_stop_0" -> "rsc_drbd_7788:0_stop_0 arc-dknightlx" [ style = bold] "ms_drbd_7788_stop_0" -> "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "ms_drbd_7788_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_stopped_0" -> "ms_drbd_7788_post_notify_stop_0" [ style = bold] "ms_drbd_7788_stopped_0" -> "ms_drbd_7788_promote_0" [ style = bold] "ms_drbd_7788_stopped_0" -> "ms_drbd_7788_start_0" [ style = bold] "ms_drbd_7788_stopped_0" [ style=bold color="green" fontcolor="orange" ] "pgsql_5555_monitor_30000 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" -> "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_monitor_30000 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_post_notify_demote_0 arc-dknightlx" -> "ms_drbd_7788_confirmed-post_notify_demote_0" [ style = bold] "rsc_drbd_7788:0_post_notify_demote_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_pre_notify_demote_0 arc-dknightlx" -> "ms_drbd_7788_confirmed-pre_notify_demote_0" [ style = bold] "rsc_drbd_7788:0_pre_notify_demote_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" -> "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style = bold] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "all_stopped" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "do_shutdown arc-dknightlx" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "ms_drbd_7788_stopped_0" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_demote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_demoted_0" [ style = bold] "rsc_drbd_7788:1_demote_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_demote_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_demote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_post_notify_demote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-post_notify_demote_0" [ style = bold] "rsc_drbd_7788:1_post_notify_demote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_post_notify_promote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-post_notify_promote_0" [ style = bold] "rsc_drbd_7788:1_post_notify_promote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_post_notify_start_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-post_notify_start_0" [ style = bold] "rsc_drbd_7788:1_post_notify_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_pre_notify_demote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-pre_notify_demote_0" [ style = bold] "rsc_drbd_7788:1_pre_notify_demote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_pre_notify_promote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-pre_notify_promote_0" [ style = bold] "rsc_drbd_7788:1_pre_notify_promote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_pre_notify_stop_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style = bold] "rsc_drbd_7788:1_pre_notify_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_promoted_0" [ style = bold] "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_running_0" [ style = bold] "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_stopped_0" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/bug-1572-1.exp b/pengine/testcases/bug-1572-1.exp index 6c76754f74..9073ef75ed 100644 --- a/pengine/testcases/bug-1572-1.exp +++ b/pengine/testcases/bug-1572-1.exp @@ -1,785 +1,791 @@ + + + + + + diff --git a/pengine/testcases/bug-1718.dot b/pengine/testcases/bug-1718.dot index da1c07b974..2e04cd7922 100644 --- a/pengine/testcases/bug-1718.dot +++ b/pengine/testcases/bug-1718.dot @@ -1,28 +1,29 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_fUN_running_0" [ style=dashed color="red" fontcolor="orange" ] "group_fUN_start_0" -> "group_fUN_running_0" [ style = dashed] "group_fUN_start_0" -> "resource_IP3_start_0 ops.ds9" [ style = dashed] +"group_fUN_start_0" -> "resource_dummy_start_0 ops.ds9" [ style = dashed] "group_fUN_start_0" [ style=dashed color="red" fontcolor="orange" ] "group_fUN_stop_0" -> "group_fUN_start_0" [ style = dashed] "group_fUN_stop_0" -> "group_fUN_stopped_0" [ style = bold] "group_fUN_stop_0" -> "resource_IP3_stop_0 ops.ds9" [ style = bold] "group_fUN_stop_0" -> "resource_dummy_stop_0 ops.ds9" [ style = bold] "group_fUN_stop_0" [ style=bold color="green" fontcolor="orange" ] "group_fUN_stopped_0" -> "group_fUN_start_0" [ style = dashed] "group_fUN_stopped_0" [ style=bold color="green" fontcolor="orange" ] "resource_IP3_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed] "resource_IP3_start_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed] "resource_IP3_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ] "resource_IP3_stop_0 ops.ds9" -> "all_stopped" [ style = bold] "resource_IP3_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold] "resource_IP3_stop_0 ops.ds9" -> "resource_IP3_start_0 ops.ds9" [ style = dashed] "resource_IP3_stop_0 ops.ds9" [ style=bold color="green" fontcolor="black" ] "resource_dummy_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed] "resource_dummy_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ] "resource_dummy_stop_0 ops.ds9" -> "all_stopped" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "resource_IP3_stop_0 ops.ds9" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed] "resource_dummy_stop_0 ops.ds9" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/bug-1820-1.dot b/pengine/testcases/bug-1820-1.dot index f03bd0a007..93ae3947a5 100644 --- a/pengine/testcases/bug-1820-1.dot +++ b/pengine/testcases/bug-1820-1.dot @@ -1,46 +1,47 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown star" [ style=bold color="green" fontcolor="black" ] "gr1_running_0" [ style=bold color="green" fontcolor="orange" ] "gr1_start_0" -> "gr1_running_0" [ style = bold] "gr1_start_0" -> "test1_start_0 world" [ style = bold] +"gr1_start_0" -> "test2_start_0 world" [ style = bold] "gr1_start_0" [ style=bold color="green" fontcolor="orange" ] "gr1_stop_0" -> "gr1_start_0" [ style = bold] "gr1_stop_0" -> "gr1_stopped_0" [ style = bold] "gr1_stop_0" -> "test1_stop_0 star" [ style = bold] "gr1_stop_0" -> "test2_stop_0 star" [ style = bold] "gr1_stop_0" [ style=bold color="green" fontcolor="orange" ] "gr1_stopped_0" -> "gr1_start_0" [ style = bold] "gr1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "p1_monitor_0 star" -> "probe_complete star" [ style = bold] "p1_monitor_0 star" [ style=bold color="green" fontcolor="black" ] "p1_monitor_0 world" -> "probe_complete world" [ style = bold] "p1_monitor_0 world" [ style=bold color="green" fontcolor="black" ] "p1_start_0 world" [ style=bold color="green" fontcolor="black" ] "probe_complete star" -> "probe_complete" [ style = bold] "probe_complete star" [ style=bold color="green" fontcolor="black" ] "probe_complete world" -> "probe_complete" [ style = bold] "probe_complete world" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "p1_start_0 world" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "test1_monitor_10000 world" [ style=bold color="green" fontcolor="black" ] "test1_start_0 world" -> "gr1_running_0" [ style = bold] "test1_start_0 world" -> "test1_monitor_10000 world" [ style = bold] "test1_start_0 world" -> "test2_start_0 world" [ style = bold] "test1_start_0 world" [ style=bold color="green" fontcolor="black" ] "test1_stop_0 star" -> "all_stopped" [ style = bold] "test1_stop_0 star" -> "do_shutdown star" [ style = bold] "test1_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test1_stop_0 star" -> "test1_start_0 world" [ style = bold] "test1_stop_0 star" [ style=bold color="green" fontcolor="black" ] "test2_monitor_10000 world" [ style=bold color="green" fontcolor="black" ] "test2_start_0 world" -> "gr1_running_0" [ style = bold] "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold] "test2_start_0 world" [ style=bold color="green" fontcolor="black" ] "test2_stop_0 star" -> "all_stopped" [ style = bold] "test2_stop_0 star" -> "do_shutdown star" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test2_stop_0 star" -> "test1_stop_0 star" [ style = bold] "test2_stop_0 star" -> "test2_start_0 world" [ style = bold] "test2_stop_0 star" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/bug-1820-1.exp b/pengine/testcases/bug-1820-1.exp index 738f2c1c42..2c526b16de 100644 --- a/pengine/testcases/bug-1820-1.exp +++ b/pengine/testcases/bug-1820-1.exp @@ -1,249 +1,252 @@ + + + diff --git a/pengine/testcases/bug-1820.dot b/pengine/testcases/bug-1820.dot index c3682bf5b8..984c1e57e0 100644 --- a/pengine/testcases/bug-1820.dot +++ b/pengine/testcases/bug-1820.dot @@ -1,37 +1,38 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown star" [ style=bold color="green" fontcolor="black" ] "gr1_running_0" [ style=bold color="green" fontcolor="orange" ] "gr1_start_0" -> "gr1_running_0" [ style = bold] "gr1_start_0" -> "test1_migrate_from_0 world" [ style = bold] +"gr1_start_0" -> "test2_start_0 world" [ style = bold] "gr1_start_0" [ style=bold color="green" fontcolor="orange" ] "gr1_stop_0" -> "gr1_start_0" [ style = bold] "gr1_stop_0" -> "gr1_stopped_0" [ style = bold] "gr1_stop_0" -> "test1_migrate_to_0 star" [ style = bold] "gr1_stop_0" -> "test2_stop_0 star" [ style = bold] "gr1_stop_0" [ style=bold color="green" fontcolor="orange" ] "gr1_stopped_0" -> "gr1_start_0" [ style = bold] "gr1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "test1_migrate_from_0 world" -> "all_stopped" [ style = bold] "test1_migrate_from_0 world" -> "do_shutdown star" [ style = bold] "test1_migrate_from_0 world" -> "gr1_running_0" [ style = bold] "test1_migrate_from_0 world" -> "test1_monitor_10000 world" [ style = bold] "test1_migrate_from_0 world" -> "test2_start_0 world" [ style = bold] "test1_migrate_from_0 world" [ style=bold color="green" fontcolor="black" ] "test1_migrate_to_0 star" -> "all_stopped" [ style = bold] "test1_migrate_to_0 star" -> "do_shutdown star" [ style = bold] "test1_migrate_to_0 star" -> "gr1_stopped_0" [ style = bold] "test1_migrate_to_0 star" -> "test1_migrate_from_0 world" [ style = bold] "test1_migrate_to_0 star" [ style=bold color="green" fontcolor="black" ] "test1_monitor_10000 world" [ style=bold color="green" fontcolor="black" ] "test2_monitor_10000 world" [ style=bold color="green" fontcolor="black" ] "test2_start_0 world" -> "gr1_running_0" [ style = bold] "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold] "test2_start_0 world" [ style=bold color="green" fontcolor="black" ] "test2_stop_0 star" -> "all_stopped" [ style = bold] "test2_stop_0 star" -> "do_shutdown star" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test2_stop_0 star" -> "test1_migrate_to_0 star" [ style = bold] "test2_stop_0 star" -> "test2_start_0 world" [ style = bold] "test2_stop_0 star" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/bug-1820.exp b/pengine/testcases/bug-1820.exp index 3d17c22e08..bb95cf1291 100644 --- a/pengine/testcases/bug-1820.exp +++ b/pengine/testcases/bug-1820.exp @@ -1,185 +1,188 @@ + + + diff --git a/pengine/testcases/cloned-group.dot b/pengine/testcases/cloned-group.dot index 756d80d8a5..33b3baaae7 100644 --- a/pengine/testcases/cloned-group.dot +++ b/pengine/testcases/cloned-group.dot @@ -1,76 +1,77 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache2:0_monitor_10000 webcluster01" [ style=bold color="green" fontcolor="black" ] "apache2:0_start_0 webcluster01" -> "apache2:0_monitor_10000 webcluster01" [ style = bold] "apache2:0_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold] "apache2:0_start_0 webcluster01" -> "mysql-proxy:0_start_0 webcluster01" [ style = bold] "apache2:0_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ] "apache2:0_stop_0 webcluster01" -> "all_stopped" [ style = bold] "apache2:0_stop_0 webcluster01" -> "apache2:0_start_0 webcluster01" [ style = bold] "apache2:0_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold] "apache2:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ] "apache2:1_monitor_10000 webcluster01" [ style=dashed color="red" fontcolor="black" ] "apache2:1_start_0 " -> "apache2:1_monitor_10000 webcluster01" [ style = dashed] "apache2:1_start_0 " -> "grrr:1_running_0" [ style = dashed] "apache2:1_start_0 " -> "mysql-proxy:1_start_0 " [ style = dashed] "apache2:1_start_0 " [ style=dashed color="red" fontcolor="black" ] "apache2:1_stop_0 webcluster01" -> "all_stopped" [ style = bold] "apache2:1_stop_0 webcluster01" -> "apache2:1_start_0 " [ style = dashed] "apache2:1_stop_0 webcluster01" -> "grrr:1_stopped_0" [ style = bold] "apache2:1_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ] "apache2_clone_running_0" [ style=bold color="green" fontcolor="orange" ] "apache2_clone_start_0" -> "apache2_clone_running_0" [ style = bold] "apache2_clone_start_0" -> "grrr:0_start_0" [ style = bold] "apache2_clone_start_0" -> "grrr:1_start_0" [ style = dashed] "apache2_clone_start_0" [ style=bold color="green" fontcolor="orange" ] "apache2_clone_stop_0" -> "apache2_clone_start_0" [ style = bold] "apache2_clone_stop_0" -> "apache2_clone_stopped_0" [ style = bold] "apache2_clone_stop_0" -> "grrr:0_stop_0" [ style = bold] "apache2_clone_stop_0" -> "grrr:1_stop_0" [ style = bold] "apache2_clone_stop_0" [ style=bold color="green" fontcolor="orange" ] "apache2_clone_stopped_0" -> "apache2_clone_start_0" [ style = bold] "apache2_clone_stopped_0" [ style=bold color="green" fontcolor="orange" ] "grrr:0_running_0" -> "apache2_clone_running_0" [ style = bold] "grrr:0_running_0" [ style=bold color="green" fontcolor="orange" ] "grrr:0_start_0" -> "apache2:0_start_0 webcluster01" [ style = bold] "grrr:0_start_0" -> "grrr:0_running_0" [ style = bold] +"grrr:0_start_0" -> "mysql-proxy:0_start_0 webcluster01" [ style = bold] "grrr:0_start_0" [ style=bold color="green" fontcolor="orange" ] "grrr:0_stop_0" -> "apache2:0_stop_0 webcluster01" [ style = bold] "grrr:0_stop_0" -> "grrr:0_start_0" [ style = bold] "grrr:0_stop_0" -> "grrr:0_stopped_0" [ style = bold] "grrr:0_stop_0" -> "mysql-proxy:0_stop_0 webcluster01" [ style = bold] "grrr:0_stop_0" [ style=bold color="green" fontcolor="orange" ] "grrr:0_stopped_0" -> "apache2_clone_stopped_0" [ style = bold] "grrr:0_stopped_0" -> "grrr:0_start_0" [ style = bold] "grrr:0_stopped_0" [ style=bold color="green" fontcolor="orange" ] "grrr:1_running_0" -> "apache2_clone_running_0" [ style = dashed] "grrr:1_running_0" [ style=dashed color="red" fontcolor="orange" ] "grrr:1_start_0" -> "apache2:1_start_0 " [ style = dashed] "grrr:1_start_0" -> "grrr:1_running_0" [ style = dashed] "grrr:1_start_0" [ style=dashed color="red" fontcolor="orange" ] "grrr:1_stop_0" -> "apache2:1_stop_0 webcluster01" [ style = bold] "grrr:1_stop_0" -> "grrr:1_start_0" [ style = dashed] "grrr:1_stop_0" -> "grrr:1_stopped_0" [ style = bold] "grrr:1_stop_0" -> "mysql-proxy:1_stop_0 webcluster01" [ style = bold] "grrr:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "grrr:1_stopped_0" -> "apache2_clone_stopped_0" [ style = bold] "grrr:1_stopped_0" -> "grrr:1_start_0" [ style = dashed] "grrr:1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "mysql-proxy:0_monitor_10000 webcluster01" [ style=bold color="green" fontcolor="black" ] "mysql-proxy:0_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold] "mysql-proxy:0_start_0 webcluster01" -> "mysql-proxy:0_monitor_10000 webcluster01" [ style = bold] "mysql-proxy:0_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ] "mysql-proxy:0_stop_0 webcluster01" -> "all_stopped" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" -> "apache2:0_stop_0 webcluster01" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" -> "mysql-proxy:0_start_0 webcluster01" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ] "mysql-proxy:1_monitor_10000 webcluster01" [ style=dashed color="red" fontcolor="black" ] "mysql-proxy:1_start_0 " -> "grrr:1_running_0" [ style = dashed] "mysql-proxy:1_start_0 " -> "mysql-proxy:1_monitor_10000 webcluster01" [ style = dashed] "mysql-proxy:1_start_0 " [ style=dashed color="red" fontcolor="black" ] "mysql-proxy:1_stop_0 webcluster01" -> "all_stopped" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" -> "apache2:1_stop_0 webcluster01" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" -> "grrr:1_stopped_0" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/cloned-group.exp b/pengine/testcases/cloned-group.exp index 118e195ef2..de5a01df67 100644 --- a/pengine/testcases/cloned-group.exp +++ b/pengine/testcases/cloned-group.exp @@ -1,292 +1,295 @@ + + + diff --git a/pengine/testcases/coloc-slave-anti.dot b/pengine/testcases/coloc-slave-anti.dot index fa6ddbadcd..c72235bf39 100644 --- a/pengine/testcases/coloc-slave-anti.dot +++ b/pengine/testcases/coloc-slave-anti.dot @@ -1,20 +1,22 @@ digraph "g" { "apache_monitor_60000 pollux" [ style=bold color="green" fontcolor="black" ] "apache_start_0 pollux" -> "apache_monitor_60000 pollux" [ style = bold] "apache_start_0 pollux" -> "group-1_running_0" [ style = bold] "apache_start_0 pollux" [ style=bold color="green" fontcolor="black" ] "fs-1_monitor_20000 pollux" [ style=bold color="green" fontcolor="black" ] "fs-1_start_0 pollux" -> "fs-1_monitor_20000 pollux" [ style = bold] "fs-1_start_0 pollux" -> "group-1_running_0" [ style = bold] "fs-1_start_0 pollux" -> "ip-198_start_0 pollux" [ style = bold] "fs-1_start_0 pollux" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] +"group-1_start_0" -> "apache_start_0 pollux" [ style = bold] "group-1_start_0" -> "fs-1_start_0 pollux" [ style = bold] "group-1_start_0" -> "group-1_running_0" [ style = bold] +"group-1_start_0" -> "ip-198_start_0 pollux" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "ip-198_monitor_30000 pollux" [ style=bold color="green" fontcolor="black" ] "ip-198_start_0 pollux" -> "apache_start_0 pollux" [ style = bold] "ip-198_start_0 pollux" -> "group-1_running_0" [ style = bold] "ip-198_start_0 pollux" -> "ip-198_monitor_30000 pollux" [ style = bold] "ip-198_start_0 pollux" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/coloc-slave-anti.exp b/pengine/testcases/coloc-slave-anti.exp index 571785b9ad..2583ad6f43 100644 --- a/pengine/testcases/coloc-slave-anti.exp +++ b/pengine/testcases/coloc-slave-anti.exp @@ -1,110 +1,116 @@ + + + + + + diff --git a/pengine/testcases/group1.dot b/pengine/testcases/group1.dot index f523803962..61502a6b63 100644 --- a/pengine/testcases/group1.dot +++ b/pengine/testcases/group1.dot @@ -1,35 +1,37 @@ digraph "g" { "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold] "child_rsc1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold] "child_rsc2_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1_start_0 node1" [ style = bold] +"rsc1_start_0" -> "child_rsc2_start_0 node1" [ style = bold] +"rsc1_start_0" -> "child_rsc3_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group1.exp b/pengine/testcases/group1.exp index 763742df66..c695a891a0 100644 --- a/pengine/testcases/group1.exp +++ b/pengine/testcases/group1.exp @@ -1,189 +1,195 @@ + + + + + + diff --git a/pengine/testcases/group10.dot b/pengine/testcases/group10.dot index a20f980087..561f51a7b9 100644 --- a/pengine/testcases/group10.dot +++ b/pengine/testcases/group10.dot @@ -1,70 +1,72 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_192.168.100.181_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.181_monitor_5000 c001n01" [ style = bold] "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold] "child_192.168.100.181_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.181_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.181_stop_0 c001n01" -> "child_192.168.100.181_start_0 c001n01" [ style = bold] "child_192.168.100.181_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] "child_192.168.100.181_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_start_0 c001n01" -> "child_192.168.100.182_monitor_5000 c001n01" [ style = bold] "child_192.168.100.182_start_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "child_192.168.100.182_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.182_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.181_stop_0 c001n01" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] "child_192.168.100.182_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_start_0 c001n01" -> "child_192.168.100.183_monitor_5000 c001n01" [ style = bold] "child_192.168.100.183_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.183_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.182_stop_0 c001n01" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] "child_192.168.100.183_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "child_DoFencing:1_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "child_DoFencing:2_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "child_192.168.100.181_start_0 c001n01" [ style = bold] +"group-1_start_0" -> "child_192.168.100.182_start_0 c001n01" [ style = bold] +"group-1_start_0" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "group-1_start_0" -> "group-1_running_0" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stop_0" -> "child_192.168.100.181_stop_0 c001n01" [ style = bold] "group-1_stop_0" -> "child_192.168.100.182_stop_0 c001n01" [ style = bold] "group-1_stop_0" -> "child_192.168.100.183_stop_0 c001n01" [ style = bold] "group-1_stop_0" -> "group-1_start_0" [ style = bold] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete c001n01" -> "probe_complete" [ style = bold] "probe_complete c001n01" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n02" -> "probe_complete" [ style = bold] "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n03" -> "probe_complete" [ style = bold] "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n08" -> "probe_complete" [ style = bold] "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group10.exp b/pengine/testcases/group10.exp index a622694358..18ce6073c0 100644 --- a/pengine/testcases/group10.exp +++ b/pengine/testcases/group10.exp @@ -1,383 +1,389 @@ + + + + + + diff --git a/pengine/testcases/group14.dot b/pengine/testcases/group14.dot index 4dc0d143ed..0eeed09775 100644 --- a/pengine/testcases/group14.dot +++ b/pengine/testcases/group14.dot @@ -1,67 +1,69 @@ digraph "g" { "192.168.100.181_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.181_start_0 c001n07" -> "192.168.100.181_monitor_5000 c001n07" [ style = dashed] "192.168.100.181_start_0 c001n07" -> "192.168.100.182_start_0 c001n07" [ style = dashed] "192.168.100.181_start_0 c001n07" -> "group-1_running_0" [ style = dashed] "192.168.100.181_start_0 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.181_stop_0 c001n06" -> "192.168.100.181_start_0 c001n07" [ style = dashed] "192.168.100.181_stop_0 c001n06" -> "all_stopped" [ style = bold] "192.168.100.181_stop_0 c001n06" -> "group-1_stopped_0" [ style = bold] "192.168.100.181_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "192.168.100.182_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.182_start_0 c001n07" -> "192.168.100.182_monitor_5000 c001n07" [ style = dashed] "192.168.100.182_start_0 c001n07" -> "192.168.100.183_start_0 c001n07" [ style = dashed] "192.168.100.182_start_0 c001n07" -> "group-1_running_0" [ style = dashed] "192.168.100.182_start_0 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.182_stop_0" -> "192.168.100.181_stop_0 c001n06" [ style = bold] "192.168.100.182_stop_0" -> "all_stopped" [ style = bold] "192.168.100.182_stop_0" -> "group-1_stopped_0" [ style = bold] "192.168.100.182_stop_0" [ style=bold color="green" fontcolor="orange" ] "192.168.100.183_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.183_start_0 c001n07" -> "192.168.100.183_monitor_5000 c001n07" [ style = dashed] "192.168.100.183_start_0 c001n07" -> "group-1_running_0" [ style = dashed] "192.168.100.183_start_0 c001n07" [ style=dashed color="red" fontcolor="black" ] "192.168.100.183_stop_0" -> "192.168.100.182_stop_0" [ style = bold] "192.168.100.183_stop_0" -> "all_stopped" [ style = bold] "192.168.100.183_stop_0" -> "group-1_stopped_0" [ style = bold] "192.168.100.183_stop_0" [ style=bold color="green" fontcolor="orange" ] "DcIPaddr_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:0_start_0 c001n06" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n07" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_20000 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 c001n06" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:0_start_0 c001n06" -> "child_DoFencing:0_monitor_20000 c001n06" [ style = bold] "child_DoFencing:0_start_0 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_20000 c001n07" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_start_0 c001n07" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:1_start_0 c001n07" -> "child_DoFencing:1_monitor_20000 c001n07" [ style = bold] "child_DoFencing:1_start_0 c001n07" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=dashed color="red" fontcolor="orange" ] "group-1_start_0" -> "192.168.100.181_start_0 c001n07" [ style = dashed] +"group-1_start_0" -> "192.168.100.182_start_0 c001n07" [ style = dashed] +"group-1_start_0" -> "192.168.100.183_start_0 c001n07" [ style = dashed] "group-1_start_0" -> "group-1_running_0" [ style = dashed] "group-1_start_0" [ style=dashed color="red" fontcolor="orange" ] "group-1_stop_0" -> "192.168.100.181_stop_0 c001n06" [ style = bold] "group-1_stop_0" -> "192.168.100.182_stop_0" [ style = bold] "group-1_stop_0" -> "192.168.100.183_stop_0" [ style = bold] "group-1_stop_0" -> "group-1_start_0" [ style = dashed] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = dashed] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "lsb_dummy_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "migrator_monitor_10000 c001n06" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:0_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:1_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:2_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:3_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n04_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n05_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n06_monitor_5000 c001n06" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n07_monitor_5000 c001n07" [ style=dashed color="red" fontcolor="black" ] } diff --git a/pengine/testcases/group15.dot b/pengine/testcases/group15.dot index 36a38c2dee..2aa70e103b 100644 --- a/pengine/testcases/group15.dot +++ b/pengine/testcases/group15.dot @@ -1,47 +1,49 @@ digraph "g" { "bar_running_0" [ style=bold color="green" fontcolor="orange" ] "bar_start_0" -> "bar_running_0" [ style = bold] "bar_start_0" -> "rsc6_start_0 node1" [ style = bold] +"bar_start_0" -> "rsc7_start_0 node1" [ style = bold] +"bar_start_0" -> "rsc8_start_0 node1" [ style = bold] "bar_start_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "bar_start_0" [ style = bold] "probe_complete" -> "rsc6_start_0 node1" [ style = bold] "probe_complete" -> "rsc7_start_0 node1" [ style = bold] "probe_complete" -> "rsc8_start_0 node1" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node1" -> "bar_running_0" [ style = bold] "rsc6_start_0 node1" -> "rsc7_start_0 node1" [ style = bold] "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0 node1" -> "bar_running_0" [ style = bold] "rsc7_start_0 node1" -> "rsc8_start_0 node1" [ style = bold] "rsc7_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" -> "bar_running_0" [ style = bold] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/group15.exp b/pengine/testcases/group15.exp index a41ba0d699..9bc08fd1d7 100644 --- a/pengine/testcases/group15.exp +++ b/pengine/testcases/group15.exp @@ -1,261 +1,267 @@ + + + + + + diff --git a/pengine/testcases/group2.dot b/pengine/testcases/group2.dot index e5025d36fb..65a63f9c24 100644 --- a/pengine/testcases/group2.dot +++ b/pengine/testcases/group2.dot @@ -1,49 +1,51 @@ digraph "g" { "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" -> "rsc3_start_0 node1" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc2_start_0" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" -> "rsc3_start_0 node1" [ style = bold] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc2_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc3_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/group2.exp b/pengine/testcases/group2.exp index 895a0eb48d..8805806962 100644 --- a/pengine/testcases/group2.exp +++ b/pengine/testcases/group2.exp @@ -1,269 +1,275 @@ + + + + + + diff --git a/pengine/testcases/group3.dot b/pengine/testcases/group3.dot index 0c16f3bb84..7cac1d5ef9 100644 --- a/pengine/testcases/group3.dot +++ b/pengine/testcases/group3.dot @@ -1,64 +1,68 @@ digraph "g" { "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold] "child_rsc1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold] "child_rsc2_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc4_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc5_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc6_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1_start_0 node1" [ style = bold] +"rsc1_start_0" -> "child_rsc2_start_0 node1" [ style = bold] +"rsc1_start_0" -> "child_rsc3_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc4_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc5_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc6_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group3.exp b/pengine/testcases/group3.exp index 430add9b18..2fa6f58554 100644 --- a/pengine/testcases/group3.exp +++ b/pengine/testcases/group3.exp @@ -1,345 +1,357 @@ + + + + + + + + + + + + diff --git a/pengine/testcases/group5.dot b/pengine/testcases/group5.dot index 9310048857..585b6e76fa 100644 --- a/pengine/testcases/group5.dot +++ b/pengine/testcases/group5.dot @@ -1,70 +1,72 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" -> "rsc3_start_0 node2" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" -> "rsc3_start_0 node2" [ style = bold] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc2_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc3_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "child_rsc2_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_start_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/group5.exp b/pengine/testcases/group5.exp index ec377b49da..706d04529d 100644 --- a/pengine/testcases/group5.exp +++ b/pengine/testcases/group5.exp @@ -1,353 +1,359 @@ + + + + + + diff --git a/pengine/testcases/group6.dot b/pengine/testcases/group6.dot index 4ba054ec19..32201be407 100644 --- a/pengine/testcases/group6.dot +++ b/pengine/testcases/group6.dot @@ -1,98 +1,102 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4_stop_0 node1" -> "child_rsc4_start_0 node2" [ style = bold] "child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc5_stop_0 node1" -> "child_rsc4_stop_0 node1" [ style = bold] "child_rsc5_stop_0 node1" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc6_stop_0 node1" -> "child_rsc5_stop_0 node1" [ style = bold] "child_rsc6_stop_0 node1" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc6_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc4_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc5_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc6_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1_start_0 node2" [ style = bold] +"rsc1_start_0" -> "child_rsc2_start_0 node2" [ style = bold] +"rsc1_start_0" -> "child_rsc3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc4_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc5_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc6_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc4_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "child_rsc5_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "child_rsc6_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_start_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group6.exp b/pengine/testcases/group6.exp index 66981704b6..92cac53eb0 100644 --- a/pengine/testcases/group6.exp +++ b/pengine/testcases/group6.exp @@ -1,481 +1,493 @@ + + + + + + + + + + + + diff --git a/pengine/testcases/group7.dot b/pengine/testcases/group7.dot index f8ccc4547d..c73b752f07 100644 --- a/pengine/testcases/group7.dot +++ b/pengine/testcases/group7.dot @@ -1,86 +1,90 @@ digraph "g" { "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc3_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc4_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc4_start_0 node2" -> "rsc3_running_0" [ style = bold] "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc5_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc5_start_0 node2" -> "rsc3_running_0" [ style = bold] "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node3" -> "probe_complete node3" [ style = bold] "child_rsc6_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "child_rsc6_start_0 node2" -> "rsc3_running_0" [ style = bold] "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node3" -> "probe_complete" [ style = bold] "probe_complete node3" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc4_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc5_start_0 node2" [ style = bold] "probe_complete" -> "child_rsc6_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" -> "rsc3_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" -> "rsc3_start_0" [ style = bold] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc2_start_0 node2" [ style = bold] +"rsc2_start_0" -> "child_rsc3_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc3_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc3_start_0" -> "child_rsc4_start_0 node2" [ style = bold] +"rsc3_start_0" -> "child_rsc5_start_0 node2" [ style = bold] +"rsc3_start_0" -> "child_rsc6_start_0 node2" [ style = bold] "rsc3_start_0" -> "rsc3_running_0" [ style = bold] "rsc3_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group7.exp b/pengine/testcases/group7.exp index ef1116b996..2a93251f69 100644 --- a/pengine/testcases/group7.exp +++ b/pengine/testcases/group7.exp @@ -1,478 +1,490 @@ + + + + + + + + + + + + diff --git a/pengine/testcases/group8.dot b/pengine/testcases/group8.dot index d785d5c621..ffc28b56bd 100644 --- a/pengine/testcases/group8.dot +++ b/pengine/testcases/group8.dot @@ -1,37 +1,39 @@ digraph "g" { "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold] "child_rsc1_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold] "child_rsc2_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_rsc1_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc2_start_0 node1" [ style = bold] "probe_complete" -> "child_rsc3_start_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc1_start_0 node1" [ style = bold] +"rsc2_start_0" -> "child_rsc2_start_0 node1" [ style = bold] +"rsc2_start_0" -> "child_rsc3_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/group8.exp b/pengine/testcases/group8.exp index a51e9f7184..f66c3ffa2d 100644 --- a/pengine/testcases/group8.exp +++ b/pengine/testcases/group8.exp @@ -1,202 +1,208 @@ + + + + + + diff --git a/pengine/testcases/group9.dot b/pengine/testcases/group9.dot index 41806b4553..a75321d435 100644 --- a/pengine/testcases/group9.dot +++ b/pengine/testcases/group9.dot @@ -1,84 +1,93 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "bar_running_0" [ style=bold color="green" fontcolor="orange" ] "bar_start_0" -> "bar_running_0" [ style = bold] "bar_start_0" -> "rsc6_start_0 node2" [ style = bold] +"bar_start_0" -> "rsc7_start_0 node2" [ style = bold] +"bar_start_0" -> "rsc8_start_0 node2" [ style = bold] "bar_start_0" [ style=bold color="green" fontcolor="orange" ] "bar_stop_0" -> "bar_start_0" [ style = bold] "bar_stop_0" -> "bar_stopped_0" [ style = bold] "bar_stop_0" -> "rsc6_stop_0 node1" [ style = bold] "bar_stop_0" -> "rsc7_stop_0 node1" [ style = bold] "bar_stop_0" -> "rsc8_stop_0 node1" [ style = bold] "bar_stop_0" [ style=bold color="green" fontcolor="orange" ] "bar_stopped_0" -> "bar_start_0" [ style = bold] "bar_stopped_0" [ style=bold color="green" fontcolor="orange" ] "foo_running_0" [ style=bold color="green" fontcolor="orange" ] +"foo_start_0" -> "foo_running_0" [ style = bold] +"foo_start_0" -> "rsc4_start_0 node1" [ style = bold] +"foo_start_0" -> "rsc5_start_0 node1" [ style = bold] +"foo_start_0" [ style=bold color="green" fontcolor="orange" ] +"foo_stop_0" -> "foo_start_0" [ style = bold] "foo_stop_0" -> "foo_stopped_0" [ style = bold] "foo_stop_0" -> "rsc4_stop_0 node1" [ style = bold] "foo_stop_0" -> "rsc5_stop_0 node1" [ style = bold] "foo_stop_0" [ style=bold color="green" fontcolor="orange" ] +"foo_stopped_0" -> "foo_start_0" [ style = bold] "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "bar_start_0" [ style = bold] +"probe_complete" -> "foo_start_0" [ style = bold] "probe_complete" -> "rsc4_start_0 node1" [ style = bold] "probe_complete" -> "rsc5_start_0 node1" [ style = bold] "probe_complete" -> "rsc6_start_0 node2" [ style = bold] "probe_complete" -> "rsc7_start_0 node2" [ style = bold] "probe_complete" -> "rsc8_start_0 node2" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" -> "foo_running_0" [ style = bold] "rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node1" -> "foo_running_0" [ style = bold] "rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "rsc5_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "bar_running_0" [ style = bold] "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "rsc6_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold] "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0 node2" -> "bar_running_0" [ style = bold] "rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold] "rsc7_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_stop_0 node1" -> "all_stopped" [ style = bold] "rsc7_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc7_stop_0 node1" -> "rsc6_stop_0 node1" [ style = bold] "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold] "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node2" -> "bar_running_0" [ style = bold] "rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_stop_0 node1" -> "all_stopped" [ style = bold] "rsc8_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc8_stop_0 node1" -> "rsc7_stop_0 node1" [ style = bold] "rsc8_stop_0 node1" -> "rsc8_start_0 node2" [ style = bold] "rsc8_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/group9.exp b/pengine/testcases/group9.exp index dc8243a63b..f1552a8fb0 100644 --- a/pengine/testcases/group9.exp +++ b/pengine/testcases/group9.exp @@ -1,430 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + + + + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + + + + - + - + - + - + diff --git a/pengine/testcases/master-13.dot b/pengine/testcases/master-13.dot index 22106d1c10..7eedbef19b 100644 --- a/pengine/testcases/master-13.dot +++ b/pengine/testcases/master-13.dot @@ -1,77 +1,78 @@ digraph "g" { "Cancel drbd0:0_monitor_10000 frigg" [ style=bold color="green" fontcolor="black" ] "Cancel drbd0:1_monitor_12000 odin" -> "drbd0:1_promote_0 odin" [ style = bold] "Cancel drbd0:1_monitor_12000 odin" [ style=bold color="green" fontcolor="black" ] "IPaddr0_monitor_5000 odin" [ style=bold color="green" fontcolor="black" ] "IPaddr0_start_0 odin" -> "IPaddr0_monitor_5000 odin" [ style = bold] "IPaddr0_start_0 odin" -> "MailTo_start_0 odin" [ style = bold] "IPaddr0_start_0 odin" -> "group_running_0" [ style = bold] "IPaddr0_start_0 odin" [ style=bold color="green" fontcolor="black" ] "MailTo_start_0 odin" -> "group_running_0" [ style = bold] "MailTo_start_0 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:0_demote_0 frigg" -> "ms_drbd_demoted_0" [ style = bold] "drbd0:0_demote_0 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:0_monitor_12000 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_demote_0 frigg" -> "ms_drbd_confirmed-post_notify_demote_0" [ style = bold] "drbd0:0_post_notify_demote_0 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_promote_0 frigg" -> "ms_drbd_confirmed-post_notify_promote_0" [ style = bold] "drbd0:0_post_notify_promote_0 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:0_pre_notify_demote_0 frigg" -> "ms_drbd_confirmed-pre_notify_demote_0" [ style = bold] "drbd0:0_pre_notify_demote_0 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:0_pre_notify_promote_0 frigg" -> "ms_drbd_confirmed-pre_notify_promote_0" [ style = bold] "drbd0:0_pre_notify_promote_0 frigg" [ style=bold color="green" fontcolor="black" ] "drbd0:1_monitor_10000 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:1_post_notify_demote_0 odin" -> "ms_drbd_confirmed-post_notify_demote_0" [ style = bold] "drbd0:1_post_notify_demote_0 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:1_post_notify_promote_0 odin" -> "ms_drbd_confirmed-post_notify_promote_0" [ style = bold] "drbd0:1_post_notify_promote_0 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:1_pre_notify_demote_0 odin" -> "ms_drbd_confirmed-pre_notify_demote_0" [ style = bold] "drbd0:1_pre_notify_demote_0 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:1_pre_notify_promote_0 odin" -> "ms_drbd_confirmed-pre_notify_promote_0" [ style = bold] "drbd0:1_pre_notify_promote_0 odin" [ style=bold color="green" fontcolor="black" ] "drbd0:1_promote_0 odin" -> "drbd0:1_monitor_10000 odin" [ style = bold] "drbd0:1_promote_0 odin" -> "ms_drbd_promoted_0" [ style = bold] "drbd0:1_promote_0 odin" [ style=bold color="green" fontcolor="black" ] "group_running_0" [ style=bold color="green" fontcolor="orange" ] "group_start_0" -> "IPaddr0_start_0 odin" [ style = bold] +"group_start_0" -> "MailTo_start_0 odin" [ style = bold] "group_start_0" -> "group_running_0" [ style = bold] "group_start_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_confirmed-post_notify_demote_0" -> "drbd0:0_monitor_12000 frigg" [ style = bold] "ms_drbd_confirmed-post_notify_demote_0" -> "drbd0:1_monitor_10000 odin" [ style = bold] "ms_drbd_confirmed-post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_confirmed-post_notify_promote_0" -> "drbd0:0_monitor_12000 frigg" [ style = bold] "ms_drbd_confirmed-post_notify_promote_0" -> "drbd0:1_monitor_10000 odin" [ style = bold] "ms_drbd_confirmed-post_notify_promote_0" -> "group_start_0" [ style = bold] "ms_drbd_confirmed-post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_confirmed-pre_notify_demote_0" -> "ms_drbd_demote_0" [ style = bold] "ms_drbd_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_confirmed-pre_notify_promote_0" -> "ms_drbd_promote_0" [ style = bold] "ms_drbd_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_demote_0" -> "drbd0:0_demote_0 frigg" [ style = bold] "ms_drbd_demote_0" -> "ms_drbd_demoted_0" [ style = bold] "ms_drbd_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_demoted_0" -> "ms_drbd_post_notify_demote_0" [ style = bold] "ms_drbd_demoted_0" -> "ms_drbd_promote_0" [ style = bold] "ms_drbd_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_post_notify_demote_0" -> "drbd0:0_post_notify_demote_0 frigg" [ style = bold] "ms_drbd_post_notify_demote_0" -> "drbd0:1_post_notify_demote_0 odin" [ style = bold] "ms_drbd_post_notify_demote_0" -> "ms_drbd_confirmed-post_notify_demote_0" [ style = bold] "ms_drbd_post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_post_notify_promote_0" -> "drbd0:0_post_notify_promote_0 frigg" [ style = bold] "ms_drbd_post_notify_promote_0" -> "drbd0:1_post_notify_promote_0 odin" [ style = bold] "ms_drbd_post_notify_promote_0" -> "ms_drbd_confirmed-post_notify_promote_0" [ style = bold] "ms_drbd_post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_pre_notify_demote_0" -> "drbd0:0_pre_notify_demote_0 frigg" [ style = bold] "ms_drbd_pre_notify_demote_0" -> "drbd0:1_pre_notify_demote_0 odin" [ style = bold] "ms_drbd_pre_notify_demote_0" -> "ms_drbd_confirmed-pre_notify_demote_0" [ style = bold] "ms_drbd_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_pre_notify_promote_0" -> "drbd0:0_pre_notify_promote_0 frigg" [ style = bold] "ms_drbd_pre_notify_promote_0" -> "drbd0:1_pre_notify_promote_0 odin" [ style = bold] "ms_drbd_pre_notify_promote_0" -> "ms_drbd_confirmed-pre_notify_promote_0" [ style = bold] "ms_drbd_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_promote_0" -> "drbd0:1_promote_0 odin" [ style = bold] "ms_drbd_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_promoted_0" -> "group_start_0" [ style = bold] "ms_drbd_promoted_0" -> "ms_drbd_post_notify_promote_0" [ style = bold] "ms_drbd_promoted_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/master-13.exp b/pengine/testcases/master-13.exp index 2d77e1c6c5..3cebbe7507 100644 --- a/pengine/testcases/master-13.exp +++ b/pengine/testcases/master-13.exp @@ -1,427 +1,430 @@ + + + diff --git a/pengine/testcases/master-7.dot b/pengine/testcases/master-7.dot index 4033b2377d..828428b2db 100644 --- a/pengine/testcases/master-7.dot +++ b/pengine/testcases/master-7.dot @@ -1,129 +1,131 @@ digraph "g" { "DcIPaddr_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold] "DcIPaddr_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] +"group-1_start_0" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] +"group-1_start_0" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stop_0" -> "group-1_start_0" [ style = bold] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_stop_0 c001n03" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold] "lsb_dummy_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_stop_0 c001n02" -> "all_stopped" [ style = bold] "lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold] "lsb_dummy_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_demote_0" -> "master_rsc_1_demoted_0" [ style = bold] "master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold] "master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold] "master_rsc_1_demoted_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:4_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:5_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n02" -> "probe_complete" [ style = bold] "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n03" -> "probe_complete" [ style = bold] "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n08" -> "probe_complete" [ style = bold] "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold] "rsc_c001n01_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] "stonith c001n01" -> "all_stopped" [ style = bold] "stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "stonith c001n01" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] "stonith c001n01" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith c001n01" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/master-7.exp b/pengine/testcases/master-7.exp index 9cbf9fb6b4..1cc0f0fd46 100644 --- a/pengine/testcases/master-7.exp +++ b/pengine/testcases/master-7.exp @@ -1,707 +1,713 @@ + + + + + + diff --git a/pengine/testcases/master-8.dot b/pengine/testcases/master-8.dot index 79aea7945d..ba4cdd7e51 100644 --- a/pengine/testcases/master-8.dot +++ b/pengine/testcases/master-8.dot @@ -1,140 +1,142 @@ digraph "g" { "DcIPaddr_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold] "DcIPaddr_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] +"group-1_start_0" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] +"group-1_start_0" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stop_0" -> "group-1_start_0" [ style = bold] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_stop_0 c001n03" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold] "lsb_dummy_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_stop_0 c001n02" -> "all_stopped" [ style = bold] "lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold] "lsb_dummy_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_demote_0" -> "master_rsc_1_demoted_0" [ style = bold] "master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold] "master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_demoted_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold] "master_rsc_1_demoted_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_running_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_start_0" -> "master_rsc_1_running_0" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "master_rsc_1_start_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stop_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_start_0 c001n03" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:0_start_0 c001n03" -> "ocf_msdummy:0_monitor_5000 c001n03" [ style = bold] "ocf_msdummy:0_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:4_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:5_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n02" -> "probe_complete" [ style = bold] "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n03" -> "probe_complete" [ style = bold] "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n08" -> "probe_complete" [ style = bold] "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "master_rsc_1_start_0" [ style = bold] "probe_complete" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold] "rsc_c001n01_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] "stonith c001n01" -> "all_stopped" [ style = bold] "stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] "stonith c001n01" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith c001n01" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/master-8.exp b/pengine/testcases/master-8.exp index 34b364089e..a5d3778135 100644 --- a/pengine/testcases/master-8.exp +++ b/pengine/testcases/master-8.exp @@ -1,766 +1,772 @@ + + + + + + diff --git a/pengine/testcases/quorum-5.dot b/pengine/testcases/quorum-5.dot index 9de664c832..02d73d5074 100644 --- a/pengine/testcases/quorum-5.dot +++ b/pengine/testcases/quorum-5.dot @@ -1,25 +1,26 @@ digraph "g" { "child_DoFencing_1_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold] "child_DoFencing_1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing_1_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing_1_start_0 hadev2" -> "child_DoFencing_1_monitor_5000 hadev2" [ style = bold] "child_DoFencing_1_start_0 hadev2" -> "child_DoFencing_2_start_0 hadev2" [ style = bold] "child_DoFencing_1_start_0 hadev2" -> "group1_running_0" [ style = bold] "child_DoFencing_1_start_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing_2_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold] "child_DoFencing_2_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing_2_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing_2_start_0 hadev2" -> "child_DoFencing_2_monitor_5000 hadev2" [ style = bold] "child_DoFencing_2_start_0 hadev2" -> "group1_running_0" [ style = bold] "child_DoFencing_2_start_0 hadev2" [ style=bold color="green" fontcolor="black" ] "group1_running_0" [ style=bold color="green" fontcolor="orange" ] "group1_start_0" -> "child_DoFencing_1_start_0 hadev2" [ style = bold] +"group1_start_0" -> "child_DoFencing_2_start_0 hadev2" [ style = bold] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete hadev2" -> "probe_complete" [ style = bold] "probe_complete hadev2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_DoFencing_1_start_0 hadev2" [ style = bold] "probe_complete" -> "child_DoFencing_2_start_0 hadev2" [ style = bold] "probe_complete" -> "group1_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/quorum-5.exp b/pengine/testcases/quorum-5.exp index ab306718d7..62d21499b3 100644 --- a/pengine/testcases/quorum-5.exp +++ b/pengine/testcases/quorum-5.exp @@ -1,136 +1,139 @@ + + + diff --git a/pengine/testcases/rec-node-11.dot b/pengine/testcases/rec-node-11.dot index 1353945a7c..5ec9d07196 100644 --- a/pengine/testcases/rec-node-11.dot +++ b/pengine/testcases/rec-node-11.dot @@ -1,51 +1,52 @@ digraph "g" { "all_stopped" -> "rsc3_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_running_0" [ style=bold color="green" fontcolor="orange" ] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc1_start_0 node2" [ style = bold] +"group1_start_0" -> "rsc2_start_0 node2" [ style = bold] "group1_start_0" [ style=bold color="green" fontcolor="orange" ] "group1_stop_0" -> "group1_start_0" [ style = bold] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node1" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node1" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group1_stopped_0" -> "group1_start_0" [ style = bold] "group1_stopped_0" -> "rsc3_stop_0 node2" [ style = bold] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "group1_start_0" [ style = bold] "probe_complete" -> "rsc1_start_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0 node2" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "group1_running_0" [ style = bold] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "group1_running_0" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc3_start_0 node2" -> "group1_start_0" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3_stop_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith node1" -> "all_stopped" [ style = bold] "stonith node1" -> "rsc1_stop_0 node1" [ style = bold] "stonith node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith node1" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith node1" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/rec-node-11.exp b/pengine/testcases/rec-node-11.exp index 95b475e39f..17b3526622 100644 --- a/pengine/testcases/rec-node-11.exp +++ b/pengine/testcases/rec-node-11.exp @@ -1,254 +1,257 @@ + + + diff --git a/pengine/testcases/rec-node-15.dot b/pengine/testcases/rec-node-15.dot index dcb9d3a6ef..8467ca4dc2 100644 --- a/pengine/testcases/rec-node-15.dot +++ b/pengine/testcases/rec-node-15.dot @@ -1,83 +1,89 @@ digraph "g" { "Filesystem_13_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_start_0 sapcl01" -> "Filesystem_13_monitor_120000 sapcl01" [ style = bold] "Filesystem_13_start_0 sapcl01" -> "app02_running_0" [ style = bold] "Filesystem_13_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_stop_0 sapcl02" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "LVM_12_stop_0 sapcl02" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "all_stopped" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "Filesystem_13_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_start_0 sapcl01" -> "Filesystem_23_monitor_120000 sapcl01" [ style = bold] "Filesystem_23_start_0 sapcl01" -> "oracle_24_start_0 sapcl01" [ style = bold] "Filesystem_23_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "Filesystem_23_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_start_0 sapcl01" -> "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" -> "LVM_12_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" -> "app02_running_0" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_start_0 sapcl01" -> "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" -> "LVM_22_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_start_0 sapcl01" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "LVM_12_start_0 sapcl01" -> "LVM_12_monitor_120000 sapcl01" [ style = bold] "LVM_12_start_0 sapcl01" -> "app02_running_0" [ style = bold] "LVM_12_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_stop_0 sapcl02" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "LVM_12_stop_0 sapcl02" -> "LVM_12_start_0 sapcl01" [ style = bold] "LVM_12_stop_0 sapcl02" -> "all_stopped" [ style = bold] "LVM_12_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "LVM_12_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "LVM_22_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_22_start_0 sapcl01" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "LVM_22_start_0 sapcl01" -> "LVM_22_monitor_120000 sapcl01" [ style = bold] "LVM_22_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "all_stopped" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "all_stopped" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "all_stopped" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] "all_stopped" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] "all_stopped" -> "LVM_12_start_0 sapcl01" [ style = bold] "all_stopped" -> "LVM_22_start_0 sapcl01" [ style = bold] "all_stopped" -> "oracle_24_start_0 sapcl01" [ style = bold] "all_stopped" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "app02_running_0" [ style=bold color="green" fontcolor="orange" ] +"app02_start_0" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "app02_start_0" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] +"app02_start_0" -> "LVM_12_start_0 sapcl01" [ style = bold] "app02_start_0" -> "app02_running_0" [ style = bold] "app02_start_0" [ style=bold color="green" fontcolor="orange" ] "app02_stop_0" -> "Filesystem_13_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "LVM_12_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "app02_start_0" [ style = bold] "app02_stop_0" -> "app02_stopped_0" [ style = bold] "app02_stop_0" [ style=bold color="green" fontcolor="orange" ] "app02_stopped_0" -> "app02_start_0" [ style = bold] "app02_stopped_0" [ style=bold color="green" fontcolor="orange" ] "oracle_24_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "oracle_24_start_0 sapcl01" -> "oracle_24_monitor_120000 sapcl01" [ style = bold] "oracle_24_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oracle_24_start_0 sapcl01" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oracle_24_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "oracle_running_0" [ style=bold color="green" fontcolor="orange" ] +"oracle_start_0" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] +"oracle_start_0" -> "LVM_22_start_0 sapcl01" [ style = bold] +"oracle_start_0" -> "oracle_24_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "oracle_running_0" [ style = bold] +"oracle_start_0" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oracle_start_0" [ style=bold color="green" fontcolor="orange" ] "oralsnr_25_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "oralsnr_25_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oralsnr_25_start_0 sapcl01" -> "oralsnr_25_monitor_120000 sapcl01" [ style = bold] "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "stonith sapcl03" -> "all_stopped" [ style = bold] "stonith sapcl03" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith sapcl03" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/rec-node-15.exp b/pengine/testcases/rec-node-15.exp index 7f240b7a04..57bbdefb8e 100644 --- a/pengine/testcases/rec-node-15.exp +++ b/pengine/testcases/rec-node-15.exp @@ -1,430 +1,448 @@ + + + + + + + + + + + + + + + + + + diff --git a/pengine/testcases/rec-node-2.dot b/pengine/testcases/rec-node-2.dot index bacb11b71c..28ba684e5d 100644 --- a/pengine/testcases/rec-node-2.dot +++ b/pengine/testcases/rec-node-2.dot @@ -1,56 +1,58 @@ digraph "g" { "all_stopped" -> "rsc1_start_0 node2" [ style = bold] "all_stopped" -> "rsc2_start_0 node2" [ style = bold] "all_stopped" -> "rsc3_start_0 node2" [ style = bold] "all_stopped" -> "rsc4_start_0 node2" [ style = bold] "all_stopped" -> "rsc5_start_0 node2" [ style = bold] "all_stopped" -> "rsc6_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_running_0" [ style=bold color="green" fontcolor="orange" ] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc3_start_0 node2" [ style = bold] +"group1_start_0" -> "rsc4_start_0 node2" [ style = bold] "group1_start_0" [ style=bold color="green" fontcolor="orange" ] "group2_running_0" [ style=bold color="green" fontcolor="orange" ] "group2_start_0" -> "group2_running_0" [ style = bold] "group2_start_0" -> "rsc5_start_0 node2" [ style = bold] +"group2_start_0" -> "rsc6_start_0 node2" [ style = bold] "group2_start_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "group1_start_0" [ style = bold] "probe_complete" -> "group2_start_0" [ style = bold] "probe_complete" -> "rsc1_start_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0 node2" [ style = bold] "probe_complete" -> "rsc3_start_0 node2" [ style = bold] "probe_complete" -> "rsc4_start_0 node2" [ style = bold] "probe_complete" -> "rsc5_start_0 node2" [ style = bold] "probe_complete" -> "rsc6_start_0 node2" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" -> "group1_running_0" [ style = bold] "rsc3_start_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "group1_running_0" [ style = bold] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node2" -> "group2_running_0" [ style = bold] "rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "group2_running_0" [ style = bold] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith node1" -> "all_stopped" [ style = bold] "stonith node1" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith node1" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/rec-node-2.exp b/pengine/testcases/rec-node-2.exp index 8a381ab839..3537dfee01 100644 --- a/pengine/testcases/rec-node-2.exp +++ b/pengine/testcases/rec-node-2.exp @@ -1,296 +1,302 @@ + + + + + + diff --git a/pengine/testcases/standby.dot b/pengine/testcases/standby.dot index e1a8bdb329..97dde0651b 100644 --- a/pengine/testcases/standby.dot +++ b/pengine/testcases/standby.dot @@ -1,105 +1,111 @@ digraph "g" { "Filesystem_13_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_start_0 sapcl01" -> "Filesystem_13_monitor_120000 sapcl01" [ style = bold] "Filesystem_13_start_0 sapcl01" -> "app02_running_0" [ style = bold] "Filesystem_13_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_stop_0 sapcl02" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "LVM_12_stop_0 sapcl02" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "all_stopped" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "Filesystem_13_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_start_0 sapcl01" -> "Filesystem_23_monitor_120000 sapcl01" [ style = bold] "Filesystem_23_start_0 sapcl01" -> "oracle_24_start_0 sapcl01" [ style = bold] "Filesystem_23_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "Filesystem_23_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_stop_0 sapcl03" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "Filesystem_23_stop_0 sapcl03" -> "LVM_22_stop_0 sapcl03" [ style = bold] "Filesystem_23_stop_0 sapcl03" -> "all_stopped" [ style = bold] "Filesystem_23_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "Filesystem_23_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_start_0 sapcl01" -> "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" -> "LVM_12_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" -> "app02_running_0" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_start_0 sapcl01" -> "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" -> "LVM_22_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_stop_0 sapcl03" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] "IPaddr_192_168_1_104_stop_0 sapcl03" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_104_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "IPaddr_192_168_1_104_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "LVM_12_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_start_0 sapcl01" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "LVM_12_start_0 sapcl01" -> "LVM_12_monitor_120000 sapcl01" [ style = bold] "LVM_12_start_0 sapcl01" -> "app02_running_0" [ style = bold] "LVM_12_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_stop_0 sapcl02" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "LVM_12_stop_0 sapcl02" -> "LVM_12_start_0 sapcl01" [ style = bold] "LVM_12_stop_0 sapcl02" -> "all_stopped" [ style = bold] "LVM_12_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "LVM_12_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "LVM_22_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_22_start_0 sapcl01" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "LVM_22_start_0 sapcl01" -> "LVM_22_monitor_120000 sapcl01" [ style = bold] "LVM_22_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_22_stop_0 sapcl03" -> "IPaddr_192_168_1_104_stop_0 sapcl03" [ style = bold] "LVM_22_stop_0 sapcl03" -> "LVM_22_start_0 sapcl01" [ style = bold] "LVM_22_stop_0 sapcl03" -> "all_stopped" [ style = bold] "LVM_22_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "LVM_22_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "app02_running_0" [ style=bold color="green" fontcolor="orange" ] +"app02_start_0" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "app02_start_0" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] +"app02_start_0" -> "LVM_12_start_0 sapcl01" [ style = bold] "app02_start_0" -> "app02_running_0" [ style = bold] "app02_start_0" [ style=bold color="green" fontcolor="orange" ] "app02_stop_0" -> "Filesystem_13_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "LVM_12_stop_0 sapcl02" [ style = bold] "app02_stop_0" -> "app02_start_0" [ style = bold] "app02_stop_0" -> "app02_stopped_0" [ style = bold] "app02_stop_0" [ style=bold color="green" fontcolor="orange" ] "app02_stopped_0" -> "app02_start_0" [ style = bold] "app02_stopped_0" [ style=bold color="green" fontcolor="orange" ] "oracle_24_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "oracle_24_start_0 sapcl01" -> "oracle_24_monitor_120000 sapcl01" [ style = bold] "oracle_24_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oracle_24_start_0 sapcl01" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oracle_24_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "oracle_24_stop_0 sapcl03" -> "Filesystem_23_stop_0 sapcl03" [ style = bold] "oracle_24_stop_0 sapcl03" -> "all_stopped" [ style = bold] "oracle_24_stop_0 sapcl03" -> "oracle_24_start_0 sapcl01" [ style = bold] "oracle_24_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "oracle_24_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "oracle_running_0" [ style=bold color="green" fontcolor="orange" ] +"oracle_start_0" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] +"oracle_start_0" -> "LVM_22_start_0 sapcl01" [ style = bold] +"oracle_start_0" -> "oracle_24_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "oracle_running_0" [ style = bold] +"oracle_start_0" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oracle_start_0" [ style=bold color="green" fontcolor="orange" ] "oracle_stop_0" -> "Filesystem_23_stop_0 sapcl03" [ style = bold] "oracle_stop_0" -> "IPaddr_192_168_1_104_stop_0 sapcl03" [ style = bold] "oracle_stop_0" -> "LVM_22_stop_0 sapcl03" [ style = bold] "oracle_stop_0" -> "oracle_24_stop_0 sapcl03" [ style = bold] "oracle_stop_0" -> "oracle_start_0" [ style = bold] "oracle_stop_0" -> "oracle_stopped_0" [ style = bold] "oracle_stop_0" -> "oralsnr_25_stop_0 sapcl03" [ style = bold] "oracle_stop_0" [ style=bold color="green" fontcolor="orange" ] "oracle_stopped_0" -> "oracle_start_0" [ style = bold] "oracle_stopped_0" [ style=bold color="green" fontcolor="orange" ] "oralsnr_25_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] "oralsnr_25_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oralsnr_25_start_0 sapcl01" -> "oralsnr_25_monitor_120000 sapcl01" [ style = bold] "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "oralsnr_25_stop_0 sapcl03" -> "all_stopped" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oracle_24_stop_0 sapcl03" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oralsnr_25_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/testcases/standby.exp b/pengine/testcases/standby.exp index d34deb780e..229674937a 100644 --- a/pengine/testcases/standby.exp +++ b/pengine/testcases/standby.exp @@ -1,532 +1,550 @@ + + + + + + + + + + + + + + + + + + diff --git a/pengine/testcases/stonith-0.dot b/pengine/testcases/stonith-0.dot index dbf40ae645..50a2b1f813 100644 --- a/pengine/testcases/stonith-0.dot +++ b/pengine/testcases/stonith-0.dot @@ -1,83 +1,85 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:4_monitor_20000 c001n08" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] +"group-1_start_0" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] +"group-1_start_0" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stop_0" -> "group-1_start_0" [ style = bold] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_stop_0 c001n03" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.183_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n05_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n05_start_0 c001n07" -> "rsc_c001n05_monitor_5000 c001n07" [ style = bold] "rsc_c001n05_start_0 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n05_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n07" [ style = bold] "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n07_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n07_start_0 c001n07" -> "rsc_c001n07_monitor_5000 c001n07" [ style = bold] "rsc_c001n07_start_0 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n07_stop_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n07_stop_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold] "rsc_c001n07_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] "stonith c001n03" -> "all_stopped" [ style = bold] "stonith c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "stonith c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "stonith c001n03" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] "stonith c001n03" -> "rsc_c001n07_stop_0 c001n03" [ style = bold] "stonith c001n03" [ style=bold color="green" fontcolor="black" ] "stonith c001n05" -> "all_stopped" [ style = bold] "stonith c001n05" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] "stonith c001n05" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold] "stonith c001n05" -> "rsc_c001n05_stop_0 c001n05" [ style = bold] "stonith c001n05" -> "stonith c001n03" [ style = bold] "stonith c001n05" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith c001n03" [ style = bold] "stonith_up" -> "stonith c001n05" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/stonith-0.exp b/pengine/testcases/stonith-0.exp index dfa91deb44..2cebfc7c7c 100644 --- a/pengine/testcases/stonith-0.exp +++ b/pengine/testcases/stonith-0.exp @@ -1,410 +1,416 @@ + + + + + + diff --git a/pengine/testcases/stonith-1.dot b/pengine/testcases/stonith-1.dot index 4243454aa1..e907865f15 100644 --- a/pengine/testcases/stonith-1.dot +++ b/pengine/testcases/stonith-1.dot @@ -1,98 +1,101 @@ digraph "g" { "192.168.100.182_monitor_5000 sles-1" [ style=bold color="green" fontcolor="black" ] "192.168.100.183_monitor_5000 sles-1" [ style=bold color="green" fontcolor="black" ] "192.168.100.183_start_0 sles-1" -> "192.168.100.183_monitor_5000 sles-1" [ style = bold] "192.168.100.183_start_0 sles-1" -> "group-1_running_0" [ style = bold] "192.168.100.183_start_0 sles-1" [ style=bold color="green" fontcolor="black" ] "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:2_start_0 sles-4" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stop_0" -> "DoFencing_start_0" [ style = bold] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 sles-3" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_monitor_60000 sles-4" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_start_0 sles-4" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:2_start_0 sles-4" -> "child_DoFencing:2_monitor_60000 sles-4" [ style = bold] "child_DoFencing:2_start_0 sles-4" -> "stonith_up" [ style = bold] "child_DoFencing:2_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 sles-3" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 sles-3" -> "child_DoFencing:2_start_0 sles-4" [ style = bold] "child_DoFencing:2_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] +"group-1_start_0" -> "192.168.100.183_start_0 sles-1" [ style = bold] +"group-1_start_0" -> "group-1_running_0" [ style = bold] +"group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "lsb_dummy_monitor_5000 sles-2" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_running_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_start_0" -> "master_rsc_1_running_0" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:0_start_0 sles-4" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:1_start_0 sles-1" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:2_start_0 sles-2" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:3_start_0 sles-4" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:4_start_0 sles-1" [ style = bold] "master_rsc_1_start_0" -> "ocf_msdummy:5_start_0 sles-2" [ style = bold] "master_rsc_1_start_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stop_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:2_stop_0 sles-3" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:5_stop_0 sles-3" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "migrator_monitor_10000 sles-4" [ style=bold color="green" fontcolor="black" ] "migrator_start_0 sles-4" -> "migrator_monitor_10000 sles-4" [ style = bold] "migrator_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "migrator_stop_0 sles-3" -> "all_stopped" [ style = bold] "migrator_stop_0 sles-3" -> "migrator_start_0 sles-4" [ style = bold] "migrator_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_start_0 sles-4" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:0_start_0 sles-4" -> "ocf_msdummy:0_monitor_5000 sles-4" [ style = bold] "ocf_msdummy:0_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:1_monitor_5000 sles-1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:1_start_0 sles-1" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:1_start_0 sles-1" -> "ocf_msdummy:1_monitor_5000 sles-1" [ style = bold] "ocf_msdummy:1_start_0 sles-1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_monitor_5000 sles-2" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_start_0 sles-2" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:2_start_0 sles-2" -> "ocf_msdummy:2_monitor_5000 sles-2" [ style = bold] "ocf_msdummy:2_start_0 sles-2" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_stop_0 sles-3" -> "all_stopped" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" -> "ocf_msdummy:2_start_0 sles-2" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:3_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_start_0 sles-4" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:3_start_0 sles-4" -> "ocf_msdummy:3_monitor_5000 sles-4" [ style = bold] "ocf_msdummy:3_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_5000 sles-1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_start_0 sles-1" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:4_start_0 sles-1" -> "ocf_msdummy:4_monitor_5000 sles-1" [ style = bold] "ocf_msdummy:4_start_0 sles-1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_5000 sles-2" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_start_0 sles-2" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:5_start_0 sles-2" -> "ocf_msdummy:5_monitor_5000 sles-2" [ style = bold] "ocf_msdummy:5_start_0 sles-2" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_stop_0 sles-3" -> "all_stopped" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" -> "ocf_msdummy:5_start_0 sles-2" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "rsc_sles-2_monitor_5000 sles-2" [ style=bold color="green" fontcolor="black" ] "rsc_sles-3_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "rsc_sles-3_start_0 sles-4" -> "rsc_sles-3_monitor_5000 sles-4" [ style = bold] "rsc_sles-3_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "rsc_sles-3_stop_0 sles-3" -> "all_stopped" [ style = bold] "rsc_sles-3_stop_0 sles-3" -> "rsc_sles-3_start_0 sles-4" [ style = bold] "rsc_sles-3_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "rsc_sles-4_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "stonith sles-3" -> "all_stopped" [ style = bold] "stonith sles-3" -> "migrator_stop_0 sles-3" [ style = bold] "stonith sles-3" -> "ocf_msdummy:2_stop_0 sles-3" [ style = bold] "stonith sles-3" -> "ocf_msdummy:5_stop_0 sles-3" [ style = bold] "stonith sles-3" -> "rsc_sles-3_stop_0 sles-3" [ style = bold] "stonith sles-3" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith sles-3" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/testcases/stonith-1.exp b/pengine/testcases/stonith-1.exp index 0ba96340cd..ae2cf2c0f7 100644 --- a/pengine/testcases/stonith-1.exp +++ b/pengine/testcases/stonith-1.exp @@ -1,554 +1,569 @@ + + + + + + + + + + + - + - + - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/testcases/unrunnable-1.dot b/pengine/testcases/unrunnable-1.dot index df35f88fba..fc3889bead 100644 --- a/pengine/testcases/unrunnable-1.dot +++ b/pengine/testcases/unrunnable-1.dot @@ -1,57 +1,59 @@ digraph "g" { "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "all_stopped" -> "child_DoFencing:1_stop_0 c001n02" [ style = dashed] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_192.168.100.181_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_192.168.100.181_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.181_start_0 c001n03" -> "child_192.168.100.181_monitor_5000 c001n03" [ style = dashed] "child_192.168.100.181_start_0 c001n03" -> "child_192.168.100.182_start_0 c001n03" [ style = dashed] "child_192.168.100.181_start_0 c001n03" -> "group-1_running_0" [ style = dashed] "child_192.168.100.181_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.182_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_192.168.100.182_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.182_start_0 c001n03" -> "child_192.168.100.182_monitor_5000 c001n03" [ style = dashed] "child_192.168.100.182_start_0 c001n03" -> "child_192.168.100.183_start_0 c001n03" [ style = dashed] "child_192.168.100.182_start_0 c001n03" -> "group-1_running_0" [ style = dashed] "child_192.168.100.182_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.183_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_192.168.100.183_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.183_start_0 c001n03" -> "child_192.168.100.183_monitor_5000 c001n03" [ style = dashed] "child_192.168.100.183_start_0 c001n03" -> "group-1_running_0" [ style = dashed] "child_192.168.100.183_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 c001n02" [ style=dashed color="red" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=dashed color="red" fontcolor="orange" ] "group-1_start_0" -> "child_192.168.100.181_start_0 c001n03" [ style = dashed] +"group-1_start_0" -> "child_192.168.100.182_start_0 c001n03" [ style = dashed] +"group-1_start_0" -> "child_192.168.100.183_start_0 c001n03" [ style = dashed] "group-1_start_0" -> "group-1_running_0" [ style = dashed] "group-1_start_0" [ style=dashed color="red" fontcolor="orange" ] "probe_complete c001n03" -> "probe_complete" [ style = bold] "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "child_192.168.100.181_start_0 c001n03" [ style = dashed] "probe_complete" -> "child_192.168.100.182_start_0 c001n03" [ style = dashed] "probe_complete" -> "child_192.168.100.183_start_0 c001n03" [ style = dashed] "probe_complete" -> "group-1_start_0" [ style = dashed] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n03_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] }