diff --git a/crm/pengine/native.c b/crm/pengine/native.c index 4c1e37765a..9df8ed3267 100644 --- a/crm/pengine/native.c +++ b/crm/pengine/native.c @@ -1,1719 +1,1719 @@ /* * 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 DELETE_THEN_REFRESH 1 #define VARIANT_NATIVE 1 #include resource_t *ultimate_parent(resource_t *rsc); void node_list_update(GListPtr list1, GListPtr list2, int factor); void native_rsc_colocation_rh_must(resource_t *rsc_lh, gboolean update_lh, resource_t *rsc_rh, gboolean update_rh); void native_rsc_colocation_rh_mustnot(resource_t *rsc_lh, gboolean update_lh, resource_t *rsc_rh, gboolean update_rh); void create_notifications(resource_t *rsc, pe_working_set_t *data_set); void Recurring(resource_t *rsc, action_t *start, node_t *node, pe_working_set_t *data_set); void RecurringOp(resource_t *rsc, action_t *start, node_t *node, crm_data_t *operation, pe_working_set_t *data_set); void pe_pre_notify( resource_t *rsc, node_t *node, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set); void pe_post_notify( resource_t *rsc, node_t *node, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set); void NoRoleChange (resource_t *rsc, node_t *current, node_t *next, pe_working_set_t *data_set); gboolean DeleteRsc (resource_t *rsc, node_t *node, gboolean optional, pe_working_set_t *data_set); gboolean StopRsc (resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); gboolean StartRsc (resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); gboolean DemoteRsc (resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); gboolean PromoteRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); gboolean RoleError (resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); gboolean NullOp (resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set); enum rsc_role_e rsc_state_matrix[RSC_ROLE_MAX][RSC_ROLE_MAX] = { /* Current State */ /* Next State: Unknown Stopped Started Slave Master */ /* Unknown */ { RSC_ROLE_UNKNOWN, RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, }, /* Stopped */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STARTED, RSC_ROLE_SLAVE, RSC_ROLE_SLAVE, }, /* Started */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STARTED, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }, /* Slave */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_UNKNOWN, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }, /* Master */ { RSC_ROLE_STOPPED, RSC_ROLE_SLAVE, RSC_ROLE_UNKNOWN, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }, }; gboolean (*rsc_action_matrix[RSC_ROLE_MAX][RSC_ROLE_MAX])(resource_t*,node_t*,gboolean,pe_working_set_t*) = { /* Current State */ /* Next State: Unknown Stopped Started Slave Master */ /* Unknown */ { RoleError, StopRsc, RoleError, RoleError, RoleError, }, /* Stopped */ { RoleError, NullOp, StartRsc, StartRsc, RoleError, }, /* Started */ { RoleError, StopRsc, NullOp, NullOp, PromoteRsc, }, /* Slave */ { RoleError, StopRsc, RoleError, NullOp, PromoteRsc, }, /* Master */ { RoleError, RoleError, RoleError, DemoteRsc, NullOp, }, }; static gboolean native_choose_node(resource_t *rsc) { /* 1. Sort by weight 2. color.chosen_node = the node (of those with the highest wieght) with the fewest resources 3. remove color.chosen_node from all other colors */ GListPtr nodes = NULL; node_t *chosen = NULL; if(rsc->provisional == FALSE) { return rsc->allocated_to?TRUE:FALSE; } crm_debug_3("Choosing node for %s from %d candidates", rsc->id, g_list_length(rsc->allowed_nodes)); if(rsc->allowed_nodes) { rsc->allowed_nodes = g_list_sort( rsc->allowed_nodes, sort_node_weight); nodes = rsc->allowed_nodes; chosen = g_list_nth_data(nodes, 0); } return native_assign_node(rsc, nodes, chosen); } void native_set_cmds(resource_t *rsc) { } int native_num_allowed_nodes(resource_t *rsc) { gboolean unimplimented = FALSE; CRM_ASSERT(unimplimented); return 0; } resource_t * ultimate_parent(resource_t *rsc) { resource_t *parent = rsc; while(parent->parent) { parent = parent->parent; } return parent; } node_t * native_color(resource_t *rsc, pe_working_set_t *data_set) { if(rsc->parent && rsc->parent->is_allocating == FALSE) { /* never allocate children on their own */ crm_debug("Escalating allocation of %s to its parent: %s", rsc->id, rsc->parent->id); rsc->parent->cmds->color(rsc->parent, data_set); } print_resource(LOG_DEBUG_2, "Allocating: ", rsc, FALSE); if(rsc->provisional == FALSE) { return rsc->allocated_to; } if(rsc->is_allocating) { crm_debug("Dependancy loop detected involving %s", rsc->id); return NULL; } rsc->is_allocating = TRUE; rsc->rsc_cons = g_list_sort(rsc->rsc_cons, sort_cons_strength); slist_iter( constraint, rsc_colocation_t, rsc->rsc_cons, lpc, crm_debug_3("%s: Pre-Processing %s", rsc->id, constraint->id); if(rsc->provisional && constraint->rsc_rh->provisional) { crm_debug_2("Combine scores from %s and %s", rsc->id, constraint->rsc_rh->id); node_list_update(constraint->rsc_rh->allowed_nodes, rsc->allowed_nodes, constraint->score/INFINITY); } constraint->rsc_rh->cmds->color( constraint->rsc_rh, data_set); rsc->cmds->rsc_colocation_lh( rsc, constraint->rsc_rh, constraint); ); print_resource(LOG_DEBUG, "Allocating: ", rsc, FALSE); if(rsc->next_role == RSC_ROLE_STOPPED) { crm_debug_2("Making sure %s doesn't get allocated", rsc->id); /* make sure it doesnt come up again */ resource_location( rsc, NULL, -INFINITY, "target_role", data_set); } if(rsc->provisional && native_choose_node(rsc) ) { crm_debug_3("Allocated resource %s to %s", rsc->id, rsc->allocated_to->details->uname); } else if(rsc->allocated_to == NULL) { if(rsc->orphan == FALSE) { pe_warn("Resource %s cannot run anywhere", rsc->id); } else { crm_info("Stopping orphan resource %s", rsc->id); } } else { crm_debug("Pre-Allocated resource %s to %s", rsc->id, rsc->allocated_to->details->uname); } rsc->is_allocating = FALSE; print_resource(LOG_DEBUG_3, "Allocated ", rsc, TRUE); return rsc->allocated_to; } void RecurringOp(resource_t *rsc, action_t *start, node_t *node, crm_data_t *operation, pe_working_set_t *data_set) { char *key = NULL; const char *name = NULL; const char *value = NULL; const char *interval = NULL; const char *node_uname = NULL; int interval_ms = 0; action_t *mon = NULL; gboolean is_optional = TRUE; GListPtr possible_matches = NULL; crm_debug_2("Creating recurring actions for %s", rsc->id); if(node != NULL) { node_uname = node->details->uname; } interval = crm_element_value(operation, XML_LRM_ATTR_INTERVAL); interval_ms = crm_get_msec(interval); if(interval_ms == 0) { return; } else if(interval_ms < 0) { crm_config_warn("%s contains an invalid interval: %s", ID(operation), interval); return; } value = crm_element_value(operation, "disabled"); if(crm_is_true(value)) { return; } name = crm_element_value(operation, "name"); key = generate_op_key(rsc->id, name, interval_ms); if(start != NULL) { crm_debug_3("Marking %s %s due to %s", key, start->optional?"optional":"manditory", start->uuid); is_optional = start->optional; } else { crm_debug_2("Marking %s optional", key); is_optional = TRUE; } /* start a monitor for an already active resource */ possible_matches = find_actions_exact(rsc->actions, key, node); if(possible_matches == NULL) { is_optional = FALSE; crm_debug_3("Marking %s manditory: not active", key); } else { g_list_free(possible_matches); } value = crm_element_value(operation, "role"); if((rsc->next_role == RSC_ROLE_MASTER && value == NULL) || (value != NULL && text2role(value) != rsc->next_role)) { int log_level = LOG_DEBUG_2; const char *result = "Ignoring"; if(is_optional) { char *local_key = crm_strdup(key); log_level = LOG_INFO; result = "Cancelling"; /* its running : cancel it */ mon = custom_action( rsc, local_key, CRMD_ACTION_CANCEL, node, FALSE, TRUE, data_set); crm_free(mon->task); mon->task = crm_strdup(CRMD_ACTION_CANCEL); add_hash_param(mon->meta, XML_LRM_ATTR_INTERVAL, interval); add_hash_param(mon->meta, XML_LRM_ATTR_TASK, name); custom_action_order( rsc, NULL, mon, rsc, promote_key(rsc), NULL, pe_order_runnable_left, data_set); mon = NULL; } do_crm_log(log_level, "%s action %s (%s vs. %s)", result , key, value?value:role2text(RSC_ROLE_SLAVE), role2text(rsc->next_role)); crm_free(key); key = NULL; return; } mon = custom_action(rsc, key, name, node, is_optional, TRUE, data_set); key = mon->uuid; if(is_optional) { crm_debug_2("%s\t %s (optional)", crm_str(node_uname), mon->uuid); } if(start == NULL || start->runnable == FALSE) { crm_debug("%s\t %s (cancelled : start un-runnable)", crm_str(node_uname), mon->uuid); mon->runnable = FALSE; } else if(node == NULL || node->details->online == FALSE || node->details->unclean) { crm_debug("%s\t %s (cancelled : no node available)", crm_str(node_uname), mon->uuid); mon->runnable = FALSE; } else if(mon->optional == FALSE) { crm_notice("%s\t %s", crm_str(node_uname),mon->uuid); } custom_action_order(rsc, start_key(rsc), NULL, NULL, crm_strdup(key), mon, pe_order_implies_right|pe_order_runnable_left, data_set); if(rsc->next_role == RSC_ROLE_MASTER) { char *running_master = crm_itoa(EXECRA_RUNNING_MASTER); add_hash_param(mon->meta, XML_ATTR_TE_TARGET_RC, running_master); custom_action_order( rsc, promote_key(rsc), NULL, rsc, NULL, mon, pe_order_optional|pe_order_runnable_left, data_set); crm_free(running_master); } } void Recurring(resource_t *rsc, action_t *start, node_t *node, pe_working_set_t *data_set) { xml_child_iter_filter( rsc->ops_xml, operation, "op", RecurringOp(rsc, start, node, operation, data_set); ); } void native_create_actions(resource_t *rsc, pe_working_set_t *data_set) { action_t *start = NULL; node_t *chosen = NULL; enum rsc_role_e role = RSC_ROLE_UNKNOWN; enum rsc_role_e next_role = RSC_ROLE_UNKNOWN; crm_debug_2("Creating actions for %s", rsc->id); chosen = rsc->allocated_to; if(chosen != NULL) { CRM_CHECK(rsc->next_role != RSC_ROLE_UNKNOWN, rsc->next_role = RSC_ROLE_STARTED); } unpack_instance_attributes( rsc->xml, XML_TAG_ATTR_SETS, chosen?chosen->details->attrs:NULL, rsc->parameters, NULL, data_set->now); crm_debug_2("%s: %s->%s", rsc->id, role2text(rsc->role), role2text(rsc->next_role)); if(g_list_length(rsc->running_on) > 1) { if(rsc->recovery_type == recovery_stop_start) { pe_proc_err("Attempting recovery of resource %s", rsc->id); StopRsc(rsc, NULL, FALSE, data_set); rsc->role = RSC_ROLE_STOPPED; } } else if(rsc->running_on != NULL) { node_t *current = rsc->running_on->data; NoRoleChange(rsc, current, chosen, data_set); } else if(rsc->role == RSC_ROLE_STOPPED && rsc->next_role == RSC_ROLE_STOPPED) { char *key = start_key(rsc); GListPtr possible_matches = find_actions(rsc->actions, key, NULL); slist_iter( action, action_t, possible_matches, lpc, action->optional = TRUE; /* action->pseudo = TRUE; */ ); g_list_free(possible_matches); crm_debug_2("Stopping a stopped resource"); crm_free(key); return; } role = rsc->role; while(role != rsc->next_role) { next_role = rsc_state_matrix[role][rsc->next_role]; crm_debug_2("Executing: %s->%s (%s)", role2text(role), role2text(next_role), rsc->id); if(rsc_action_matrix[role][next_role]( rsc, chosen, FALSE, data_set) == FALSE) { break; } role = next_role; } if(rsc->next_role != RSC_ROLE_STOPPED && rsc->is_managed) { start = start_action(rsc, chosen, TRUE); Recurring(rsc, start, chosen, data_set); } } void native_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { int type = pe_order_optional; const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS); action_t *all_stopped = get_pseudo_op(ALL_STOPPED, data_set); if(rsc->variant == pe_native) { type |= pe_order_implies_right; } custom_action_order(rsc, stop_key(rsc), NULL, rsc, start_key(rsc), NULL, type, data_set); custom_action_order(rsc, demote_key(rsc), NULL, rsc, stop_key(rsc), NULL, pe_order_optional, data_set); custom_action_order(rsc, start_key(rsc), NULL, rsc, promote_key(rsc), NULL, pe_order_runnable_left, data_set); custom_action_order( rsc, delete_key(rsc), NULL, rsc, start_key(rsc), NULL, pe_order_optional, data_set); if(rsc->notify) { char *key1 = NULL; char *key2 = NULL; key1 = generate_op_key(rsc->id, "confirmed-post_notify_start", 0); key2 = generate_op_key(rsc->id, "pre_notify_promote", 0); custom_action_order( rsc, key1, NULL, rsc, key2, NULL, pe_order_optional, data_set); key1 = generate_op_key(rsc->id, "confirmed-post_notify_demote", 0); key2 = generate_op_key(rsc->id, "pre_notify_stop", 0); custom_action_order( rsc, key1, NULL, rsc, key2, NULL, pe_order_optional, data_set); } if(rsc->is_managed == FALSE) { crm_debug_3("Skipping fencing constraints for unmanaged resource: %s", rsc->id); return; } if(safe_str_eq(class, "stonith")) { custom_action_order( NULL, crm_strdup(all_stopped->task), all_stopped, rsc, stop_key(rsc), NULL, pe_order_implies_left, data_set); - } else { + } else if(rsc->variant == pe_native) { custom_action_order( rsc, stop_key(rsc), NULL, NULL, crm_strdup(all_stopped->task), all_stopped, pe_order_implies_right|pe_order_runnable_left, data_set); } } void native_rsc_colocation_lh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { if(rsc_lh == NULL) { pe_err("rsc_lh was NULL for %s", constraint->id); return; } else if(constraint->rsc_rh == NULL) { pe_err("rsc_rh was NULL for %s", constraint->id); return; } crm_debug_2("Processing colocation constraint between %s and %s", rsc_lh->id, rsc_rh->id); rsc_rh->cmds->rsc_colocation_rh(rsc_lh, rsc_rh, constraint); } static gboolean filter_colocation_constraint( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { if(constraint->score == 0){ return FALSE; } if(constraint->role_lh != RSC_ROLE_UNKNOWN && constraint->role_lh != rsc_lh->next_role) { crm_debug_4("RH: Skipping constraint: \"%s\" state filter", role2text(constraint->role_rh)); return FALSE; } if(constraint->role_rh != RSC_ROLE_UNKNOWN && constraint->role_rh != rsc_rh->next_role) { crm_debug_4("RH: Skipping constraint: \"%s\" state filter", role2text(constraint->role_rh)); return FALSE; } return TRUE; } static void colocation_match( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { const char *tmp = NULL; const char *value = NULL; gboolean do_check = FALSE; const char *attribute = "#id"; if(constraint->node_attribute != NULL) { attribute = constraint->node_attribute; } if(rsc_rh->allocated_to) { value = g_hash_table_lookup( rsc_rh->allocated_to->details->attrs, attribute); do_check = TRUE; } else if(constraint->score < 0) { /* nothing to do: * anti-colocation with something thats not running */ return; } slist_iter( node, node_t, rsc_lh->allowed_nodes, lpc, tmp = g_hash_table_lookup(node->details->attrs, attribute); if(do_check && safe_str_eq(tmp, value)) { crm_debug_2("%s: %s.%s += %d", constraint->id, rsc_lh->id, node->details->uname, constraint->score); node->weight = merge_weights( constraint->score, node->weight); } else if(do_check == FALSE || constraint->score >= INFINITY) { crm_debug_2("%s: %s.%s = -INFINITY (%s)", constraint->id, rsc_lh->id, node->details->uname, do_check?"failed":"unallocated"); node->weight = -INFINITY; } ); } void native_rsc_colocation_rh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { crm_debug_2("%sColocating %s with %s (%s, weight=%d)", constraint->score >= 0?"":"Anti-", rsc_lh->id, rsc_rh->id, constraint->id, constraint->score); if(filter_colocation_constraint(rsc_lh, rsc_rh, constraint) == FALSE) { return; } if(rsc_rh->provisional) { return; } else if(rsc_lh->provisional == FALSE) { /* error check */ struct node_shared_s *details_lh; struct node_shared_s *details_rh; if((constraint->score > -INFINITY) && (constraint->score < INFINITY)) { return; } details_rh = rsc_rh->allocated_to?rsc_rh->allocated_to->details:NULL; details_lh = rsc_lh->allocated_to?rsc_lh->allocated_to->details:NULL; if(constraint->score == INFINITY && details_lh != details_rh) { crm_err("%s and %s are both allocated" " but to different nodes: %s vs. %s", rsc_lh->id, rsc_rh->id, details_lh?details_lh->uname:"n/a", details_rh?details_rh->uname:"n/a"); } else if(constraint->score == -INFINITY && details_lh == details_rh) { crm_err("%s and %s are both allocated" " but to the SAME node: %s", rsc_lh->id, rsc_rh->id, details_rh?details_rh->uname:"n/a"); } return; } else { colocation_match(rsc_lh, rsc_rh, constraint); } } void node_list_update(GListPtr list1, GListPtr list2, int factor) { node_t *other_node = NULL; slist_iter( node, node_t, list1, lpc, if(node == NULL) { continue; } other_node = (node_t*)pe_find_node_id( list2, node->details->id); if(other_node != NULL) { crm_debug_2("%s: %d + %d", node->details->uname, node->weight, other_node->weight); node->weight = merge_weights( factor*other_node->weight, node->weight); } ); } void native_rsc_order_lh(resource_t *lh_rsc, order_constraint_t *order, pe_working_set_t *data_set) { GListPtr lh_actions = NULL; action_t *lh_action = order->lh_action; resource_t *rh_rsc = order->rh_rsc; crm_debug_2("Processing LH of ordering constraint %d", order->id); CRM_ASSERT(lh_rsc != NULL); if(lh_action != NULL) { lh_actions = g_list_append(NULL, lh_action); } else if(lh_action == NULL) { lh_actions = find_actions( lh_rsc->actions, order->lh_action_task, NULL); } if(lh_actions == NULL && lh_rsc != rh_rsc) { char *key = NULL; char *rsc_id = NULL; char *op_type = NULL; int interval = 0; crm_debug_2("No LH-Side (%s/%s) found for constraint %d with %s - creating", lh_rsc->id, order->lh_action_task, order->id, order->rh_action_task); parse_op_key( order->lh_action_task, &rsc_id, &op_type, &interval); key = generate_op_key(lh_rsc->id, op_type, interval); lh_action = custom_action(lh_rsc, key, op_type, NULL, TRUE, TRUE, data_set); if(lh_rsc->fns->state(lh_rsc, TRUE) == RSC_ROLE_STOPPED && safe_str_eq(op_type, CRMD_ACTION_STOP)) { lh_action->pseudo = TRUE; lh_action->runnable = TRUE; } lh_actions = g_list_append(NULL, lh_action); crm_free(op_type); crm_free(rsc_id); } slist_iter( lh_action_iter, action_t, lh_actions, lpc, if(rh_rsc == NULL && order->rh_action) { rh_rsc = order->rh_action->rsc; } if(rh_rsc) { rh_rsc->cmds->rsc_order_rh( lh_action_iter, rh_rsc, order); } else if(order->rh_action) { order_actions( lh_action_iter, order->rh_action, order->type); } ); pe_free_shallow_adv(lh_actions, FALSE); } void native_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order) { GListPtr rh_actions = NULL; action_t *rh_action = NULL; CRM_CHECK(rsc != NULL, return); CRM_CHECK(order != NULL, return); rh_action = order->rh_action; crm_debug_3("Processing RH of ordering constraint %d", order->id); if(rh_action != NULL) { rh_actions = g_list_append(NULL, rh_action); } else if(rsc != NULL) { rh_actions = find_actions( rsc->actions, order->rh_action_task, NULL); } if(rh_actions == NULL) { crm_debug_4("No RH-Side (%s/%s) found for constraint..." " ignoring", rsc->id,order->rh_action_task); if(lh_action) { crm_debug_4("LH-Side was: %s", lh_action->uuid); } return; } slist_iter( rh_action_iter, action_t, rh_actions, lpc, if(lh_action) { order_actions(lh_action, rh_action_iter, order->type); } else if(order->type & pe_order_implies_right) { rh_action_iter->runnable = FALSE; crm_warn("Unrunnable %s 0x%.6x", rh_action_iter->uuid, order->type); } else { crm_warn("neither %s 0x%.6x", rh_action_iter->uuid, order->type); } ); pe_free_shallow_adv(rh_actions, FALSE); } void native_rsc_location(resource_t *rsc, rsc_to_node_t *constraint) { GListPtr or_list; crm_debug_2("Applying %s (%s) to %s", constraint->id, role2text(constraint->role_filter), rsc->id); /* take "lifetime" into account */ if(constraint == NULL) { pe_err("Constraint is NULL"); return; } else if(rsc == NULL) { pe_err("LHS of rsc_to_node (%s) is NULL", constraint->id); return; } else if(constraint->role_filter > 0 && constraint->role_filter != rsc->next_role) { crm_debug("Constraint (%s) is not active (role : %s)", constraint->id, role2text(constraint->role_filter)); return; } else if(is_active(constraint) == FALSE) { crm_debug_2("Constraint (%s) is not active", constraint->id); return; } if(constraint->node_list_rh == NULL) { crm_debug_2("RHS of constraint %s is NULL", constraint->id); return; } or_list = node_list_or( rsc->allowed_nodes, constraint->node_list_rh, FALSE); pe_free_shallow(rsc->allowed_nodes); rsc->allowed_nodes = or_list; slist_iter(node, node_t, or_list, lpc, crm_debug_3("%s + %s : %d", rsc->id, node->details->uname, node->weight); ); } void native_expand(resource_t *rsc, pe_working_set_t *data_set) { slist_iter( action, action_t, rsc->actions, lpc, crm_debug_4("processing action %d for rsc=%s", action->id, rsc->id); graph_element_from_action(action, data_set); ); } void native_agent_constraints(resource_t *rsc) { } void create_notifications(resource_t *rsc, pe_working_set_t *data_set) { if(rsc->notify == FALSE) { return; } /* slist_iter( */ /* action, action_t, rsc->actions, lpc, */ /* ); */ } static void register_activity(resource_t *rsc, enum action_tasks task, node_t *node, notify_data_t *n_data) { notify_entry_t *entry = NULL; crm_malloc0(entry, sizeof(notify_entry_t)); entry->rsc = rsc; entry->node = node; switch(task) { case start_rsc: n_data->start = g_list_append(n_data->start, entry); break; case stop_rsc: n_data->stop = g_list_append(n_data->stop, entry); break; case action_promote: n_data->promote = g_list_append(n_data->promote, entry); break; case action_demote: n_data->demote = g_list_append(n_data->demote, entry); break; default: crm_err("Unsupported notify action: %s", task2text(task)); crm_free(entry); break; } } static void register_state(resource_t *rsc, node_t *on_node, notify_data_t *n_data) { notify_entry_t *entry = NULL; crm_malloc0(entry, sizeof(notify_entry_t)); entry->rsc = rsc; entry->node = on_node; crm_debug_2("%s state: %s", rsc->id, role2text(rsc->next_role)); switch(rsc->next_role) { case RSC_ROLE_STOPPED: /* n_data->inactive = g_list_append(n_data->inactive, entry); */ crm_free(entry); break; case RSC_ROLE_STARTED: n_data->active = g_list_append(n_data->active, entry); break; case RSC_ROLE_SLAVE: n_data->slave = g_list_append(n_data->slave, entry); break; case RSC_ROLE_MASTER: n_data->master = g_list_append(n_data->master, entry); break; default: crm_err("Unsupported notify role"); crm_free(entry); break; } } void native_create_notify_element(resource_t *rsc, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set) { node_t *next_node = NULL; gboolean registered = FALSE; char *op_key = NULL; GListPtr possible_matches = NULL; enum action_tasks task = text2task(op->task); if(op->pre_notify == NULL || op->post_notify == NULL) { /* no notifications required */ crm_debug_4("No notificaitons required for %s", op->task); return; } next_node = rsc->allocated_to; op_key = generate_op_key(rsc->id, op->task, 0); possible_matches = find_actions(rsc->actions, op_key, NULL); crm_debug_2("Creating notificaitons for: %s (%s->%s)", op->uuid, role2text(rsc->role), role2text(rsc->next_role)); if(rsc->role == rsc->next_role) { register_state(rsc, next_node, n_data); } slist_iter( local_op, action_t, possible_matches, lpc, local_op->notify_keys = n_data->keys; if(local_op->optional == FALSE) { registered = TRUE; register_activity(rsc, task, local_op->node, n_data); } ); /* stop / demote */ if(rsc->role != RSC_ROLE_STOPPED) { if(task == stop_rsc || task == action_demote) { slist_iter( current_node, node_t, rsc->running_on, lpc, pe_pre_notify(rsc, current_node, op, n_data, data_set); if(task == action_demote || registered == FALSE) { pe_post_notify(rsc, current_node, op, n_data, data_set); } ); } } /* start / promote */ if(rsc->next_role != RSC_ROLE_STOPPED) { CRM_CHECK(next_node != NULL,;); if(next_node == NULL) { pe_proc_err("next role: %s", role2text(rsc->next_role)); } else if(task == start_rsc || task == action_promote) { if(task != start_rsc || registered == FALSE) { pe_pre_notify(rsc, next_node, op, n_data, data_set); } pe_post_notify(rsc, next_node, op, n_data, data_set); } } crm_free(op_key); g_list_free(possible_matches); } static void dup_attr(gpointer key, gpointer value, gpointer user_data) { char *meta_key = crm_concat(CRM_META, key, '_'); g_hash_table_replace(user_data, meta_key, crm_strdup(value)); } static action_t * pe_notify(resource_t *rsc, node_t *node, action_t *op, action_t *confirm, notify_data_t *n_data, pe_working_set_t *data_set) { char *key = NULL; action_t *trigger = NULL; const char *value = NULL; const char *task = NULL; if(op == NULL || confirm == NULL) { crm_debug_2("Op=%p confirm=%p", op, confirm); return NULL; } CRM_CHECK(node != NULL, return NULL); if(node->details->online == FALSE) { crm_info("Skipping notification for %s", rsc->id); return NULL; } value = g_hash_table_lookup(op->meta, "notify_type"); task = g_hash_table_lookup(op->meta, "notify_operation"); crm_debug_2("Creating actions for %s: %s (%s-%s)", op->uuid, rsc->id, value, task); key = generate_notify_key(rsc->id, value, task); trigger = custom_action(rsc, key, op->task, node, op->optional, TRUE, data_set); g_hash_table_foreach(op->meta, dup_attr, trigger->extra); trigger->notify_keys = n_data->keys; /* pseudo_notify before notify */ crm_debug_3("Ordering %s before %s (%d->%d)", op->uuid, trigger->uuid, trigger->id, op->id); order_actions(op, trigger, pe_order_implies_left); value = g_hash_table_lookup(op->meta, "notify_confirm"); if(crm_is_true(value)) { /* notify before pseudo_notified */ crm_debug_3("Ordering %s before %s (%d->%d)", trigger->uuid, confirm->uuid, confirm->id, trigger->id); order_actions(trigger, confirm, pe_order_implies_left); } return trigger; } void pe_pre_notify(resource_t *rsc, node_t *node, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set) { crm_debug_2("%s: %s", rsc->id, op->uuid); pe_notify(rsc, node, op->pre_notify, op->pre_notified, n_data, data_set); } void pe_post_notify(resource_t *rsc, node_t *node, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set) { action_t *notify = NULL; CRM_CHECK(op != NULL, return); CRM_CHECK(rsc != NULL, return); crm_debug_2("%s: %s", rsc->id, op->uuid); notify = pe_notify(rsc, node, op->post_notify, op->post_notified, n_data, data_set); if(notify != NULL) { /* crm_err("Upgrading priority for %s to INFINITY", notify->uuid); */ notify->priority = INFINITY; } notify = op->post_notified; if(notify != NULL) { slist_iter( mon, action_t, rsc->actions, lpc, const char *interval = g_hash_table_lookup(mon->meta, "interval"); if(interval == NULL || safe_str_eq(interval, "0")) { crm_debug_3("Skipping %s: interval", mon->uuid); continue; } else if(safe_str_eq(mon->task, "cancel")) { crm_debug_3("Skipping %s: cancel", mon->uuid); continue; } order_actions(notify, mon, pe_order_optional); ); } } void NoRoleChange(resource_t *rsc, node_t *current, node_t *next, pe_working_set_t *data_set) { action_t *stop = NULL; action_t *start = NULL; GListPtr possible_matches = NULL; crm_debug_2("Executing: %s (role=%s)",rsc->id, role2text(rsc->next_role)); if(current == NULL || next == NULL) { return; } if(rsc->failed || safe_str_neq(current->details->id, next->details->id)) { if(rsc->failed) { crm_notice("Recover resource %s\t(%s)", rsc->id, next->details->uname); } else { crm_notice("Move resource %s\t(%s -> %s)", rsc->id, current->details->uname, next->details->uname); } if(rsc->role == RSC_ROLE_MASTER) { DemoteRsc(rsc, current, FALSE, data_set); } StopRsc(rsc, current, FALSE, data_set); StartRsc(rsc, next, FALSE, data_set); if(rsc->next_role == RSC_ROLE_MASTER) { PromoteRsc(rsc, next, FALSE, data_set); } possible_matches = find_recurring_actions(rsc->actions, next); slist_iter(match, action_t, possible_matches, lpc, if(match->optional == FALSE) { crm_debug("Fixing recurring action: %s", match->uuid); match->optional = TRUE; } ); g_list_free(possible_matches); } else if(rsc->start_pending) { action_t *start = start_action(rsc, next, TRUE); if(start->runnable) { /* wait for StartRsc() to be called */ rsc->role = RSC_ROLE_STOPPED; } else { /* wait for StopRsc() to be called */ rsc->next_role = RSC_ROLE_STOPPED; } } else { stop = stop_action(rsc, current, TRUE); start = start_action(rsc, next, TRUE); stop->optional = start->optional; if(rsc->role == RSC_ROLE_MASTER) { DemoteRsc(rsc, current, start->optional, data_set); } StopRsc(rsc, current, start->optional, data_set); StartRsc(rsc, current, start->optional, data_set); if(rsc->next_role == RSC_ROLE_MASTER) { PromoteRsc(rsc, next, start->optional, data_set); } if(start->runnable == FALSE) { rsc->next_role = RSC_ROLE_STOPPED; } else if(start->optional) { crm_notice("Leave resource %s\t(%s)", rsc->id, next->details->uname); } else { crm_notice("Restart resource %s\t(%s)", rsc->id, next->details->uname); } } } gboolean StopRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { action_t *stop = NULL; crm_debug_2("Executing: %s", rsc->id); slist_iter( current, node_t, rsc->running_on, lpc, stop = stop_action(rsc, current, optional); if(stop->runnable && stop->optional == FALSE) { crm_notice(" %s\tStop %s", current->details->uname, rsc->id); } if(data_set->remove_after_stop) { DeleteRsc(rsc, current, optional, data_set); } ); return TRUE; } gboolean StartRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { action_t *start = NULL; crm_debug_2("Executing: %s", rsc->id); start = start_action(rsc, next, TRUE); if(start->runnable && optional == FALSE) { crm_notice(" %s\tStart %s", next->details->uname, rsc->id); start->optional = FALSE; } return TRUE; } gboolean PromoteRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { char *key = NULL; gboolean runnable = TRUE; GListPtr action_list = NULL; crm_debug_2("Executing: %s", rsc->id); CRM_CHECK(rsc->next_role == RSC_ROLE_MASTER, crm_err("Next role: %s", role2text(rsc->next_role)); return FALSE); key = start_key(rsc); action_list = find_actions_exact(rsc->actions, key, next); crm_free(key); slist_iter(start, action_t, action_list, lpc, if(start->runnable == FALSE) { runnable = FALSE; } ); g_list_free(action_list); if(runnable) { promote_action(rsc, next, optional); if(optional == FALSE) { crm_notice("%s\tPromote %s", next->details->uname, rsc->id); } return TRUE; } crm_debug("%s\tPromote %s (canceled)", next->details->uname, rsc->id); key = promote_key(rsc); action_list = find_actions_exact(rsc->actions, key, next); crm_free(key); slist_iter(promote, action_t, action_list, lpc, promote->runnable = FALSE; ); g_list_free(action_list); return TRUE; } gboolean DemoteRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { crm_debug_2("Executing: %s", rsc->id); /* CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE); */ slist_iter( current, node_t, rsc->running_on, lpc, crm_notice("%s\tDemote %s", current->details->uname, rsc->id); demote_action(rsc, current, optional); ); return TRUE; } gboolean RoleError(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { crm_debug("Executing: %s", rsc->id); CRM_CHECK(FALSE, return FALSE); return FALSE; } gboolean NullOp(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set) { crm_debug("Executing: %s", rsc->id); return FALSE; } gboolean DeleteRsc(resource_t *rsc, node_t *node, gboolean optional, pe_working_set_t *data_set) { action_t *delete = NULL; action_t *refresh = NULL; if(rsc->failed) { crm_debug_2("Resource %s not deleted from %s: failed", rsc->id, node->details->uname); return FALSE; } else if(node == NULL) { crm_debug_2("Resource %s not deleted: NULL node", rsc->id); return FALSE; } else if(node->details->unclean || node->details->online == FALSE) { crm_debug_2("Resource %s not deleted from %s: unrunnable", rsc->id, node->details->uname); return FALSE; } crm_notice("Removing %s from %s", rsc->id, node->details->uname); delete = delete_action(rsc, node, optional); custom_action_order( rsc, stop_key(rsc), NULL, rsc, delete_key(rsc), NULL, optional?pe_order_implies_right:pe_order_implies_left, data_set); #if DELETE_THEN_REFRESH refresh = custom_action( NULL, crm_strdup(CRM_OP_LRM_REFRESH), CRM_OP_LRM_REFRESH, node, FALSE, TRUE, data_set); add_hash_param(refresh->meta, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE); order_actions(delete, refresh, pe_order_optional); #endif return TRUE; } gboolean native_create_probe(resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set) { char *key = NULL; char *target_rc = NULL; action_t *probe = NULL; node_t *running = NULL; CRM_CHECK(node != NULL, return FALSE); if(rsc->orphan) { crm_debug_2("Skipping orphan: %s", rsc->id); return FALSE; } running = pe_find_node_id(rsc->known_on, node->details->id); if(force == FALSE && running != NULL) { /* we already know the status of the resource on this node */ crm_debug_3("Skipping active: %s", rsc->id); return FALSE; } key = generate_op_key(rsc->id, CRMD_ACTION_STATUS, 0); probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node, FALSE, TRUE, data_set); probe->optional = FALSE; running = pe_find_node_id(rsc->running_on, node->details->id); if(running == NULL) { target_rc = crm_itoa(EXECRA_NOT_RUNNING); add_hash_param(probe->meta, XML_ATTR_TE_TARGET_RC, target_rc); crm_free(target_rc); } crm_debug_2("Probing %s on %s", rsc->id, node->details->uname); custom_action_order(rsc, NULL, probe, rsc, NULL, complete, pe_order_implies_right, data_set); return TRUE; } static void native_start_constraints( resource_t *rsc, action_t *stonith_op, gboolean is_stonith, pe_working_set_t *data_set) { node_t *target = stonith_op?stonith_op->node:NULL; if(is_stonith) { char *key = start_key(rsc); action_t *ready = get_pseudo_op(STONITH_UP, data_set); crm_debug_2("Ordering %s action before stonith events", key); custom_action_order( rsc, key, NULL, NULL, crm_strdup(ready->task), ready, pe_order_implies_right, data_set); } else { action_t *all_stopped = get_pseudo_op(ALL_STOPPED, data_set); slist_iter(action, action_t, rsc->actions, lpc2, if(action->needs == rsc_req_stonith) { order_actions(all_stopped, action, pe_order_implies_left); } else if(target != NULL && target->details->expected_up && safe_str_eq(action->task, CRMD_ACTION_START) && NULL == pe_find_node_id( rsc->known_on, target->details->id)) { /* if expected_up == TRUE, then we've seen * the node before and it has failed (as * opposed to just hasn't started up yet) * * if known == NULL, then we dont know if * the resource is active on the node * we're about to shoot * * in this case, regardless of action->needs, * the only safe option is to wait until * the node is shot before doing anything * to with the resource * * its analogous to waiting for all the probes * for rscX to complete before starting rscX * * the most likely explaination is that the * DC died and took its status with it */ crm_info("Ordering %s after %s recovery", action->uuid, target->details->uname); order_actions(all_stopped, action, pe_order_implies_left); } ); } } static void native_stop_constraints( resource_t *rsc, action_t *stonith_op, gboolean is_stonith, pe_working_set_t *data_set) { char *key = NULL; GListPtr action_list = NULL; node_t *node = stonith_op->node; key = stop_key(rsc); action_list = find_actions(rsc->actions, key, node); crm_free(key); /* add the stonith OP as a stop pre-req and the mark the stop * as a pseudo op - since its now redundant */ slist_iter( action, action_t, action_list, lpc2, if(node->details->online == FALSE || node->details->unclean || rsc->failed) { resource_t *parent = NULL; if(rsc->failed) { crm_warn("Stop of failed resource %s is" " implicit after %s is fenced", rsc->id, node->details->uname); } else { crm_info("%s is implicit after %s is fenced", action->uuid, node->details->uname); } /* the stop would never complete and is * now implied by the stonith operation */ action->pseudo = TRUE; action->runnable = TRUE; if(is_stonith == FALSE) { order_actions(stonith_op, action, pe_order_optional); } /* find the top-most resource */ parent = rsc->parent; while(parent != NULL && parent->parent != NULL) { parent = parent->parent; } if(parent) { crm_info("Re-creating actions for %s", parent->id); parent->cmds->create_actions(parent, data_set); /* make sure we dont mess anything up in create_actions */ CRM_CHECK(action->pseudo, action->pseudo = TRUE); CRM_CHECK(action->runnable, action->runnable = TRUE); } /* From Bug #1601, successful fencing must be an input to a failed resources stop action. However given group(A, B) running on nodeX and B.stop has failed, A := stop healthy resource (A.stop) B := stop failed resource (pseudo operation B.stop) C := stonith nodeX A requires B, B requires C, C requires A This loop would prevent the cluster from making progress. This block creates the "C requires A" dependancy and therefore must (at least for now) be disabled. Instead, run the block above and treat all resources on nodeX as B would be (marked as a pseudo op depending on the STONITH). } else if(is_stonith == FALSE) { crm_info("Moving healthy resource %s" " off %s before fencing", rsc->id, node->details->uname); * stop healthy resources before the * stonith op * custom_action_order( rsc, stop_key(rsc), NULL, NULL,crm_strdup(CRM_OP_FENCE),stonith_op, pe_order_optional, data_set); */ } ); g_list_free(action_list); key = demote_key(rsc); action_list = find_actions(rsc->actions, key, node); crm_free(key); slist_iter( action, action_t, action_list, lpc2, if(node->details->online == FALSE || rsc->failed) { crm_info("Demote of failed resource %s is" " implict after %s is fenced", rsc->id, node->details->uname); /* the stop would never complete and is * now implied by the stonith operation */ action->pseudo = TRUE; action->runnable = TRUE; if(is_stonith == FALSE) { order_actions(stonith_op, action, pe_order_optional); } } ); g_list_free(action_list); } void native_stonith_ordering( resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set) { gboolean is_stonith = FALSE; const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS); if(rsc->is_managed == FALSE) { crm_debug_3("Skipping fencing constraints for unmanaged resource: %s", rsc->id); return; } if(stonith_op != NULL && safe_str_eq(class, "stonith")) { is_stonith = TRUE; } /* Start constraints */ native_start_constraints(rsc, stonith_op, is_stonith, data_set); /* Stop constraints */ native_stop_constraints(rsc, stonith_op, is_stonith, data_set); } void native_migrate_reload(resource_t *rsc, pe_working_set_t *data_set) { char *key = NULL; int level = LOG_DEBUG_2; GListPtr action_list = NULL; action_t *stop = NULL; action_t *start = NULL; action_t *other = NULL; action_t *action = NULL; const char *value = NULL; CRM_CHECK(rsc->variant == pe_native, return); if(rsc->is_managed == FALSE || rsc->failed || rsc->start_pending || rsc->next_role != RSC_ROLE_STARTED || g_list_length(rsc->running_on) != 1) { do_crm_log(level, "%s: resource", rsc->id); return; } key = start_key(rsc); action_list = find_actions(rsc->actions, key, NULL); crm_free(key); if(action_list == NULL) { do_crm_log(level, "%s: no start action", rsc->id); return; } start = action_list->data; g_list_free(action_list); value = g_hash_table_lookup(rsc->meta, "allow_migrate"); if(crm_is_true(value)) { rsc->can_migrate = TRUE; } if(rsc->can_migrate == FALSE && start->allow_reload_conversion == FALSE) { do_crm_log(level, "%s: no need to continue", rsc->id); return; } key = stop_key(rsc); action_list = find_actions(rsc->actions, key, NULL); crm_free(key); if(action_list == NULL) { do_crm_log(level, "%s: no stop action", rsc->id); return; } stop = action_list->data; g_list_free(action_list); action = start; if(action->pseudo || action->optional || action->node == NULL || action->runnable == FALSE) { do_crm_log(level, "%s: %s", rsc->id, action->task); return; } action = stop; if(action->pseudo || action->optional || action->node == NULL || action->runnable == FALSE) { do_crm_log(level, "%s: %s", rsc->id, action->task); return; } slist_iter( other_w, action_wrapper_t, start->actions_before, lpc, gboolean can_migrate = TRUE; resource_t *parent = NULL; other = other_w->action; parent = uber_parent(other->rsc); if(other->optional == TRUE || other->rsc == rsc || parent == NULL) { continue; } if(parent->variant == pe_native || parent->variant == pe_group) { /* clones are the only ones that can be "moved" * and still allow resources sitting on top of * them (ie. us) to be migrated */ can_migrate = FALSE; } else if(safe_str_eq(other->task, CRMD_ACTION_MIGRATE) || safe_str_eq(other->task, CRMD_ACTION_MIGRATED)) { /* we depend on something that is already migrating... * we cant both migrate */ can_migrate = FALSE; } else { /* is the clone also moving moved around? * * if so, then we can't yet be completely sure the * resource can safely migrate since the node we're * moving too may not have the clone instance started * yet * * in theory we can figure out if the clone instance we * will run on is already there, but there that would * involve too much knowledge of internal clone code. * maybe later... */ do_crm_log(level, "%s: start depends on clone %s", rsc->id, parent->id); key = stop_key(parent); action_list = find_actions(parent->actions, key, NULL); crm_free(key); slist_iter( other_stop, action_t, action_list,lpc, if(other_stop && other_stop->optional == FALSE) { do_crm_log(LOG_INFO, "%s: start depends on %s", rsc->id, other_stop->uuid); can_migrate = FALSE; } ); g_list_free(action_list); } if(can_migrate == FALSE) { do_crm_log(LOG_INFO, "%s: start depends on %s", rsc->id, other->uuid); return; } ); if(rsc->can_migrate && stop->node->details != start->node->details) { crm_info("Migrating %s from %s to %s", rsc->id, stop->node->details->uname, start->node->details->uname); crm_free(stop->uuid); crm_free(stop->task); stop->task = crm_strdup(CRMD_ACTION_MIGRATE); stop->uuid = generate_op_key(rsc->id, stop->task, 0); add_hash_param(stop->meta, "migrate_source", stop->node->details->uname); add_hash_param(stop->meta, "migrate_target", start->node->details->uname); slist_iter( other_w, action_wrapper_t, start->actions_before, lpc, other = other_w->action; if(other->optional == FALSE && other->rsc != NULL && other->rsc != rsc) { order_actions(other, stop, other_w->type); } ); crm_free(start->uuid); crm_free(start->task); start->task = crm_strdup(CRMD_ACTION_MIGRATED); start->uuid = generate_op_key(rsc->id, start->task, 0); add_hash_param(start->meta, "migrate_source_uuid", stop->node->details->id); add_hash_param(start->meta, "migrate_source", stop->node->details->uname); add_hash_param(start->meta, "migrate_target", start->node->details->uname); } else if(start->allow_reload_conversion && stop->node->details == start->node->details) { crm_info("Rewriting restart of %s on %s as a reload", rsc->id, start->node->details->uname); crm_free(start->uuid); crm_free(start->task); start->task = crm_strdup("reload"); start->uuid = generate_op_key(rsc->id, start->task, 0); stop->pseudo = TRUE; /* easier than trying to delete it from the graph */ } else { do_crm_log(level, "%s nothing to do", rsc->id); } } diff --git a/crm/pengine/testcases/1360.dot b/crm/pengine/testcases/1360.dot index e8c73fc6ae..76aeb52dc8 100644 --- a/crm/pengine/testcases/1360.dot +++ b/crm/pengine/testcases/1360.dot @@ -1,20 +1,19 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "dollies:0_start_0 ssgtest1b" -> "dolly_running_0" [ style = bold] "dollies:0_start_0 ssgtest1b" [ style=bold color="green" fontcolor="black" ] "dollies:0_stop_0 ssgtest1a" -> "all_stopped" [ style = bold] "dollies:0_stop_0 ssgtest1a" -> "dollies:0_start_0 ssgtest1b" [ style = bold] "dollies:0_stop_0 ssgtest1a" -> "dolly_stopped_0" [ style = bold] "dollies:0_stop_0 ssgtest1a" [ style=bold color="green" fontcolor="black" ] "dolly_running_0" [ style=bold color="green" fontcolor="orange" ] "dolly_start_0" -> "dollies:0_start_0 ssgtest1b" [ style = bold] "dolly_start_0" -> "dolly_running_0" [ style = bold] "dolly_start_0" [ style=bold color="green" fontcolor="orange" ] "dolly_stop_0" -> "dollies:0_stop_0 ssgtest1a" [ style = bold] "dolly_stop_0" -> "dolly_start_0" [ style = bold] "dolly_stop_0" -> "dolly_stopped_0" [ style = bold] "dolly_stop_0" [ style=bold color="green" fontcolor="orange" ] -"dolly_stopped_0" -> "all_stopped" [ style = bold] "dolly_stopped_0" -> "dolly_start_0" [ style = bold] "dolly_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/1360.exp b/crm/pengine/testcases/1360.exp index eef5d10298..fbe1c45520 100644 --- a/crm/pengine/testcases/1360.exp +++ b/crm/pengine/testcases/1360.exp @@ -1,100 +1,97 @@ - - - diff --git a/crm/pengine/testcases/1494.dot b/crm/pengine/testcases/1494.dot index 5c080a1117..878a542b0e 100644 --- a/crm/pengine/testcases/1494.dot +++ b/crm/pengine/testcases/1494.dot @@ -1,11 +1,10 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "ima_cloneid_stop_0" -> "ima_cloneid_stopped_0" [ style = bold] "ima_cloneid_stop_0" -> "ima_rscid:0_stop_0 hb1" [ style = bold] "ima_cloneid_stop_0" [ style=bold color="green" fontcolor="orange" ] -"ima_cloneid_stopped_0" -> "all_stopped" [ style = bold] "ima_cloneid_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ima_rscid:0_stop_0 hb1" -> "all_stopped" [ style = bold] "ima_rscid:0_stop_0 hb1" -> "ima_cloneid_stopped_0" [ style = bold] "ima_rscid:0_stop_0 hb1" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/1494.exp b/crm/pengine/testcases/1494.exp index 4b54852961..d626bc98bf 100644 --- a/crm/pengine/testcases/1494.exp +++ b/crm/pengine/testcases/1494.exp @@ -1,54 +1,51 @@ - - - diff --git a/crm/pengine/testcases/594.dot b/crm/pengine/testcases/594.dot index ca414d15d2..3e81546105 100644 --- a/crm/pengine/testcases/594.dot +++ b/crm/pengine/testcases/594.dot @@ -1,53 +1,52 @@ digraph "g" { "DcIPaddr_monitor_0 hadev1" -> "probe_complete hadev1" [ style = bold] "DcIPaddr_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold] "DcIPaddr_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_start_0 hadev1" [ style = bold] "DcIPaddr_stop_0 hadev2" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "DcIPaddr_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 hadev2" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 hadev1" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 hadev2" [ style = bold] "all_stopped" -> "child_DoFencing:2_stop_0 hadev1" [ style = bold] "all_stopped" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 hadev1" -> "probe_complete hadev1" [ style = bold] "child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "child_DoFencing:0_stop_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_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ] "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ] "probe_complete hadev1" -> "probe_complete" [ style = bold] "probe_complete hadev1" [ style=bold color="green" fontcolor="black" ] "probe_complete hadev2" -> "probe_complete" [ style = bold] "probe_complete hadev2" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "DcIPaddr_start_0 hadev1" [ style = bold] "probe_complete" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_hadev2_monitor_0 hadev1" -> "probe_complete hadev1" [ style = bold] "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold] "rsc_hadev2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_stop_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold] "rsc_hadev3_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "stonith hadev3" -> "all_stopped" [ style = bold] "stonith hadev3" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith hadev3" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/594.exp b/crm/pengine/testcases/594.exp index 0e6398dd99..108ac5228b 100644 --- a/crm/pengine/testcases/594.exp +++ b/crm/pengine/testcases/594.exp @@ -1,292 +1,289 @@ - - - diff --git a/crm/pengine/testcases/662.dot b/crm/pengine/testcases/662.dot index 5ec711f108..952a9d01e9 100644 --- a/crm/pengine/testcases/662.dot +++ b/crm/pengine/testcases/662.dot @@ -1,76 +1,75 @@ digraph "g" { "DcIPaddr_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "DcIPaddr_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "child_DoFencing:0_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 c001n09" -> "probe_complete c001n09" [ style = bold] "child_DoFencing:0_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "child_DoFencing:1_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "child_DoFencing:1_monitor_0 c001n04" [ style=bold color="green" 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:2_monitor_0 c001n09" -> "probe_complete c001n09" [ style = bold] "child_DoFencing:2_monitor_0 c001n09" [ 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" ] "child_DoFencing:3_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "child_DoFencing:3_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" [ 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 c001n04" -> "probe_complete" [ style = bold] "probe_complete c001n04" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n09" -> "probe_complete" [ style = bold] "probe_complete c001n09" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "rsc_c001n02_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n09" -> "probe_complete c001n09" [ style = bold] "rsc_c001n02_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "rsc_c001n03_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n09" -> "probe_complete c001n09" [ style = bold] "rsc_c001n03_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n04_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n04_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n04_monitor_0 c001n09" -> "probe_complete c001n09" [ style = bold] "rsc_c001n04_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "rsc_c001n09_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n09_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n04" -> "probe_complete c001n04" [ style = bold] "rsc_c001n09_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/662.exp b/crm/pengine/testcases/662.exp index b047e98ef1..b89fe321fc 100644 --- a/crm/pengine/testcases/662.exp +++ b/crm/pengine/testcases/662.exp @@ -1,443 +1,440 @@ - - - diff --git a/crm/pengine/testcases/797.dot b/crm/pengine/testcases/797.dot index d562447c45..ba7c3fe870 100644 --- a/crm/pengine/testcases/797.dot +++ b/crm/pengine/testcases/797.dot @@ -1,102 +1,101 @@ digraph "g" { "DcIPaddr_delete_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = bold] "DcIPaddr_delete_0 c001n03" -> "lrm_refresh c001n03" [ style = bold] "DcIPaddr_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n03" [ style=filled color="black" fontcolor="black" fillcolor=red] "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_delete_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n03" [ 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:1_start_0 c001n01" [ 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:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n03" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "all_stopped" -> "child_DoFencing:0_stop_0 c001n03" [ style = bold] "all_stopped" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold] "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="black" ] "child_DoFencing:0_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_start_0 c001n01" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:1_start_0 c001n01" -> "child_DoFencing:1_monitor_5000 c001n01" [ style = bold] "child_DoFencing:1_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 c001n02" -> "child_DoFencing:1_start_0 c001n01" [ style = bold] "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:1_stop_0 c001n02" [ 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: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" ] "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ] "lrm_refresh c001n03" [ style=bold color="green" fontcolor="black" ] "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" -> "DcIPaddr_start_0 c001n03" [ style = bold] "probe_complete" -> "DoFencing_start_0" [ style = bold] "probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = bold] "probe_complete" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = bold] "probe_complete" -> "rsc_c001n08_start_0 c001n01" [ style = bold] "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_start_0 c001n01" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" 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 c001n01" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = bold] "rsc_c001n02_start_0 c001n01" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_start_0 c001n03" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n03_stop_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = bold] "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" 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 c001n01" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = bold] "rsc_c001n08_start_0 c001n01" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n08_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n08_stop_0 c001n02" -> "rsc_c001n08_start_0 c001n01" [ style = bold] "rsc_c001n08_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/797.exp b/crm/pengine/testcases/797.exp index 9414f0bb22..ae2319e048 100644 --- a/crm/pengine/testcases/797.exp +++ b/crm/pengine/testcases/797.exp @@ -1,458 +1,455 @@ - - - diff --git a/crm/pengine/testcases/829.dot b/crm/pengine/testcases/829.dot index f1a7f9fb0c..054ffb233b 100644 --- a/crm/pengine/testcases/829.dot +++ b/crm/pengine/testcases/829.dot @@ -1,64 +1,63 @@ digraph "g" { "DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "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: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 c001n01" -> "probe_complete c001n01" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ 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" ] "probe_complete c001n01" -> "probe_complete" [ style = bold] "probe_complete c001n01" [ 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" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "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_0 c001n08" -> "probe_complete c001n08" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" 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_0 c001n08" -> "probe_complete c001n08" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "stonith c001n02" -> "all_stopped" [ style = bold] "stonith c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "stonith c001n02" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith c001n02" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/829.exp b/crm/pengine/testcases/829.exp index ffd2018ce0..37174668e4 100644 --- a/crm/pengine/testcases/829.exp +++ b/crm/pengine/testcases/829.exp @@ -1,369 +1,366 @@ - - - diff --git a/crm/pengine/testcases/994.dot b/crm/pengine/testcases/994.dot index d5a4e8884c..52d6b6f04e 100644 --- a/crm/pengine/testcases/994.dot +++ b/crm/pengine/testcases/994.dot @@ -1,38 +1,36 @@ digraph "g" { "Filesystem_2_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ] "Filesystem_2_start_0 paul" -> "Filesystem_2_monitor_120000 paul" [ style = bold] "Filesystem_2_start_0 paul" -> "IPaddr_5_start_0 paul" [ style = bold] "Filesystem_2_start_0 paul" -> "group_1_running_0" [ style = bold] "Filesystem_2_start_0 paul" [ style=bold color="green" fontcolor="black" ] "IPaddr_5_monitor_5000 paul" [ style=bold color="green" fontcolor="black" ] "IPaddr_5_start_0 paul" -> "IPaddr_5_monitor_5000 paul" [ style = bold] "IPaddr_5_start_0 paul" -> "group_1_running_0" [ style = bold] "IPaddr_5_start_0 paul" -> "postfix_9_start_0 paul" [ style = bold] "IPaddr_5_start_0 paul" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "datadisk_1_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ] "datadisk_1_start_0 paul" -> "Filesystem_2_start_0 paul" [ style = bold] "datadisk_1_start_0 paul" -> "datadisk_1_monitor_120000 paul" [ style = bold] "datadisk_1_start_0 paul" -> "group_1_running_0" [ style = bold] "datadisk_1_start_0 paul" [ style=bold color="green" fontcolor="black" ] "group_1_running_0" [ style=bold color="green" fontcolor="orange" ] "group_1_start_0" -> "datadisk_1_start_0 paul" [ 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" -> "all_stopped" [ 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" -> "postfix_9_stop_0 paul" [ style = bold] "group_1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"group_1_stopped_0" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/994.exp b/crm/pengine/testcases/994.exp index d096121af4..b3ee97b8f4 100644 --- a/crm/pengine/testcases/994.exp +++ b/crm/pengine/testcases/994.exp @@ -1,203 +1,197 @@ - - - - - - diff --git a/crm/pengine/testcases/bug-1572-1.dot b/crm/pengine/testcases/bug-1572-1.dot index 675393f8ad..774d076ff7 100644 --- a/crm/pengine/testcases/bug-1572-1.dot +++ b/crm/pengine/testcases/bug-1572-1.dot @@ -1,150 +1,147 @@ 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" [ 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" -> "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" -> "ms_drbd_7788_demote_0" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "grp_pgsql_mirror_start_0" -> "fs_mirror_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" -> "all_stopped" [ 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" -> "ms_drbd_7788_demote_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" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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" -> "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_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" -> "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/crm/pengine/testcases/bug-1572-1.exp b/crm/pengine/testcases/bug-1572-1.exp index 3d1156ca71..a0325002a0 100644 --- a/crm/pengine/testcases/bug-1572-1.exp +++ b/crm/pengine/testcases/bug-1572-1.exp @@ -1,773 +1,764 @@ - - - - - - - - - diff --git a/crm/pengine/testcases/bug-1572-2.dot b/crm/pengine/testcases/bug-1572-2.dot index 5a7f577a3c..9c71e78a0c 100644 --- a/crm/pengine/testcases/bug-1572-2.dot +++ b/crm/pengine/testcases/bug-1572-2.dot @@ -1,82 +1,79 @@ digraph "g" { "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_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ 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" -> "ms_drbd_7788_demote_0" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "grp_pgsql_mirror_stop_0" -> "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] -"grp_pgsql_mirror_stop_0" -> "all_stopped" [ 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_stopped_0" [ style = bold] "grp_pgsql_mirror_stop_0" -> "ms_drbd_7788_demote_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" -> "all_stopped" [ 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_stop_0" -> "all_stopped" [ 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_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_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_stop_0" -> "ms_drbd_7788_confirmed-post_notify_stop_0" [ style = bold] "ms_drbd_7788_post_notify_stop_0" -> "rsc_drbd_7788:1_post_notify_stop_0 arc-tkincaidlx.wsicorp.com" [ 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_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_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" [ 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" [ style=bold color="green" fontcolor="orange" ] "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" [ 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" [ 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_stop_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_confirmed-post_notify_stop_0" [ style = bold] "rsc_drbd_7788:1_post_notify_stop_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_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" ] } diff --git a/crm/pengine/testcases/bug-1572-2.exp b/crm/pengine/testcases/bug-1572-2.exp index f99908f027..f618a94151 100644 --- a/crm/pengine/testcases/bug-1572-2.exp +++ b/crm/pengine/testcases/bug-1572-2.exp @@ -1,421 +1,412 @@ - - - - - - - - - diff --git a/crm/pengine/testcases/bug-1573.dot b/crm/pengine/testcases/bug-1573.dot index 8fb6b37390..4017076807 100644 --- a/crm/pengine/testcases/bug-1573.dot +++ b/crm/pengine/testcases/bug-1573.dot @@ -1,19 +1,17 @@ digraph "g" { "IPaddr_192_168_1_102_stop_0 xen-b" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" -> "do_shutdown xen-b" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" -> "group_11_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_6_stop_0" -> "IPaddr_192_168_1_102_stop_0 xen-b" [ style = bold] "apache_6_stop_0" -> "all_stopped" [ style = bold] "apache_6_stop_0" -> "group_11_stopped_0" [ style = bold] "apache_6_stop_0" [ style=bold color="green" fontcolor="orange" ] "do_shutdown xen-b" [ style=bold color="green" fontcolor="black" ] "group_11_stop_0" -> "IPaddr_192_168_1_102_stop_0 xen-b" [ style = bold] -"group_11_stop_0" -> "all_stopped" [ style = bold] "group_11_stop_0" -> "apache_6_stop_0" [ style = bold] "group_11_stop_0" -> "group_11_stopped_0" [ style = bold] "group_11_stop_0" [ style=bold color="green" fontcolor="orange" ] -"group_11_stopped_0" -> "all_stopped" [ style = bold] "group_11_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/bug-1573.exp b/crm/pengine/testcases/bug-1573.exp index ea46a2852d..3ecac33c61 100644 --- a/crm/pengine/testcases/bug-1573.exp +++ b/crm/pengine/testcases/bug-1573.exp @@ -1,90 +1,84 @@ - - - - - - diff --git a/crm/pengine/testcases/group10.dot b/crm/pengine/testcases/group10.dot index 7340ad6417..a20f980087 100644 --- a/crm/pengine/testcases/group10.dot +++ b/crm/pengine/testcases/group10.dot @@ -1,72 +1,70 @@ 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" -> "group-1_running_0" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] -"group-1_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/group10.exp b/crm/pengine/testcases/group10.exp index 17ab3931a5..011b6819cf 100644 --- a/crm/pengine/testcases/group10.exp +++ b/crm/pengine/testcases/group10.exp @@ -1,389 +1,383 @@ - - - - - - diff --git a/crm/pengine/testcases/group11.dot b/crm/pengine/testcases/group11.dot index 193789b16b..6a54911565 100644 --- a/crm/pengine/testcases/group11.dot +++ b/crm/pengine/testcases/group11.dot @@ -1,18 +1,16 @@ digraph "g" { "1_stop_0" -> "1_stopped_0" [ style = bold] -"1_stop_0" -> "all_stopped" [ style = bold] "1_stop_0" -> "rsc2_stop_0 node1" [ style = bold] "1_stop_0" -> "rsc3_stop_0 node1" [ style = bold] "1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"1_stopped_0" -> "all_stopped" [ style = bold] "1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "1_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "1_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/group11.exp b/crm/pengine/testcases/group11.exp index 9b2e1039fc..f5445ded7f 100644 --- a/crm/pengine/testcases/group11.exp +++ b/crm/pengine/testcases/group11.exp @@ -1,87 +1,81 @@ - - - - - - diff --git a/crm/pengine/testcases/group13.dot b/crm/pengine/testcases/group13.dot index f89677dba5..bb4745f3fd 100644 --- a/crm/pengine/testcases/group13.dot +++ b/crm/pengine/testcases/group13.dot @@ -1,12 +1,10 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"nfs_stop_0" -> "all_stopped" [ style = bold] "nfs_stop_0" -> "nfs_stopped_0" [ style = bold] "nfs_stop_0" -> "resource_nfs_stop_0 jamesltc" [ style = bold] "nfs_stop_0" [ style=bold color="green" fontcolor="orange" ] -"nfs_stopped_0" -> "all_stopped" [ style = bold] "nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ] "resource_nfs_stop_0 jamesltc" -> "all_stopped" [ style = bold] "resource_nfs_stop_0 jamesltc" -> "nfs_stopped_0" [ style = bold] "resource_nfs_stop_0 jamesltc" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/group13.exp b/crm/pengine/testcases/group13.exp index 771b116ecf..c84ac76d49 100644 --- a/crm/pengine/testcases/group13.exp +++ b/crm/pengine/testcases/group13.exp @@ -1,57 +1,51 @@ - - - - - - diff --git a/crm/pengine/testcases/group14.dot b/crm/pengine/testcases/group14.dot index 399c90d1fa..bd6df4c73d 100644 --- a/crm/pengine/testcases/group14.dot +++ b/crm/pengine/testcases/group14.dot @@ -1,68 +1,66 @@ digraph "g" { "192.168.100.181_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "192.168.100.181_start_0 c001n07" -> "192.168.100.181_monitor_5000 c001n07" [ style = bold] "192.168.100.181_start_0 c001n07" -> "192.168.100.182_start_0 c001n07" [ style = bold] "192.168.100.181_start_0 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "192.168.100.181_stop_0 c001n06" -> "192.168.100.181_start_0 c001n07" [ style = bold] "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=filled color="black" fontcolor="black" fillcolor=red] "192.168.100.182_start_0 c001n07" -> "192.168.100.182_monitor_5000 c001n07" [ style = bold] "192.168.100.182_start_0 c001n07" -> "192.168.100.183_start_0 c001n07" [ style = bold] "192.168.100.182_start_0 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "192.168.100.183_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "192.168.100.183_start_0 c001n07" -> "192.168.100.183_monitor_5000 c001n07" [ style = bold] "192.168.100.183_start_0 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "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=filled color="black" fontcolor="black" fillcolor=red] "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" ] "child_DoFencing:4_monitor_0 c001n06" -> "probe_complete c001n06" [ style = bold] "child_DoFencing:4_monitor_0 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:4_monitor_0 c001n07" -> "probe_complete c001n07" [ style = bold] "child_DoFencing:4_monitor_0 c001n07" [ style=bold color="green" fontcolor="black" ] "group-1_start_0" -> "192.168.100.181_start_0 c001n07" [ style = bold] "group-1_start_0" [ style=filled color="black" fontcolor="orange" fillcolor=red] "group-1_stop_0" -> "192.168.100.181_stop_0 c001n06" [ style = bold] "group-1_stop_0" -> "192.168.100.183_stop_0" [ style = bold] -"group-1_stop_0" -> "all_stopped" [ 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" -> "all_stopped" [ style = bold] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "lsb_dummy_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "migrator_monitor_10000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:0_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:10_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:11_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:1_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "probe_complete c001n06" -> "probe_complete" [ style = bold] "probe_complete c001n06" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n07" -> "probe_complete" [ style = bold] "probe_complete c001n07" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "DoFencing_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n02_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n03_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n04_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n05_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n06_monitor_5000 c001n06" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_c001n07_monitor_5000 c001n07" [ style=filled color="black" fontcolor="black" fillcolor=red] } diff --git a/crm/pengine/testcases/group14.exp b/crm/pengine/testcases/group14.exp index 6aab7eb96b..020d62145a 100644 --- a/crm/pengine/testcases/group14.exp +++ b/crm/pengine/testcases/group14.exp @@ -1,214 +1,208 @@ - - - - - - diff --git a/crm/pengine/testcases/group5.dot b/crm/pengine/testcases/group5.dot index 3a2ffd162b..a7401517e4 100644 --- a/crm/pengine/testcases/group5.dot +++ b/crm/pengine/testcases/group5.dot @@ -1,69 +1,67 @@ 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" -> "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" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp index 74dcc5ca1e..09940d16c4 100644 --- a/crm/pengine/testcases/group5.exp +++ b/crm/pengine/testcases/group5.exp @@ -1,350 +1,344 @@ - - - - - - diff --git a/crm/pengine/testcases/group6.dot b/crm/pengine/testcases/group6.dot index 45ebf3ac99..4bee2412b7 100644 --- a/crm/pengine/testcases/group6.dot +++ b/crm/pengine/testcases/group6.dot @@ -1,96 +1,92 @@ 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" -> "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" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp index ea60c8f00d..b33e5c2b3c 100644 --- a/crm/pengine/testcases/group6.exp +++ b/crm/pengine/testcases/group6.exp @@ -1,475 +1,463 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/group9.dot b/crm/pengine/testcases/group9.dot index ff2cd6e87d..29af6eae6f 100644 --- a/crm/pengine/testcases/group9.dot +++ b/crm/pengine/testcases/group9.dot @@ -1,92 +1,88 @@ 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" [ style=bold color="green" fontcolor="orange" ] -"bar_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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" -> "rsc3_start_0 node1" [ style = bold] "foo_start_0" [ style=bold color="green" fontcolor="orange" ] -"foo_stop_0" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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" [ 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" ] "rsc3_start_0 node1" -> "foo_running_0" [ style = bold] "rsc3_start_0 node1" -> "rsc4_start_0 node1" [ style = bold] "rsc3_start_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" ] "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/crm/pengine/testcases/group9.exp b/crm/pengine/testcases/group9.exp index 37bca3f2fb..cccbfce6fd 100644 --- a/crm/pengine/testcases/group9.exp +++ b/crm/pengine/testcases/group9.exp @@ -1,467 +1,455 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/inc10.dot b/crm/pengine/testcases/inc10.dot index 3adb4823b8..870920e783 100644 --- a/crm/pengine/testcases/inc10.dot +++ b/crm/pengine/testcases/inc10.dot @@ -1,48 +1,46 @@ digraph "g" { "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 xen-2" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:2_stop_0 xen-2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_stop_0 xen-2" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] -"ocfs2-clone_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "ocfs2-clone_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_confirmed-pre_notify_stop_0" -> "ocfs2-clone_stop_0" [ style = bold] "ocfs2-clone_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_post_notify_stop_0" -> "ocfs2-clone_confirmed-post_notify_stop_0" [ style = bold] "ocfs2-clone_post_notify_stop_0" -> "ocfs2:0_post_notify_stop_0 xen-4" [ style = bold] "ocfs2-clone_post_notify_stop_0" -> "ocfs2:1_post_notify_stop_0 xen-3" [ style = bold] "ocfs2-clone_post_notify_stop_0" -> "ocfs2:3_post_notify_stop_0 xen-1" [ style = bold] "ocfs2-clone_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_pre_notify_stop_0" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2-clone_pre_notify_stop_0" -> "ocfs2:0_pre_notify_stop_0 xen-4" [ style = bold] "ocfs2-clone_pre_notify_stop_0" -> "ocfs2:1_pre_notify_stop_0 xen-3" [ style = bold] "ocfs2-clone_pre_notify_stop_0" -> "ocfs2:2_pre_notify_stop_0 xen-2" [ style = bold] "ocfs2-clone_pre_notify_stop_0" -> "ocfs2:3_pre_notify_stop_0 xen-1" [ style = bold] "ocfs2-clone_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_stop_0" -> "ocfs2-clone_stopped_0" [ style = bold] "ocfs2-clone_stop_0" -> "ocfs2:2_stop_0 xen-2" [ style = bold] "ocfs2-clone_stop_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_stopped_0" -> "ocfs2-clone_post_notify_stop_0" [ style = bold] "ocfs2-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2:0_post_notify_stop_0 xen-4" -> "ocfs2-clone_confirmed-post_notify_stop_0" [ style = bold] "ocfs2:0_post_notify_stop_0 xen-4" [ style=bold color="green" fontcolor="black" ] "ocfs2:0_pre_notify_stop_0 xen-4" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2:0_pre_notify_stop_0 xen-4" [ style=bold color="green" fontcolor="black" ] "ocfs2:1_post_notify_stop_0 xen-3" -> "ocfs2-clone_confirmed-post_notify_stop_0" [ style = bold] "ocfs2:1_post_notify_stop_0 xen-3" [ style=bold color="green" fontcolor="black" ] "ocfs2:1_pre_notify_stop_0 xen-3" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2:1_pre_notify_stop_0 xen-3" [ style=bold color="green" fontcolor="black" ] "ocfs2:2_pre_notify_stop_0 xen-2" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2:2_pre_notify_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] "ocfs2:2_stop_0 xen-2" -> "all_stopped" [ style = bold] "ocfs2:2_stop_0 xen-2" -> "ocfs2-clone_stopped_0" [ style = bold] "ocfs2:2_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] "ocfs2:3_post_notify_stop_0 xen-1" -> "ocfs2-clone_confirmed-post_notify_stop_0" [ style = bold] "ocfs2:3_post_notify_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] "ocfs2:3_pre_notify_stop_0 xen-1" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2:3_pre_notify_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/inc10.exp b/crm/pengine/testcases/inc10.exp index 3d8cb545a4..51d32801e5 100644 --- a/crm/pengine/testcases/inc10.exp +++ b/crm/pengine/testcases/inc10.exp @@ -1,256 +1,250 @@ - - - - - - diff --git a/crm/pengine/testcases/inc12.dot b/crm/pengine/testcases/inc12.dot index b6a993306f..c36c5980d1 100644 --- a/crm/pengine/testcases/inc12.dot +++ b/crm/pengine/testcases/inc12.dot @@ -1,145 +1,141 @@ digraph "g" { "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 c001n04" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:3_stop_0 c001n05" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:4_stop_0 c001n06" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:5_stop_0 c001n07" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold] "all_stopped" -> "child_DoFencing:2_stop_0 c001n04" [ style = bold] "all_stopped" -> "child_DoFencing:3_stop_0 c001n05" [ style = bold] "all_stopped" -> "child_DoFencing:4_stop_0 c001n06" [ style = bold] "all_stopped" -> "child_DoFencing:5_stop_0 c001n07" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "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" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "child_DoFencing:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:3_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "child_DoFencing:3_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:4_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "child_DoFencing:4_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:5_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "child_DoFencing:5_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" -> "do_shutdown c001n03" [ style = bold] "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n03" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n04" -> "do_shutdown c001n03" [ style = bold] "do_shutdown c001n04" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n05" -> "do_shutdown c001n03" [ style = bold] "do_shutdown c001n05" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n06" -> "do_shutdown c001n03" [ style = bold] "do_shutdown c001n06" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n07" -> "do_shutdown c001n03" [ style = bold] "do_shutdown c001n07" [ style=bold color="green" fontcolor="black" ] -"group-1_stop_0" -> "all_stopped" [ style = bold] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "heartbeat_192.168.100.182_stop_0 c001n02" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n02" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n02" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"group-1_stopped_0" -> "all_stopped" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "heartbeat_192.168.100.182_stop_0 c001n02" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "ocf_192.168.100.181_stop_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_stop_0 c001n04" -> "all_stopped" [ style = bold] "lsb_dummy_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "lsb_dummy_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:10_stop_0 c001n02" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:11_stop_0 c001n02" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:2_stop_0 c001n04" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:3_stop_0 c001n04" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n05" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:5_stop_0 c001n05" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:6_stop_0 c001n06" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:7_stop_0 c001n06" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:8_stop_0 c001n07" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:9_stop_0 c001n07" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"master_rsc_1_stopped_0" -> "all_stopped" [ style = bold] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "heartbeat_192.168.100.182_stop_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:10_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:11_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_stop_0 c001n06" -> "all_stopped" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_stop_0 c001n06" -> "all_stopped" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:8_stop_0 c001n07" -> "all_stopped" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:9_stop_0 c001n07" -> "all_stopped" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] "probe_complete c001n03" -> "probe_complete" [ style = bold] "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n03_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "rsc_c001n03_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "rsc_c001n04_stop_0 c001n04" -> "all_stopped" [ style = bold] "rsc_c001n04_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "rsc_c001n04_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n05_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n05_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "rsc_c001n06_stop_0 c001n06" -> "all_stopped" [ style = bold] "rsc_c001n06_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "rsc_c001n06_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "rsc_c001n07_stop_0 c001n07" -> "all_stopped" [ style = bold] "rsc_c001n07_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "rsc_c001n07_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/inc12.exp b/crm/pengine/testcases/inc12.exp index a871efae5d..f6794f3a56 100644 --- a/crm/pengine/testcases/inc12.exp +++ b/crm/pengine/testcases/inc12.exp @@ -1,693 +1,681 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/inc2.dot b/crm/pengine/testcases/inc2.dot index 910d0f954d..d0c99e5a1f 100644 --- a/crm/pengine/testcases/inc2.dot +++ b/crm/pengine/testcases/inc2.dot @@ -1,46 +1,45 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 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" -> "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:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_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:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_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" -> "all_stopped" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp index 70de393b8a..8e6653733e 100644 --- a/crm/pengine/testcases/inc2.exp +++ b/crm/pengine/testcases/inc2.exp @@ -1,241 +1,238 @@ - - - diff --git a/crm/pengine/testcases/inc3.dot b/crm/pengine/testcases/inc3.dot index 594e5eb0c0..dd5cca1b23 100644 --- a/crm/pengine/testcases/inc3.dot +++ b/crm/pengine/testcases/inc3.dot @@ -1,86 +1,84 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:4_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:4_stop_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" -> "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:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_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:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_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" -> "all_stopped" [ style = bold] "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_rsc2:3_start_0 node1" [ style = bold] "rsc2_start_0" -> "child_rsc2:4_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:3_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "child_rsc2:4_stop_0 node2" [ 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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp index c2399f45be..6451679471 100644 --- a/crm/pengine/testcases/inc3.exp +++ b/crm/pengine/testcases/inc3.exp @@ -1,449 +1,443 @@ - - - - - - diff --git a/crm/pengine/testcases/inc4.dot b/crm/pengine/testcases/inc4.dot index f4455c1f09..34aa85aaa1 100644 --- a/crm/pengine/testcases/inc4.dot +++ b/crm/pengine/testcases/inc4.dot @@ -1,111 +1,109 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_start_0 node1" -> "child_rsc1:1_start_0 node1" [ style = bold] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_start_0 node2" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:0_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_start_0 node2" -> "child_rsc2:2_start_0 node2" [ style = bold] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_start_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:2_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:4_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:4_stop_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" -> "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:0_start_0 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_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:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_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" -> "all_stopped" [ style = bold] "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_rsc2:0_start_0 node2" [ style = bold] "rsc2_start_0" -> "child_rsc2:1_start_0 node2" [ style = bold] "rsc2_start_0" -> "child_rsc2:2_start_0 node2" [ style = bold] "rsc2_start_0" -> "child_rsc2:3_start_0 node1" [ style = bold] "rsc2_start_0" -> "child_rsc2:4_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:3_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "child_rsc2:4_stop_0 node2" [ 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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/inc4.exp b/crm/pengine/testcases/inc4.exp index 15d58efe78..c4fc8171de 100644 --- a/crm/pengine/testcases/inc4.exp +++ b/crm/pengine/testcases/inc4.exp @@ -1,559 +1,553 @@ - - - - - - diff --git a/crm/pengine/testcases/inc5.dot b/crm/pengine/testcases/inc5.dot index 257b695068..80c846941c 100644 --- a/crm/pengine/testcases/inc5.dot +++ b/crm/pengine/testcases/inc5.dot @@ -1,144 +1,140 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_stop_0 node1" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc3:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4:1_stop_0 node1" -> "child_rsc4:1_start_0 node2" [ style = bold] "child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc4:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc5:1_stop_0 node2" -> "child_rsc5:1_start_0 node1" [ style = bold] "child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc5:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc5:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc6:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc6:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc6:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc7:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc7:1_stop_0 node2" -> "child_rsc7:1_start_0 node1" [ style = bold] "child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc7:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc7:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc7:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc8:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc8:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc8:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc8:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc8:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc8:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc8:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc8:2_monitor_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" -> "rsc2_start_0" [ style = bold] "probe_complete" -> "rsc4_start_0" [ style = bold] "probe_complete" -> "rsc5_start_0" [ style = bold] "probe_complete" -> "rsc7_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc2:1_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_rsc2:1_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" -> "all_stopped" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_start_0" -> "child_rsc4:1_start_0 node2" [ style = bold] "rsc4_start_0" -> "rsc4_running_0" [ style = bold] "rsc4_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stop_0" -> "child_rsc4:1_stop_0 node1" [ style = bold] "rsc4_stop_0" -> "rsc4_start_0" [ style = bold] "rsc4_stop_0" -> "rsc4_stopped_0" [ style = bold] "rsc4_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc4_stopped_0" -> "all_stopped" [ style = bold] "rsc4_stopped_0" -> "rsc4_start_0" [ style = bold] "rsc4_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_start_0" -> "child_rsc5:1_start_0 node1" [ style = bold] "rsc5_start_0" -> "rsc5_running_0" [ style = bold] "rsc5_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stop_0" -> "child_rsc5:1_stop_0 node2" [ style = bold] "rsc5_stop_0" -> "rsc5_start_0" [ style = bold] "rsc5_stop_0" -> "rsc5_stopped_0" [ style = bold] "rsc5_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc5_stopped_0" -> "all_stopped" [ style = bold] "rsc5_stopped_0" -> "rsc5_start_0" [ style = bold] "rsc5_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_start_0" -> "child_rsc7:1_start_0 node1" [ style = bold] "rsc7_start_0" -> "rsc7_running_0" [ style = bold] "rsc7_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stop_0" -> "child_rsc7:1_stop_0 node2" [ style = bold] "rsc7_stop_0" -> "rsc7_start_0" [ style = bold] "rsc7_stop_0" -> "rsc7_stopped_0" [ style = bold] "rsc7_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc7_stopped_0" -> "all_stopped" [ style = bold] "rsc7_stopped_0" -> "rsc7_start_0" [ style = bold] "rsc7_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/inc5.exp b/crm/pengine/testcases/inc5.exp index 251a5413b8..8cf5fc9220 100644 --- a/crm/pengine/testcases/inc5.exp +++ b/crm/pengine/testcases/inc5.exp @@ -1,793 +1,781 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/inc6.dot b/crm/pengine/testcases/inc6.dot index 4727006076..b98b72c10a 100644 --- a/crm/pengine/testcases/inc6.dot +++ b/crm/pengine/testcases/inc6.dot @@ -1,93 +1,88 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_stop_0 node1" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4:1_stop_0 node1" -> "child_rsc4:1_start_0 node2" [ style = bold] "child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc5:1_stop_0 node2" -> "child_rsc5:1_start_0 node1" [ style = bold] "child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc6:0_stop_0 node1" -> "child_rsc6:0_start_0 node1" [ style = bold] "child_rsc6:0_stop_0 node1" -> "rsc5_stop_0" [ style = bold] "child_rsc6:0_stop_0 node1" -> "rsc6_stopped_0" [ style = bold] "child_rsc6:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc6:1_stop_0 node2" -> "child_rsc6:1_start_0 node2" [ style = bold] "child_rsc6:1_stop_0 node2" -> "rsc5_stop_0" [ style = bold] "child_rsc6:1_stop_0 node2" -> "rsc6_stopped_0" [ style = bold] "child_rsc6:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc7:1_stop_0 node2" -> "child_rsc7:1_start_0 node1" [ style = bold] "child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc2:1_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_rsc2:1_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" -> "all_stopped" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_start_0" -> "child_rsc4:1_start_0 node2" [ style = bold] "rsc4_start_0" -> "rsc4_running_0" [ style = bold] "rsc4_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stop_0" -> "child_rsc4:1_stop_0 node1" [ style = bold] "rsc4_stop_0" -> "rsc4_start_0" [ style = bold] "rsc4_stop_0" -> "rsc4_stopped_0" [ style = bold] "rsc4_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc4_stopped_0" -> "all_stopped" [ style = bold] "rsc4_stopped_0" -> "rsc4_start_0" [ style = bold] "rsc4_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_running_0" -> "rsc6_start_0" [ style = bold] "rsc5_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_start_0" -> "child_rsc5:1_start_0 node1" [ style = bold] "rsc5_start_0" -> "rsc5_running_0" [ style = bold] "rsc5_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stop_0" -> "child_rsc5:1_stop_0 node2" [ style = bold] "rsc5_stop_0" -> "rsc5_start_0" [ style = bold] "rsc5_stop_0" -> "rsc5_stopped_0" [ style = bold] "rsc5_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc5_stopped_0" -> "all_stopped" [ style = bold] "rsc5_stopped_0" -> "rsc5_start_0" [ style = bold] "rsc5_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc6_start_0" -> "child_rsc6:0_start_0 node1" [ style = bold] "rsc6_start_0" -> "child_rsc6:1_start_0 node2" [ style = bold] "rsc6_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc6_stopped_0" -> "all_stopped" [ style = bold] "rsc6_stopped_0" -> "rsc5_stop_0" [ style = bold] "rsc6_stopped_0" -> "rsc6_start_0" [ style = bold] "rsc6_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_start_0" -> "child_rsc7:1_start_0 node1" [ style = bold] "rsc7_start_0" -> "rsc7_running_0" [ style = bold] "rsc7_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stop_0" -> "child_rsc7:1_stop_0 node2" [ style = bold] "rsc7_stop_0" -> "rsc7_start_0" [ style = bold] "rsc7_stop_0" -> "rsc7_stopped_0" [ style = bold] "rsc7_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc7_stopped_0" -> "all_stopped" [ style = bold] "rsc7_stopped_0" -> "rsc7_start_0" [ style = bold] "rsc7_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/inc6.exp b/crm/pengine/testcases/inc6.exp index d513746322..1e9131600c 100644 --- a/crm/pengine/testcases/inc6.exp +++ b/crm/pengine/testcases/inc6.exp @@ -1,479 +1,464 @@ - - - - - - - - - - - - - - - diff --git a/crm/pengine/testcases/inc9.dot b/crm/pengine/testcases/inc9.dot index c8b2109c05..8c0fc8b920 100644 --- a/crm/pengine/testcases/inc9.dot +++ b/crm/pengine/testcases/inc9.dot @@ -1,26 +1,25 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:4_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 node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stopped_0" -> "all_stopped" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/inc9.exp b/crm/pengine/testcases/inc9.exp index ed383af476..fdc9b794f7 100644 --- a/crm/pengine/testcases/inc9.exp +++ b/crm/pengine/testcases/inc9.exp @@ -1,147 +1,144 @@ - - - diff --git a/crm/pengine/testcases/master-7.dot b/crm/pengine/testcases/master-7.dot index 282ddb31cc..0c2095f0db 100644 --- a/crm/pengine/testcases/master-7.dot +++ b/crm/pengine/testcases/master-7.dot @@ -1,134 +1,130 @@ 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" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "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" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] -"group-1_stop_0" -> "all_stopped" [ 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" -> "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" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ 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_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/crm/pengine/testcases/master-7.exp b/crm/pengine/testcases/master-7.exp index 5a318729eb..58bdd0365c 100644 --- a/crm/pengine/testcases/master-7.exp +++ b/crm/pengine/testcases/master-7.exp @@ -1,722 +1,710 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/master-8.dot b/crm/pengine/testcases/master-8.dot index 2298676f8f..203db64398 100644 --- a/crm/pengine/testcases/master-8.dot +++ b/crm/pengine/testcases/master-8.dot @@ -1,144 +1,140 @@ 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" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "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" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] -"group-1_stop_0" -> "all_stopped" [ 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" -> "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" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "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" [ 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/crm/pengine/testcases/master-8.exp b/crm/pengine/testcases/master-8.exp index 9b428ad6f7..e4e155fb03 100644 --- a/crm/pengine/testcases/master-8.exp +++ b/crm/pengine/testcases/master-8.exp @@ -1,778 +1,766 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/master-9.dot b/crm/pengine/testcases/master-9.dot index 47cbbf6f64..9d1bc53853 100644 --- a/crm/pengine/testcases/master-9.dot +++ b/crm/pengine/testcases/master-9.dot @@ -1,63 +1,62 @@ digraph "g" { "DcIPaddr_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 ibm1" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] -"DoFencing_stopped_0" -> "all_stopped" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" -> "child_DoFencing:1_stop_0 ibm1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:1_monitor_0 va1" -> "probe_complete va1" [ style = bold] "child_DoFencing:1_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 ibm1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 ibm1" -> "do_shutdown ibm1" [ style = bold] "child_DoFencing:1_stop_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "child_DoFencing:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 va1" -> "probe_complete va1" [ style = bold] "child_DoFencing:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "child_DoFencing:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 va1" -> "probe_complete va1" [ style = bold] "child_DoFencing:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "do_shutdown ibm1" [ style=bold color="green" fontcolor="black" ] "heartbeat_127.0.0.12_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "lsb_dummy_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_127.0.0.11_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_127.0.0.13_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:0_monitor_6000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:1_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "ocf_msdummy:2_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:4_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:4_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:5_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:5_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:6_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:6_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 ibm1" -> "probe_complete ibm1" [ style = bold] "ocf_msdummy:7_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 va1" -> "probe_complete va1" [ style = bold] "ocf_msdummy:7_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "probe_complete ibm1" -> "probe_complete" [ style = bold] "probe_complete ibm1" [ style=bold color="green" fontcolor="black" ] "probe_complete va1" -> "probe_complete" [ style = bold] "probe_complete va1" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc_ibm1_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_sgi2_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_test02_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] "rsc_va1_monitor_5000 va1" [ style=filled color="black" fontcolor="black" fillcolor=red] } diff --git a/crm/pengine/testcases/master-9.exp b/crm/pengine/testcases/master-9.exp index 90357c525a..8ff81e1c4d 100644 --- a/crm/pengine/testcases/master-9.exp +++ b/crm/pengine/testcases/master-9.exp @@ -1,303 +1,299 @@ - - - - - + diff --git a/crm/pengine/testcases/notify-0.dot b/crm/pengine/testcases/notify-0.dot index 7c5e47158b..0eb613cc22 100644 --- a/crm/pengine/testcases/notify-0.dot +++ b/crm/pengine/testcases/notify-0.dot @@ -1,25 +1,24 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_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" -> "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:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_stopped_0" -> "all_stopped" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/notify-0.exp b/crm/pengine/testcases/notify-0.exp index 2af9ff63af..bfa8637b11 100644 --- a/crm/pengine/testcases/notify-0.exp +++ b/crm/pengine/testcases/notify-0.exp @@ -1,139 +1,136 @@ - - - diff --git a/crm/pengine/testcases/notify-1.dot b/crm/pengine/testcases/notify-1.dot index 36104bb48c..5a838901cc 100644 --- a/crm/pengine/testcases/notify-1.dot +++ b/crm/pengine/testcases/notify-1.dot @@ -1,53 +1,52 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_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" -> "rsc1_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/notify-1.exp b/crm/pengine/testcases/notify-1.exp index 1e48478899..1d37bb2827 100644 --- a/crm/pengine/testcases/notify-1.exp +++ b/crm/pengine/testcases/notify-1.exp @@ -1,298 +1,295 @@ - - - diff --git a/crm/pengine/testcases/notify-2.dot b/crm/pengine/testcases/notify-2.dot index 36104bb48c..5a838901cc 100644 --- a/crm/pengine/testcases/notify-2.dot +++ b/crm/pengine/testcases/notify-2.dot @@ -1,53 +1,52 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_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" -> "rsc1_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/notify-2.exp b/crm/pengine/testcases/notify-2.exp index 1e48478899..1d37bb2827 100644 --- a/crm/pengine/testcases/notify-2.exp +++ b/crm/pengine/testcases/notify-2.exp @@ -1,298 +1,295 @@ - - - diff --git a/crm/pengine/testcases/notify-3.dot b/crm/pengine/testcases/notify-3.dot index e8341bd63d..29cce8fba7 100644 --- a/crm/pengine/testcases/notify-3.dot +++ b/crm/pengine/testcases/notify-3.dot @@ -1,91 +1,89 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold] "child_rsc1:0_post_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_pre_notify_stop_0 node2" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:1_stop_0 node2" -> "child_rsc1:1_start_0 node1" [ style = bold] "child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:1_monitor_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" -> "rsc1_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = bold] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_stop_0" -> "child_rsc1:0_post_notify_stop_0 node1" [ style = bold] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold] "rsc1_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_stop_0" -> "child_rsc1:0_pre_notify_stop_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:1_pre_notify_stop_0 node2" [ style = bold] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "rsc1_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:1_stop_0 node2" [ 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_post_notify_stop_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/notify-3.exp b/crm/pengine/testcases/notify-3.exp index c2ea4f6bb4..72274abbe6 100644 --- a/crm/pengine/testcases/notify-3.exp +++ b/crm/pengine/testcases/notify-3.exp @@ -1,500 +1,494 @@ - - - - - - diff --git a/crm/pengine/testcases/novell-239082.dot b/crm/pengine/testcases/novell-239082.dot index c25752eb23..1f6493d825 100644 --- a/crm/pengine/testcases/novell-239082.dot +++ b/crm/pengine/testcases/novell-239082.dot @@ -1,88 +1,87 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_demote_0 xen-2" -> "ms-drbd0_confirmed-post_notify_demote_0" [ style = bold] "drbd0:0_post_notify_demote_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_promote_0 xen-2" -> "ms-drbd0_confirmed-post_notify_promote_0" [ style = bold] "drbd0:0_post_notify_promote_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_stop_0 xen-2" -> "ms-drbd0_confirmed-post_notify_stop_0" [ style = bold] "drbd0:0_post_notify_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_pre_notify_demote_0 xen-2" -> "ms-drbd0_confirmed-pre_notify_demote_0" [ style = bold] "drbd0:0_pre_notify_demote_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_pre_notify_promote_0 xen-2" -> "ms-drbd0_confirmed-pre_notify_promote_0" [ style = bold] "drbd0:0_pre_notify_promote_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_pre_notify_stop_0 xen-2" -> "ms-drbd0_confirmed-pre_notify_stop_0" [ style = bold] "drbd0:0_pre_notify_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:0_promote_0 xen-2" -> "ms-drbd0_promoted_0" [ style = bold] "drbd0:0_promote_0 xen-2" [ style=bold color="green" fontcolor="black" ] "drbd0:1_demote_0 xen-1" -> "drbd0:1_stop_0 xen-1" [ style = bold] "drbd0:1_demote_0 xen-1" -> "ms-drbd0_demoted_0" [ style = bold] "drbd0:1_demote_0 xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:1_post_notify_demote_0 xen-1" -> "ms-drbd0_confirmed-post_notify_demote_0" [ style = bold] "drbd0:1_post_notify_demote_0 xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:1_pre_notify_demote_0 xen-1" -> "ms-drbd0_confirmed-pre_notify_demote_0" [ style = bold] "drbd0:1_pre_notify_demote_0 xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:1_pre_notify_stop_0 xen-1" -> "ms-drbd0_confirmed-pre_notify_stop_0" [ style = bold] "drbd0:1_pre_notify_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:1_stop_0 xen-1" -> "all_stopped" [ style = bold] "drbd0:1_stop_0 xen-1" -> "do_shutdown xen-1" [ style = bold] "drbd0:1_stop_0 xen-1" -> "ms-drbd0_stopped_0" [ style = bold] "drbd0:1_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] "fs_1_start_0 xen-2" [ style=bold color="green" fontcolor="black" ] "fs_1_stop_0 xen-1" -> "all_stopped" [ style = bold] "fs_1_stop_0 xen-1" -> "do_shutdown xen-1" [ style = bold] "fs_1_stop_0 xen-1" -> "fs_1_start_0 xen-2" [ style = bold] "fs_1_stop_0 xen-1" -> "ms-drbd0_demote_0" [ style = bold] "fs_1_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] "ms-drbd0_confirmed-post_notify_demote_0" -> "ms-drbd0_pre_notify_stop_0" [ style = bold] "ms-drbd0_confirmed-post_notify_demote_0" -> "ms-drbd0_stop_0" [ style = bold] "ms-drbd0_confirmed-post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-post_notify_promote_0" -> "fs_1_start_0 xen-2" [ style = bold] "ms-drbd0_confirmed-post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] -"ms-drbd0_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "ms-drbd0_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-pre_notify_demote_0" -> "ms-drbd0_demote_0" [ style = bold] "ms-drbd0_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-pre_notify_promote_0" -> "ms-drbd0_promote_0" [ style = bold] "ms-drbd0_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-pre_notify_stop_0" -> "ms-drbd0_stop_0" [ style = bold] "ms-drbd0_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_demote_0" -> "drbd0:1_demote_0 xen-1" [ style = bold] "ms-drbd0_demote_0" -> "ms-drbd0_demoted_0" [ style = bold] "ms-drbd0_demote_0" -> "ms-drbd0_stop_0" [ style = bold] "ms-drbd0_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_demoted_0" -> "ms-drbd0_post_notify_demote_0" [ style = bold] "ms-drbd0_demoted_0" -> "ms-drbd0_promote_0" [ style = bold] "ms-drbd0_demoted_0" -> "ms-drbd0_stop_0" [ style = bold] "ms-drbd0_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_post_notify_demote_0" -> "drbd0:0_post_notify_demote_0 xen-2" [ style = bold] "ms-drbd0_post_notify_demote_0" -> "drbd0:1_post_notify_demote_0 xen-1" [ style = bold] "ms-drbd0_post_notify_demote_0" -> "ms-drbd0_confirmed-post_notify_demote_0" [ style = bold] "ms-drbd0_post_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_post_notify_promote_0" -> "drbd0:0_post_notify_promote_0 xen-2" [ style = bold] "ms-drbd0_post_notify_promote_0" -> "ms-drbd0_confirmed-post_notify_promote_0" [ style = bold] "ms-drbd0_post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_post_notify_stop_0" -> "drbd0:0_post_notify_stop_0 xen-2" [ style = bold] "ms-drbd0_post_notify_stop_0" -> "ms-drbd0_confirmed-post_notify_stop_0" [ style = bold] "ms-drbd0_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_pre_notify_demote_0" -> "drbd0:0_pre_notify_demote_0 xen-2" [ style = bold] "ms-drbd0_pre_notify_demote_0" -> "drbd0:1_pre_notify_demote_0 xen-1" [ style = bold] "ms-drbd0_pre_notify_demote_0" -> "ms-drbd0_confirmed-pre_notify_demote_0" [ style = bold] "ms-drbd0_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_pre_notify_promote_0" -> "drbd0:0_pre_notify_promote_0 xen-2" [ style = bold] "ms-drbd0_pre_notify_promote_0" -> "ms-drbd0_confirmed-pre_notify_promote_0" [ style = bold] "ms-drbd0_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_pre_notify_stop_0" -> "drbd0:0_pre_notify_stop_0 xen-2" [ style = bold] "ms-drbd0_pre_notify_stop_0" -> "drbd0:1_pre_notify_stop_0 xen-1" [ style = bold] "ms-drbd0_pre_notify_stop_0" -> "ms-drbd0_confirmed-pre_notify_stop_0" [ style = bold] "ms-drbd0_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_promote_0" -> "drbd0:0_promote_0 xen-2" [ style = bold] "ms-drbd0_promote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_promoted_0" -> "ms-drbd0_post_notify_promote_0" [ style = bold] "ms-drbd0_promoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_stop_0" -> "drbd0:1_stop_0 xen-1" [ style = bold] "ms-drbd0_stop_0" -> "ms-drbd0_stopped_0" [ style = bold] "ms-drbd0_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_stopped_0" -> "ms-drbd0_post_notify_stop_0" [ style = bold] "ms-drbd0_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/novell-239082.exp b/crm/pengine/testcases/novell-239082.exp index d1cc4bef61..c09037bfd6 100644 --- a/crm/pengine/testcases/novell-239082.exp +++ b/crm/pengine/testcases/novell-239082.exp @@ -1,476 +1,473 @@ - - - diff --git a/crm/pengine/testcases/novell-252693-3.dot b/crm/pengine/testcases/novell-252693-3.dot index cccf1ad6c1..e2fba1617e 100644 --- a/crm/pengine/testcases/novell-252693-3.dot +++ b/crm/pengine/testcases/novell-252693-3.dot @@ -1,154 +1,153 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "configstoreclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_post_notify_start_0 node2" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold] "configstoreclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_start_0 node2" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstoreclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_post_notify_start_0 node1" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold] "configstoreclone:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_start_0 node1" -> "configstoreclone:1_monitor_20000 node1" [ style = bold] "configstoreclone:1_start_0 node1" -> "configstorecloneset_running_0" [ style = bold] "configstoreclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "configstorecloneset_confirmed-post_notify_start_0" -> "configstoreclone:1_monitor_20000 node1" [ style = bold] "configstorecloneset_confirmed-post_notify_start_0" -> "sles10_start_0 node1" [ style = bold] "configstorecloneset_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_start_0" -> "configstorecloneset_start_0" [ style = bold] "configstorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_post_notify_start_0" -> "configstoreclone:0_post_notify_start_0 node2" [ style = bold] "configstorecloneset_post_notify_start_0" -> "configstoreclone:1_post_notify_start_0 node1" [ style = bold] "configstorecloneset_post_notify_start_0" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold] "configstorecloneset_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_pre_notify_start_0" -> "configstoreclone:0_pre_notify_start_0 node2" [ style = bold] "configstorecloneset_pre_notify_start_0" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_running_0" -> "configstorecloneset_post_notify_start_0" [ style = bold] "configstorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_start_0" -> "configstoreclone:1_start_0 node1" [ style = bold] "configstorecloneset_start_0" -> "configstorecloneset_running_0" [ style = bold] "configstorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "evmsclone:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "evmsclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_post_notify_start_0 node2" -> "evmscloneset_confirmed-post_notify_start_0" [ style = bold] "evmsclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_pre_notify_start_0 node2" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmsclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_post_notify_start_0 node1" -> "evmscloneset_confirmed-post_notify_start_0" [ style = bold] "evmsclone:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_start_0 node1" -> "evmscloneset_running_0" [ style = bold] "evmsclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmscloneset_confirmed-post_notify_start_0" -> "configstorecloneset_start_0" [ style = bold] "evmscloneset_confirmed-post_notify_start_0" -> "imagestorecloneset_start_0" [ style = bold] "evmscloneset_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_start_0" -> "evmscloneset_start_0" [ style = bold] "evmscloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_post_notify_start_0" -> "evmsclone:0_post_notify_start_0 node2" [ style = bold] "evmscloneset_post_notify_start_0" -> "evmsclone:1_post_notify_start_0 node1" [ style = bold] "evmscloneset_post_notify_start_0" -> "evmscloneset_confirmed-post_notify_start_0" [ style = bold] "evmscloneset_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_pre_notify_start_0" -> "evmsclone:0_pre_notify_start_0 node2" [ style = bold] "evmscloneset_pre_notify_start_0" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmscloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_running_0" -> "evmscloneset_post_notify_start_0" [ style = bold] "evmscloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_start_0" -> "evmsclone:1_start_0 node1" [ style = bold] "evmscloneset_start_0" -> "evmscloneset_running_0" [ style = bold] "evmscloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "evmsdclone:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "evmsdclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_start_0 node1" -> "evmsdclone:1_monitor_5000 node1" [ style = bold] "evmsdclone:1_start_0 node1" -> "evmsdcloneset_running_0" [ style = bold] "evmsdclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdcloneset_running_0" -> "evmscloneset_start_0" [ style = bold] "evmsdcloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "evmsdcloneset_start_0" -> "evmsdclone:1_start_0 node1" [ style = bold] "evmsdcloneset_start_0" -> "evmsdcloneset_running_0" [ style = bold] "evmsdcloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestoreclone:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "imagestoreclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_post_notify_start_0 node1" -> "imagestorecloneset_confirmed-post_notify_start_0" [ style = bold] "imagestoreclone:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_pre_notify_stop_0 node2" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_start_0 node1" -> "imagestoreclone:0_monitor_20000 node1" [ style = bold] "imagestoreclone:0_start_0 node1" -> "imagestorecloneset_running_0" [ style = bold] "imagestoreclone:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_stop_0 node2" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node2" -> "imagestoreclone:0_start_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node2" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_monitor_20000 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_post_notify_start_0 node2" -> "imagestorecloneset_confirmed-post_notify_start_0" [ style = bold] "imagestoreclone:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_start_0 node2" -> "imagestoreclone:1_monitor_20000 node2" [ style = bold] "imagestoreclone:1_start_0 node2" -> "imagestorecloneset_running_0" [ style = bold] "imagestoreclone:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestorecloneset_confirmed-post_notify_start_0" -> "imagestoreclone:0_monitor_20000 node1" [ style = bold] "imagestorecloneset_confirmed-post_notify_start_0" -> "imagestoreclone:1_monitor_20000 node2" [ style = bold] "imagestorecloneset_confirmed-post_notify_start_0" -> "sles10_start_0 node1" [ style = bold] "imagestorecloneset_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] -"imagestorecloneset_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stop_0" -> "imagestorecloneset_pre_notify_start_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stop_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_start_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_post_notify_start_0" -> "imagestoreclone:0_post_notify_start_0 node1" [ style = bold] "imagestorecloneset_post_notify_start_0" -> "imagestoreclone:1_post_notify_start_0 node2" [ style = bold] "imagestorecloneset_post_notify_start_0" -> "imagestorecloneset_confirmed-post_notify_start_0" [ style = bold] "imagestorecloneset_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_post_notify_stop_0" -> "imagestorecloneset_confirmed-post_notify_stop_0" [ style = bold] "imagestorecloneset_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_pre_notify_start_0" -> "imagestorecloneset_confirmed-pre_notify_start_0" [ style = bold] "imagestorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_pre_notify_stop_0" -> "imagestoreclone:0_pre_notify_stop_0 node2" [ style = bold] "imagestorecloneset_pre_notify_stop_0" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestorecloneset_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_running_0" -> "imagestorecloneset_post_notify_start_0" [ style = bold] "imagestorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_start_0" -> "imagestoreclone:0_start_0 node1" [ style = bold] "imagestorecloneset_start_0" -> "imagestoreclone:1_start_0 node2" [ style = bold] "imagestorecloneset_start_0" -> "imagestorecloneset_running_0" [ style = bold] "imagestorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stop_0" -> "imagestoreclone:0_stop_0 node2" [ style = bold] "imagestorecloneset_stop_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_stop_0" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stopped_0" -> "imagestorecloneset_post_notify_stop_0" [ style = bold] "imagestorecloneset_stopped_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_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" -> "configstorecloneset_start_0" [ style = bold] "probe_complete" -> "evmscloneset_start_0" [ style = bold] "probe_complete" -> "evmsdcloneset_start_0" [ style = bold] "probe_complete" -> "imagestorecloneset_start_0" [ style = bold] "probe_complete" -> "sles10_start_0 node1" [ style = bold] "probe_complete" -> "stonithcloneset_start_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "sles10_monitor_0 node1" -> "probe_complete node1" [ style = bold] "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold] "sles10_start_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_stop_0 node2" -> "all_stopped" [ style = bold] "sles10_stop_0 node2" -> "imagestorecloneset_stop_0" [ style = bold] "sles10_stop_0 node2" -> "sles10_start_0 node1" [ style = bold] "sles10_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "stonithclone:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "stonithclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_start_0 node1" -> "stonithclone:1_monitor_5000 node1" [ style = bold] "stonithclone:1_start_0 node1" -> "stonithcloneset_running_0" [ style = bold] "stonithclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithcloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "stonithcloneset_start_0" -> "stonithclone:1_start_0 node1" [ style = bold] "stonithcloneset_start_0" -> "stonithcloneset_running_0" [ style = bold] "stonithcloneset_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/novell-252693-3.exp b/crm/pengine/testcases/novell-252693-3.exp index 5656bc2d69..5da747eb6a 100644 --- a/crm/pengine/testcases/novell-252693-3.exp +++ b/crm/pengine/testcases/novell-252693-3.exp @@ -1,845 +1,842 @@ - - - diff --git a/crm/pengine/testcases/novell-252693.dot b/crm/pengine/testcases/novell-252693.dot index 435f65e791..2cce314071 100644 --- a/crm/pengine/testcases/novell-252693.dot +++ b/crm/pengine/testcases/novell-252693.dot @@ -1,112 +1,107 @@ digraph "g" { "all_stopped" -> "stonithclone:1_stop_0 node1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_post_notify_stop_0 node2" -> "configstorecloneset_confirmed-post_notify_stop_0" [ style = bold] "configstoreclone:0_post_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_stop_0 node2" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_pre_notify_stop_0 node1" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:1_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:1_stop_0 node1" -> "configstorecloneset_stopped_0" [ style = bold] "configstoreclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "configstoreclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"configstorecloneset_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "configstorecloneset_confirmed-post_notify_stop_0" -> "evmscloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_stop_0" -> "configstorecloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_post_notify_stop_0" -> "configstoreclone:0_post_notify_stop_0 node2" [ style = bold] "configstorecloneset_post_notify_stop_0" -> "configstorecloneset_confirmed-post_notify_stop_0" [ style = bold] "configstorecloneset_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_pre_notify_stop_0" -> "configstoreclone:0_pre_notify_stop_0 node2" [ style = bold] "configstorecloneset_pre_notify_stop_0" -> "configstoreclone:1_pre_notify_stop_0 node1" [ style = bold] "configstorecloneset_pre_notify_stop_0" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstorecloneset_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_stop_0" -> "configstoreclone:1_stop_0 node1" [ style = bold] "configstorecloneset_stop_0" -> "configstorecloneset_stopped_0" [ style = bold] "configstorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_stopped_0" -> "configstorecloneset_post_notify_stop_0" [ style = bold] "configstorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "do_shutdown node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_post_notify_stop_0 node2" -> "evmscloneset_confirmed-post_notify_stop_0" [ style = bold] "evmsclone:0_post_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_pre_notify_stop_0 node2" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_pre_notify_stop_0 node1" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:1_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "evmsclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "evmsclone:1_stop_0 node1" -> "evmscloneset_stopped_0" [ style = bold] "evmsclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"evmscloneset_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "evmscloneset_confirmed-post_notify_stop_0" -> "evmsdcloneset_stop_0" [ style = bold] "evmscloneset_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_stop_0" [ style = bold] "evmscloneset_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_post_notify_stop_0" -> "evmsclone:0_post_notify_stop_0 node2" [ style = bold] "evmscloneset_post_notify_stop_0" -> "evmscloneset_confirmed-post_notify_stop_0" [ style = bold] "evmscloneset_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_pre_notify_stop_0" -> "evmsclone:0_pre_notify_stop_0 node2" [ style = bold] "evmscloneset_pre_notify_stop_0" -> "evmsclone:1_pre_notify_stop_0 node1" [ style = bold] "evmscloneset_pre_notify_stop_0" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmscloneset_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_stop_0" -> "evmsclone:1_stop_0 node1" [ style = bold] "evmscloneset_stop_0" -> "evmscloneset_stopped_0" [ style = bold] "evmscloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_stopped_0" -> "evmscloneset_post_notify_stop_0" [ style = bold] "evmscloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmsdclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "evmsdclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "evmsdclone:1_stop_0 node1" -> "evmsdcloneset_stopped_0" [ style = bold] "evmsdclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdcloneset_stop_0" -> "evmsdclone:1_stop_0 node1" [ style = bold] "evmsdcloneset_stop_0" -> "evmsdcloneset_stopped_0" [ style = bold] "evmsdcloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] -"evmsdcloneset_stopped_0" -> "all_stopped" [ style = bold] "evmsdcloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestoreclone:0_post_notify_stop_0 node2" -> "imagestorecloneset_confirmed-post_notify_stop_0" [ style = bold] "imagestoreclone:0_post_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_pre_notify_stop_0 node2" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_pre_notify_stop_0 node1" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:1_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "imagestoreclone:1_stop_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"imagestorecloneset_confirmed-post_notify_stop_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stop_0" -> "evmscloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_post_notify_stop_0" -> "imagestoreclone:0_post_notify_stop_0 node2" [ style = bold] "imagestorecloneset_post_notify_stop_0" -> "imagestorecloneset_confirmed-post_notify_stop_0" [ style = bold] "imagestorecloneset_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_pre_notify_stop_0" -> "imagestoreclone:0_pre_notify_stop_0 node2" [ style = bold] "imagestorecloneset_pre_notify_stop_0" -> "imagestoreclone:1_pre_notify_stop_0 node1" [ style = bold] "imagestorecloneset_pre_notify_stop_0" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestorecloneset_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stop_0" -> "imagestoreclone:1_stop_0 node1" [ style = bold] "imagestorecloneset_stop_0" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stopped_0" -> "imagestorecloneset_post_notify_stop_0" [ style = bold] "imagestorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "sles10_migrate_from_0 node2" -> "sles10_monitor_10000 node2" [ style = bold] "sles10_migrate_from_0 node2" [ style=bold color="green" fontcolor="black" ] "sles10_migrate_to_0 node1" -> "all_stopped" [ style = bold] "sles10_migrate_to_0 node1" -> "configstorecloneset_stop_0" [ style = bold] "sles10_migrate_to_0 node1" -> "do_shutdown node1" [ style = bold] "sles10_migrate_to_0 node1" -> "imagestorecloneset_stop_0" [ style = bold] "sles10_migrate_to_0 node1" -> "sles10_migrate_from_0 node2" [ style = bold] "sles10_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_10000 node2" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "stonithclone:1_stop_0 node1" -> "stonithcloneset_stopped_0" [ style = bold] "stonithclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithcloneset_stop_0" -> "stonithclone:1_stop_0 node1" [ style = bold] "stonithcloneset_stop_0" -> "stonithcloneset_stopped_0" [ style = bold] "stonithcloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] -"stonithcloneset_stopped_0" -> "all_stopped" [ style = bold] "stonithcloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/novell-252693.exp b/crm/pengine/testcases/novell-252693.exp index d6336c45ad..32748e0d0f 100644 --- a/crm/pengine/testcases/novell-252693.exp +++ b/crm/pengine/testcases/novell-252693.exp @@ -1,591 +1,576 @@ - - - - - - - - - - - - - - - diff --git a/crm/pengine/testcases/rec-node-11.dot b/crm/pengine/testcases/rec-node-11.dot index 36422c7828..783d4fa0a4 100644 --- a/crm/pengine/testcases/rec-node-11.dot +++ b/crm/pengine/testcases/rec-node-11.dot @@ -1,52 +1,50 @@ 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" [ style=bold color="green" fontcolor="orange" ] -"group1_stop_0" -> "all_stopped" [ style = bold] "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" -> "rsc3_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"group1_stopped_0" -> "all_stopped" [ style = bold] "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" [ 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/crm/pengine/testcases/rec-node-11.exp b/crm/pengine/testcases/rec-node-11.exp index f1690bc289..d67f895803 100644 --- a/crm/pengine/testcases/rec-node-11.exp +++ b/crm/pengine/testcases/rec-node-11.exp @@ -1,257 +1,251 @@ - - - - - - diff --git a/crm/pengine/testcases/rec-node-13.dot b/crm/pengine/testcases/rec-node-13.dot index 2ced0af4f2..e99124bdb5 100644 --- a/crm/pengine/testcases/rec-node-13.dot +++ b/crm/pengine/testcases/rec-node-13.dot @@ -1,16 +1,15 @@ digraph "g" { "all_stopped" [ 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:6_stop_0 c001n04" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"master_rsc_1_stopped_0" -> "all_stopped" [ style = bold] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:6_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" [ style=bold color="green" fontcolor="orange" ] "stonith c001n04" -> "all_stopped" [ style = bold] "stonith c001n04" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold] "stonith c001n04" [ style=bold color="green" fontcolor="black" ] "stonith_up" -> "stonith c001n04" [ style = bold] "stonith_up" [ style=bold color="green" fontcolor="orange" ] } diff --git a/crm/pengine/testcases/rec-node-13.exp b/crm/pengine/testcases/rec-node-13.exp index 710bbea390..05a35ac351 100644 --- a/crm/pengine/testcases/rec-node-13.exp +++ b/crm/pengine/testcases/rec-node-13.exp @@ -1,79 +1,76 @@ - - - diff --git a/crm/pengine/testcases/rec-node-15.dot b/crm/pengine/testcases/rec-node-15.dot index 292881cbe8..dcb9d3a6ef 100644 --- a/crm/pengine/testcases/rec-node-15.dot +++ b/crm/pengine/testcases/rec-node-15.dot @@ -1,85 +1,83 @@ 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" -> "IPaddr_192_168_1_102_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" -> "all_stopped" [ 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" -> "all_stopped" [ style = bold] "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" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "oracle_running_0" [ 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/crm/pengine/testcases/rec-node-15.exp b/crm/pengine/testcases/rec-node-15.exp index 78041d16df..fa0215e261 100644 --- a/crm/pengine/testcases/rec-node-15.exp +++ b/crm/pengine/testcases/rec-node-15.exp @@ -1,436 +1,430 @@ - - - - - - diff --git a/crm/pengine/testcases/rec-rsc-9.dot b/crm/pengine/testcases/rec-rsc-9.dot index 4ab7603a7f..0fe72ce6cd 100644 --- a/crm/pengine/testcases/rec-rsc-9.dot +++ b/crm/pengine/testcases/rec-rsc-9.dot @@ -1,49 +1,45 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "bar_running_0" -> "foo_start_0" [ style = bold] "bar_running_0" -> "rsc1_start_0 node1" [ style = bold] "bar_running_0" [ style=bold color="green" fontcolor="orange" ] "bar_start_0" -> "bar_running_0" [ style = bold] "bar_start_0" -> "foo_start_0" [ style = bold] "bar_start_0" -> "rsc1_start_0 node1" [ style = bold] "bar_start_0" -> "rsc3_start_0 node1" [ style = bold] "bar_start_0" [ style=bold color="green" fontcolor="orange" ] -"bar_stop_0" -> "all_stopped" [ style = bold] "bar_stop_0" -> "bar_start_0" [ style = bold] "bar_stop_0" -> "bar_stopped_0" [ style = bold] "bar_stop_0" -> "rsc3_stop_0 node1" [ style = bold] "bar_stop_0" [ style=bold color="green" fontcolor="orange" ] -"bar_stopped_0" -> "all_stopped" [ style = bold] "bar_stopped_0" -> "bar_start_0" [ style = bold] "bar_stopped_0" [ style=bold color="green" fontcolor="orange" ] "foo_start_0" -> "rsc2_start_0 node1" [ style = bold] "foo_start_0" [ style=bold color="green" fontcolor="orange" ] -"foo_stop_0" -> "all_stopped" [ style = bold] "foo_stop_0" -> "bar_stop_0" [ style = bold] "foo_stop_0" -> "foo_start_0" [ style = bold] "foo_stop_0" -> "foo_stopped_0" [ style = bold] "foo_stop_0" -> "rsc2_stop_0 node1" [ style = bold] "foo_stop_0" [ style=bold color="green" fontcolor="orange" ] -"foo_stopped_0" -> "all_stopped" [ style = bold] "foo_stopped_0" -> "bar_stop_0" [ style = bold] "foo_stopped_0" -> "foo_start_0" [ style = bold] "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "bar_stop_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "bar_stop_0" [ style = bold] "rsc2_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node1" -> "bar_running_0" [ style = bold] "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/crm/pengine/testcases/rec-rsc-9.exp b/crm/pengine/testcases/rec-rsc-9.exp index 5cebd33f40..c5fc5334f7 100644 --- a/crm/pengine/testcases/rec-rsc-9.exp +++ b/crm/pengine/testcases/rec-rsc-9.exp @@ -1,237 +1,225 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/standby.dot b/crm/pengine/testcases/standby.dot index 5fd60a067c..e1a8bdb329 100644 --- a/crm/pengine/testcases/standby.dot +++ b/crm/pengine/testcases/standby.dot @@ -1,109 +1,105 @@ 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" -> "IPaddr_192_168_1_102_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" -> "all_stopped" [ 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" -> "all_stopped" [ style = bold] "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" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] "oracle_start_0" -> "oracle_running_0" [ 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" -> "all_stopped" [ 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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/standby.exp b/crm/pengine/testcases/standby.exp index 8d9569e921..bc78613d42 100644 --- a/crm/pengine/testcases/standby.exp +++ b/crm/pengine/testcases/standby.exp @@ -1,544 +1,532 @@ - - - - - - - - - - - - diff --git a/crm/pengine/testcases/stonith-0.dot b/crm/pengine/testcases/stonith-0.dot index 6594983025..dbf40ae645 100644 --- a/crm/pengine/testcases/stonith-0.dot +++ b/crm/pengine/testcases/stonith-0.dot @@ -1,85 +1,83 @@ 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" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] -"group-1_stop_0" -> "all_stopped" [ 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" -> "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" -> "all_stopped" [ style = bold] "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/crm/pengine/testcases/stonith-0.exp b/crm/pengine/testcases/stonith-0.exp index acf6811f57..65825040a0 100644 --- a/crm/pengine/testcases/stonith-0.exp +++ b/crm/pengine/testcases/stonith-0.exp @@ -1,416 +1,410 @@ - - - - - -