diff --git a/crm/pengine/complex.c b/crm/pengine/complex.c index 6915aa0a6e..53539f1586 100644 --- a/crm/pengine/complex.c +++ b/crm/pengine/complex.c @@ -1,508 +1,510 @@ -/* $Id: complex.c,v 1.65 2005/09/30 13:01:15 andrew Exp $ */ +/* $Id: complex.c,v 1.66 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 gboolean update_node_weight(rsc_to_node_t *cons,const char *id,GListPtr nodes); gboolean is_active(rsc_to_node_t *cons); gboolean constraint_violated( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint); void order_actions(action_t *lh, action_t *rh, order_constraint_t *order); extern gboolean rsc_colocation_new(const char *id, enum con_strength strength, resource_t *rsc_lh, resource_t *rsc_rh); rsc_to_node_t *generate_location_rule( resource_t *rsc, crm_data_t *location_rule, pe_working_set_t *data_set); void populate_hash(crm_data_t *nvpair_list, GHashTable *hash, const char **attrs, int attrs_length); resource_object_functions_t resource_class_functions[] = { { native_unpack, native_find_child, native_num_allowed_nodes, native_color, native_create_actions, native_create_probe, native_internal_constraints, native_agent_constraints, native_rsc_colocation_lh, native_rsc_colocation_rh, native_rsc_order_lh, native_rsc_order_rh, native_rsc_location, native_expand, native_print, native_active, native_resource_state, native_create_notify_element, native_free }, { group_unpack, group_find_child, group_num_allowed_nodes, group_color, group_create_actions, group_create_probe, group_internal_constraints, group_agent_constraints, group_rsc_colocation_lh, group_rsc_colocation_rh, group_rsc_order_lh, group_rsc_order_rh, group_rsc_location, group_expand, group_print, group_active, group_resource_state, group_create_notify_element, group_free }, { clone_unpack, clone_find_child, clone_num_allowed_nodes, clone_color, clone_create_actions, clone_create_probe, clone_internal_constraints, clone_agent_constraints, clone_rsc_colocation_lh, clone_rsc_colocation_rh, clone_rsc_order_lh, clone_rsc_order_rh, clone_rsc_location, clone_expand, clone_print, clone_active, clone_resource_state, clone_create_notify_element, clone_free }, { master_unpack, clone_find_child, clone_num_allowed_nodes, clone_color, master_create_actions, clone_create_probe, master_internal_constraints, clone_agent_constraints, clone_rsc_colocation_lh, clone_rsc_colocation_rh, clone_rsc_order_lh, clone_rsc_order_rh, clone_rsc_location, clone_expand, clone_print, clone_active, clone_resource_state, clone_create_notify_element, clone_free } }; /* resource_object_functions_t resource_variants[] = resource_class_functions; */ int get_resource_type(const char *name) { if(safe_str_eq(name, XML_CIB_TAG_RESOURCE)) { return pe_native; } else if(safe_str_eq(name, XML_CIB_TAG_GROUP)) { return pe_group; } else if(safe_str_eq(name, XML_CIB_TAG_INCARNATION)) { return pe_clone; } else if(safe_str_eq(name, XML_CIB_TAG_MASTER)) { return pe_master; } return pe_unknown; } gboolean is_active(rsc_to_node_t *cons) { /* todo: check constraint lifetime */ return TRUE; } static void dup_attr(gpointer key, gpointer value, gpointer user_data) { add_hash_param(user_data, key, value); } gboolean common_unpack(crm_data_t * xml_obj, resource_t **rsc, GHashTable *defaults, pe_working_set_t *data_set) { int lpc = 0; const char *id = crm_element_value(xml_obj, XML_ATTR_ID); const char *value = NULL; const char *allowed_attrs[] = { XML_CIB_ATTR_PRIORITY, XML_RSC_ATTR_INCARNATION_MAX, XML_RSC_ATTR_INCARNATION_NODEMAX, XML_RSC_ATTR_MASTER_MAX, XML_RSC_ATTR_MASTER_NODEMAX, "resource_stickiness" }; const char *rsc_attrs[] = { XML_RSC_ATTR_STOPFAIL, XML_RSC_ATTR_RESTART, "resource_stickiness", "multiple_active", "start_prereq", "is_managed", "notify" }; crm_log_xml_debug_3(xml_obj, "Processing resource input..."); if(id == NULL) { pe_err("Must specify id tag in "); return FALSE; } else if(rsc == NULL) { pe_err("Nowhere to unpack resource into"); return FALSE; } crm_malloc0(*rsc, sizeof(resource_t)); if(*rsc == NULL) { return FALSE; } (*rsc)->id = id; (*rsc)->xml = xml_obj; (*rsc)->ops_xml = find_xml_node(xml_obj, "operations", FALSE); (*rsc)->variant = get_resource_type(crm_element_name(xml_obj)); if((*rsc)->variant == pe_unknown) { pe_err("Unknown resource type: %s", crm_element_name(xml_obj)); crm_free(*rsc); return FALSE; } (*rsc)->fns = &resource_class_functions[(*rsc)->variant]; crm_debug_3("Unpacking resource..."); (*rsc)->parameters = g_hash_table_new_full( g_str_hash,g_str_equal, g_hash_destroy_str,g_hash_destroy_str); for(lpc = 0; lpc < DIMOF(rsc_attrs); lpc++) { value = crm_element_value(xml_obj, rsc_attrs[lpc]); if(value != NULL) { add_hash_param( (*rsc)->parameters, rsc_attrs[lpc], value); } } unpack_instance_attributes( xml_obj, XML_TAG_ATTR_SETS, NULL, (*rsc)->parameters, allowed_attrs, DIMOF(allowed_attrs), data_set); if(defaults != NULL) { g_hash_table_foreach(defaults, dup_attr, (*rsc)->parameters); } (*rsc)->runnable = TRUE; (*rsc)->provisional = TRUE; (*rsc)->starting = FALSE; (*rsc)->stopping = FALSE; + (*rsc)->parent = NULL; (*rsc)->candidate_colors = NULL; (*rsc)->rsc_cons = NULL; (*rsc)->actions = NULL; - (*rsc)->is_managed = data_set->is_managed_default; (*rsc)->failed = FALSE; (*rsc)->start_pending = FALSE; (*rsc)->role = RSC_ROLE_STOPPED; (*rsc)->next_role = RSC_ROLE_UNKNOWN; + (*rsc)->is_managed = data_set->is_managed_default; (*rsc)->recovery_type = recovery_stop_start; (*rsc)->stickiness = data_set->default_resource_stickiness; value = g_hash_table_lookup((*rsc)->parameters, XML_CIB_ATTR_PRIORITY); (*rsc)->priority = atoi(value?value:"0"); (*rsc)->effective_priority = (*rsc)->priority; value = g_hash_table_lookup((*rsc)->parameters, "notify"); (*rsc)->notify = crm_is_true(value); value = g_hash_table_lookup((*rsc)->parameters, "is_managed"); if(value != NULL) { cl_str_to_boolean(value, &((*rsc)->is_managed)); } if((*rsc)->is_managed == FALSE) { crm_warn("Resource %s is currently not managed", (*rsc)->id); } else if(data_set->symmetric_cluster) { rsc_to_node_t *new_con = rsc2node_new( "symmetric_default", *rsc, 0, NULL, data_set); new_con->node_list_rh = node_list_dup(data_set->nodes, FALSE); } crm_debug_2("Options for %s", id); value = g_hash_table_lookup((*rsc)->parameters, XML_RSC_ATTR_RESTART); if(safe_str_eq(value, "restart")) { (*rsc)->restart_type = pe_restart_restart; crm_debug_2("\tDependancy restart handling: restart"); } else { (*rsc)->restart_type = pe_restart_ignore; crm_debug_2("\tDependancy restart handling: ignore"); } value = g_hash_table_lookup((*rsc)->parameters, "multiple_active"); if(safe_str_eq(value, "stop_only")) { (*rsc)->recovery_type = recovery_stop_only; crm_debug_2("\tMultiple running resource recovery: stop only"); } else if(safe_str_eq(value, "block")) { (*rsc)->recovery_type = recovery_block; crm_debug_2("\tMultiple running resource recovery: block"); } else { (*rsc)->recovery_type = recovery_stop_start; crm_debug_2("\tMultiple running resource recovery: stop/start"); } value = g_hash_table_lookup((*rsc)->parameters, "resource_stickiness"); if(value != NULL) { (*rsc)->stickiness = char2score(value); } if((*rsc)->stickiness > 0) { crm_debug_2("\tPlacement: prefer current location%s", value == NULL?" (default)":""); } else if((*rsc)->stickiness < 0) { crm_warn("\tPlacement: always move from the current location%s", value == NULL?" (default)":""); } else { crm_debug_2("\tPlacement: optimal%s", value == NULL?" (default)":""); } crm_debug_2("\tNotification of start/stop actions: %s", (*rsc)->notify?"required":"not required"); /* data_set->resources = g_list_append(data_set->resources, (*rsc)); */ (*rsc)->fns->unpack(*rsc, data_set); return TRUE; } void order_actions(action_t *lh_action, action_t *rh_action, order_constraint_t *order) { action_wrapper_t *wrapper = NULL; GListPtr list = NULL; crm_debug_2("Ordering %d: Action %d before %d", order?order->id:-1, lh_action->id, rh_action->id); log_action(LOG_DEBUG_4, "LH (order_actions)", lh_action, FALSE); log_action(LOG_DEBUG_4, "RH (order_actions)", rh_action, FALSE); crm_malloc0(wrapper, sizeof(action_wrapper_t)); if(wrapper != NULL) { wrapper->action = rh_action; wrapper->type = order->type; list = lh_action->actions_after; list = g_list_append(list, wrapper); lh_action->actions_after = list; wrapper = NULL; } if(order->type != pe_ordering_recover) { crm_malloc0(wrapper, sizeof(action_wrapper_t)); if(wrapper != NULL) { wrapper->action = lh_action; wrapper->type = order->type; list = rh_action->actions_before; list = g_list_append(list, wrapper); rh_action->actions_before = list; } } } void common_free(resource_t *rsc) { if(rsc == NULL) { return; } crm_debug_5("Freeing %s", rsc->id); while(rsc->rsc_cons) { pe_free_rsc_colocation( (rsc_colocation_t*)rsc->rsc_cons->data); rsc->rsc_cons = rsc->rsc_cons->next; } if(rsc->rsc_cons != NULL) { g_list_free(rsc->rsc_cons); } if(rsc->parameters != NULL) { g_hash_table_destroy(rsc->parameters); } if(rsc->orphan) { free_xml(rsc->xml); } pe_free_shallow_adv(rsc->candidate_colors, TRUE); pe_free_shallow_adv(rsc->rsc_location, FALSE); + pe_free_shallow_adv(rsc->allowed_nodes, TRUE); crm_free(rsc->variant_opaque); crm_free(rsc); crm_debug_5("Resource freed"); } void unpack_instance_attributes( crm_data_t *xml_obj, const char *set_name, node_t *node, GHashTable *hash, const char **attrs, int attrs_length, pe_working_set_t *data_set) { crm_data_t *attributes = NULL; if(xml_obj == NULL) { crm_debug_4("No instance attributes"); return; } if(attrs != NULL && attrs[0] == NULL) { /* none allowed */ crm_debug_2("No instance attributes allowed"); return; } crm_debug_2("Checking for attributes"); xml_child_iter( xml_obj, attr_set, set_name, /* check any rules */ if(test_ruleset(attr_set, node, data_set) == FALSE) { continue; } crm_debug_2("Adding attributes"); attributes = cl_get_struct(attr_set, XML_TAG_ATTRS); if(attributes == NULL) { pe_err("%s with no %s child", set_name, XML_TAG_ATTRS); } else { populate_hash(attributes, hash, attrs, attrs_length); } ); } void populate_hash(crm_data_t *nvpair_list, GHashTable *hash, const char **attrs, int attrs_length) { int lpc = 0; gboolean set_attr = FALSE; const char *name = NULL; const char *value = NULL; xml_child_iter( nvpair_list, an_attr, XML_CIB_TAG_NVPAIR, name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME); set_attr = TRUE; if(attrs != NULL) { set_attr = FALSE; } for(lpc = 0; set_attr == FALSE && lpc < attrs_length && attrs[lpc] != NULL; lpc++) { if(safe_str_eq(name, attrs[lpc])) { set_attr = TRUE; } } if(set_attr) { crm_debug_4("Setting attribute: %s", name); value = crm_element_value( an_attr, XML_NVPAIR_ATTR_VALUE); add_hash_param(hash, name, value); } else { crm_debug_4("Skipping attribute: %s", name); } ); } void add_rsc_param(resource_t *rsc, const char *name, const char *value) { CRM_DEV_ASSERT(rsc != NULL); if(crm_assert_failed) { return; } add_hash_param(rsc->parameters, name, value); } void add_hash_param(GHashTable *hash, const char *name, const char *value) { CRM_DEV_ASSERT(hash != NULL); if(crm_assert_failed) { return; } crm_debug_3("adding: name=%s value=%s", crm_str(name), crm_str(value)); if(name == NULL || value == NULL) { return; } else if(g_hash_table_lookup(hash, name) == NULL) { g_hash_table_insert(hash, crm_strdup(name), crm_strdup(value)); } } const char * get_rsc_param(resource_t *rsc, const char *name) { CRM_DEV_ASSERT(rsc != NULL); if(crm_assert_failed) { return NULL; } return g_hash_table_lookup(rsc->parameters, name); } diff --git a/crm/pengine/incarnation.c b/crm/pengine/incarnation.c index ef565aa863..364fd16e04 100644 --- a/crm/pengine/incarnation.c +++ b/crm/pengine/incarnation.c @@ -1,1286 +1,1417 @@ -/* $Id: incarnation.c,v 1.56 2005/09/30 13:01:15 andrew Exp $ */ +/* $Id: incarnation.c,v 1.57 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 void clone_create_notifications( resource_t *rsc, action_t *action, action_t *action_complete, pe_working_set_t *data_set); extern gboolean rsc_colocation_new( const char *id, enum con_strength strength, resource_t *rsc_lh, resource_t *rsc_rh, const char *state_lh, const char *state_rh); typedef struct clone_variant_data_s { resource_t *self; int clone_max; - int clone_max_node; + int clone_node_max; int active_clones; int max_nodes; gboolean interleave; gboolean ordered; + gboolean gloabally_unique; + crm_data_t *xml_obj_child; + gboolean notify_confirm; GListPtr child_list; /* resource_t* */ } clone_variant_data_t; void child_stopping_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set); void child_starting_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set); #define get_clone_variant_data(data, rsc) \ CRM_ASSERT(rsc->variant == pe_clone || rsc->variant == pe_master); \ data = (clone_variant_data_t *)rsc->variant_opaque; + +static gboolean +create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set) +{ + resource_t *child_rsc = NULL; + crm_data_t * child_copy = NULL; + clone_variant_data_t *clone_data = NULL; + get_clone_variant_data(clone_data, rsc); + + CRM_DEV_ASSERT(clone_data->xml_obj_child != NULL); + child_copy = copy_xml(clone_data->xml_obj_child); + set_id(child_copy, rsc->id, sub_id); + + if(common_unpack(child_copy, &child_rsc, + clone_data->self->parameters, data_set)) { + char *inc_num = crm_itoa(sub_id); + char *inc_max = crm_itoa(clone_data->clone_max); + + crm_debug("Setting clone attributes for: %s", child_rsc->id); + clone_data->child_list = g_list_append( + clone_data->child_list, child_rsc); + + child_rsc->parent = rsc; + add_rsc_param( + child_rsc, XML_RSC_ATTR_INCARNATION, inc_num); + add_rsc_param( + child_rsc, XML_RSC_ATTR_INCARNATION_MAX, inc_max); + + crm_action_debug_3( + print_resource("Added", child_rsc, FALSE)); + + crm_free(inc_num); + crm_free(inc_max); + + } else { + pe_err("Failed unpacking resource %s", + crm_element_value(child_copy, XML_ATTR_ID)); + return FALSE; + } + + return TRUE; +} + void clone_unpack(resource_t *rsc, pe_working_set_t *data_set) { int lpc = 0; - crm_data_t * xml_obj_child = NULL; + crm_data_t * xml_tmp = NULL; crm_data_t * xml_obj = rsc->xml; crm_data_t * xml_self = create_xml_node(NULL, XML_CIB_TAG_RESOURCE); clone_variant_data_t *clone_data = NULL; resource_t *self = NULL; - char *inc_max = NULL; const char *ordered = crm_element_value(xml_obj, XML_RSC_ATTR_ORDERED); const char *interleave = crm_element_value(xml_obj, XML_RSC_ATTR_INTERLEAVE); const char *max_clones = get_rsc_param(rsc, XML_RSC_ATTR_INCARNATION_MAX); const char *max_clones_node = get_rsc_param(rsc, XML_RSC_ATTR_INCARNATION_NODEMAX); crm_debug_3("Processing resource %s...", rsc->id); crm_malloc0(clone_data, sizeof(clone_variant_data_t)); clone_data->child_list = NULL; clone_data->interleave = FALSE; clone_data->ordered = FALSE; - + clone_data->gloabally_unique = FALSE; + clone_data->active_clones = 0; + clone_data->xml_obj_child = NULL; clone_data->clone_max = crm_atoi(max_clones, "1"); - clone_data->clone_max_node = crm_atoi(max_clones_node,"1"); + clone_data->clone_node_max = crm_atoi(max_clones_node,"1"); /* this is a bit of a hack - but simplifies everything else */ copy_in_properties(xml_self, xml_obj); /* set_id(xml_self, "self", -1); */ - xml_obj_child = find_xml_node(xml_obj, "operations", FALSE); - if(xml_obj_child != NULL) { - add_node_copy(xml_self, xml_obj_child); + xml_tmp = find_xml_node(xml_obj, "operations", FALSE); + if(xml_tmp != NULL) { + add_node_copy(xml_self, xml_tmp); } - xml_obj_child = find_xml_node(xml_obj, XML_CIB_TAG_GROUP, FALSE); - if(xml_obj_child == NULL) { - xml_obj_child = find_xml_node( + clone_data->xml_obj_child = find_xml_node( + xml_obj, XML_CIB_TAG_GROUP, FALSE); + + if(clone_data->xml_obj_child == NULL) { + clone_data->xml_obj_child = find_xml_node( xml_obj, XML_CIB_TAG_RESOURCE, TRUE); } - CRM_DEV_ASSERT(xml_obj_child != NULL); + CRM_DEV_ASSERT(clone_data->xml_obj_child != NULL); if(crm_assert_failed) { return; } if(common_unpack(xml_self, &self, NULL, data_set)) { clone_data->self = self; } else { crm_log_xml_err(xml_self, "Couldnt unpack dummy child"); return; } if(crm_is_true(interleave)) { clone_data->interleave = TRUE; } if(crm_is_true(ordered)) { clone_data->ordered = TRUE; } -#if 0 - { - const char *confirm = crm_element_value( - xml_obj, "notify_confirm"); - clone_data->notify_confirm = crm_is_true(confirm); - } -#else - clone_data->notify_confirm = clone_data->self->notify; -#endif + clone_data->notify_confirm = clone_data->self->notify; - inc_max = crm_itoa(clone_data->clone_max); + rsc->variant_opaque = clone_data; + +/* clone_data->gloabally_unique && */ for(lpc = 0; lpc < clone_data->clone_max; lpc++) { - resource_t *child_rsc = NULL; - crm_data_t * child_copy = copy_xml(xml_obj_child); - - set_id(child_copy, rsc->id, lpc); - - if(common_unpack(child_copy, &child_rsc, - clone_data->self->parameters, data_set)) { - char *inc_num = crm_itoa(lpc); - - clone_data->child_list = g_list_append( - clone_data->child_list, child_rsc); - - add_rsc_param( - child_rsc, XML_RSC_ATTR_INCARNATION, inc_num); - add_rsc_param( - child_rsc, XML_RSC_ATTR_INCARNATION_MAX, inc_max); - - crm_action_debug_3( - print_resource("Added", child_rsc, FALSE)); - - crm_free(inc_num); - - } else { - pe_err("Failed unpacking resource %s", - crm_element_value(child_copy, XML_ATTR_ID)); - } + create_child_clone(rsc, lpc, data_set); } - crm_free(inc_max); crm_debug_3("Added %d children to resource %s...", clone_data->clone_max, rsc->id); - - rsc->variant_opaque = clone_data; } + resource_t * clone_find_child(resource_t *rsc, const char *id) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); return pe_find_resource(clone_data->child_list, id); } int clone_num_allowed_nodes(resource_t *rsc) { int num_nodes = 0; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); /* what *should* we return here? */ slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, int tmp_num_nodes = child_rsc->fns->num_allowed_nodes(child_rsc); if(tmp_num_nodes > num_nodes) { num_nodes = tmp_num_nodes; } ); return num_nodes; } +static gint sort_rsc_provisional(gconstpointer a, gconstpointer b) +{ + const resource_t *resource1 = (const resource_t*)a; + const resource_t *resource2 = (const resource_t*)b; + + CRM_ASSERT(resource1 != NULL); + CRM_ASSERT(resource2 != NULL); + + if(resource1->provisional == resource2->provisional) { + return 0; + + } else if(resource1->provisional) { + return 1; + + } else if(resource2->provisional) { + return -1; + } + CRM_DEV_ASSERT(FALSE); + return 0; +} + +static gboolean +can_run_resources(node_t *node) +{ + if(node->details->online == FALSE + || node->details->unclean + || node->details->standby) { + return FALSE; + } + return TRUE; +} + +static GListPtr +next_color(GListPtr head, GListPtr iter, int max) +{ + color_t *color = NULL; + GListPtr local_iter = iter; + crm_debug_4("Checking iter: %p", iter); + if(local_iter != NULL) { + local_iter = local_iter->next; + } + for(; local_iter != NULL; local_iter = local_iter->next) { + color = local_iter->data; + crm_debug_5("Color %d: %d", + color->details->id, color->details->num_resources); + if(color->details->num_resources < max) { + return local_iter; + } + } + + local_iter = head; + crm_debug_4("Now checking head: %p", head); + for(; local_iter != NULL; local_iter = local_iter->next) { + color = local_iter->data; + crm_debug_5("Color %d: %d", + color->details->id, color->details->num_resources); + if(color->details->num_resources < max) { + return local_iter; + } + } + + crm_debug_3("Nothing available: %p", head); + return NULL; +} + + color_t * clone_color(resource_t *rsc, pe_working_set_t *data_set) { - int lpc = 0, lpc2 = 0; - resource_t *child_0 = NULL; - resource_t *child_lh = NULL; - resource_t *child_rh = NULL; + GListPtr color_ptr = NULL; + GListPtr child_colors = NULL; + int local_node_max = 0; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); if(clone_data->self->provisional == FALSE) { return NULL; } + local_node_max = clone_data->clone_node_max; - child_0 = g_list_nth_data(clone_data->child_list, 0); - - clone_data->max_nodes = rsc->fns->num_allowed_nodes(rsc); + /* give already allocated resources every chance to run on the node + * specified. other resources can be moved/started where we want + * as required + */ + clone_data->child_list = g_list_sort( + clone_data->child_list, sort_rsc_provisional); - /* generate up to max_nodes * clone_node_max constraints */ - lpc = 0; - clone_data->active_clones = clone_data->max_nodes * clone_data->clone_max_node; - if(clone_data->active_clones > clone_data->clone_max) { - clone_data->active_clones = clone_data->clone_max; - } - crm_info("Distributing %d (of %d) %s clones over %d nodes", - clone_data->active_clones, clone_data->clone_max, - rsc->id, clone_data->max_nodes); - - if(clone_data->self->is_managed) { - for(; lpc < clone_data->active_clones && lpc < clone_data->max_nodes; lpc++) { - child_lh = g_list_nth_data(clone_data->child_list, lpc); - for(lpc2 = lpc + 1; lpc2 < clone_data->active_clones; lpc2++) { - child_rh = g_list_nth_data(clone_data->child_list,lpc2); - - if(lpc2 < clone_data->max_nodes) { - crm_debug_2("Clone %d will not run with %d", - lpc, lpc2); - rsc_colocation_new( - "__clone_internal_must_not__", - pecs_must_not, child_lh, child_rh, NULL, NULL); - - } else if((lpc2 % clone_data->max_nodes) == lpc) { - crm_debug_2("Clone %d can run with %d", - lpc, lpc2); - rsc_colocation_new( - "__clone_internal_must__", - pecs_must, child_lh, child_rh, NULL, NULL); - } - } - for(; lpc2 < clone_data->clone_max; lpc2++) { - child_rh = g_list_nth_data(clone_data->child_list,lpc2); - crm_debug_2("Unrunnable: Clone %d will not run with %d", - lpc2, lpc); - rsc_colocation_new("__clone_internal_must_not__", - pecs_must_not, child_lh, child_rh, NULL, NULL); - } - + crm_debug("Coloring children of: %s", rsc->id); + + if(rsc->stickiness <= 0) { + while(local_node_max > 1 + && clone_data->max_nodes * (local_node_max -1) + >= clone_data->clone_max) { + local_node_max--; + crm_debug("Dropped the effective value of" + " clone_node_max to: %d", + local_node_max); } } - slist_iter( - child_rsc, resource_t, clone_data->child_list, lpc, - color_t *child_color = NULL; - if(lpc >= clone_data->active_clones) { - crm_warn("Clone %s cannot be started", child_rsc->id); - } - child_color = child_rsc->fns->color(child_rsc, data_set); - CRM_DEV_ASSERT(child_color != NULL); - native_assign_color(rsc, child_color); + clone_data->self->allowed_nodes = g_list_sort( + clone_data->self->allowed_nodes, sort_node_weight); + + slist_iter(a_node, node_t, clone_data->self->allowed_nodes, lpc, + color_t *new_color = NULL; + if(can_run_resources(a_node) == FALSE) { + crm_debug("Node cant run resources: %s", + a_node->details->uname); + continue; + } + crm_debug_3("Processing node %s for: %s", + a_node->details->uname, rsc->id); + + new_color = create_color(data_set, NULL, NULL); + new_color->details->candidate_nodes = g_list_append( + NULL, node_copy(a_node)); + + slist_iter(child, resource_t, clone_data->child_list, lpc2, + node_t *current = NULL; + if(child->provisional == FALSE) { + CRM_DEV_ASSERT(child->color != NULL); + current = child->color->details->chosen_node; + } else if(child->running_on != NULL) { + current = child->running_on->data; + } + + if(current == NULL) { + crm_debug("Not active: %s", child->id); + continue; + + } else if(current->details != a_node->details) { + crm_debug_2("Wrong node: %s", child->id); + continue; + + } else if(child->provisional == FALSE) { + /* make sure it shows up */ + native_assign_color(child, new_color); + crm_debug("Previously colored: %s", + child->id); + + continue; + + } else if(g_list_length(child->running_on) != 1) { + crm_debug("active != 1: %s", child->id); + + continue; + + } else if(new_color->details->num_resources + >= local_node_max) { + crm_warn("Node %s too full for: %s", + a_node->details->uname, + child->id); + continue; + } + + native_assign_color(child, new_color); + + ); + native_assign_color(rsc, new_color); + child_colors = g_list_append(child_colors, new_color); + ); + + + while(local_node_max > 1 + && clone_data->max_nodes * (local_node_max -1) + >= clone_data->clone_max) { + local_node_max--; + crm_debug("Dropped the effective value of clone_node_max to: %d", + local_node_max); + } + + /* allocate the rest */ + slist_iter(child, resource_t, clone_data->child_list, lpc2, + if(child->provisional == FALSE) { + continue; + } + crm_debug_2("Processing unalloc'd resource: %s", child->id); + color_ptr = next_color( + child_colors, color_ptr, local_node_max); + if(color_ptr == NULL) { + native_assign_color(child, data_set->no_color); + } else { + native_assign_color(child, color_ptr->data); + } ); clone_data->self->provisional = FALSE; return NULL; } static void clone_update_pseudo_status( resource_t *child, gboolean *stopping, gboolean *starting) { CRM_ASSERT(stopping != NULL); CRM_ASSERT(starting != NULL); slist_iter( action, action_t, child->actions, lpc, if(*starting && *stopping) { return; } else if(action->optional) { continue; } else if(safe_str_eq(CRMD_ACTION_STOP, action->task)) { *stopping = TRUE; } else if(safe_str_eq(CRMD_ACTION_START, action->task)) { *starting = TRUE; } ); } void clone_create_actions(resource_t *rsc, pe_working_set_t *data_set) { gboolean child_starting = FALSE; gboolean child_stopping = FALSE; action_t *action = NULL; action_t *action_complete = NULL; resource_t *last_start_rsc = NULL; resource_t *last_stop_rsc = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, child_rsc->fns->create_actions(child_rsc, data_set); clone_update_pseudo_status( child_rsc, &child_stopping, &child_starting); if(child_rsc->starting) { last_start_rsc = child_rsc; } if(child_rsc->stopping) { last_stop_rsc = child_rsc; } ); /* start */ action = start_action(clone_data->self, NULL, !child_starting); action_complete = custom_action( clone_data->self, started_key(rsc), CRMD_ACTION_STARTED, NULL, !child_starting, TRUE, data_set); action->pseudo = TRUE; action_complete->pseudo = TRUE; child_starting_constraints(clone_data, pe_ordering_optional, NULL, last_start_rsc, data_set); clone_create_notifications(rsc, action, action_complete, data_set); /* stop */ action = stop_action(clone_data->self, NULL, !child_stopping); action_complete = custom_action( clone_data->self, stopped_key(rsc), CRMD_ACTION_STOPPED, NULL, !child_stopping, TRUE, data_set); action->pseudo = TRUE; action_complete->pseudo = TRUE; child_stopping_constraints(clone_data, pe_ordering_optional, NULL, last_stop_rsc, data_set); clone_create_notifications(rsc, action, action_complete, data_set); } void clone_create_notifications( resource_t *rsc, action_t *action, action_t *action_complete, pe_working_set_t *data_set) { /* * pre_notify -> pre_notify_complete -> pseudo_action * -> (real actions) -> pseudo_action_complete * -> post_notify -> post_notify_complete * * if the pre_noitfy requires confirmation, * then a list of confirmations will be added as triggers * to pseudo_action in clone_expand() */ action_t *notify = NULL; action_t *notify_complete = NULL; enum action_tasks task; char *notify_key = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); if(rsc->notify == FALSE) { return; } task = text2task(action->task); /* create pre_notify */ notify_key = generate_notify_key( clone_data->self->id, "pre", action->task); notify = custom_action(clone_data->self, notify_key, CRMD_ACTION_NOTIFY, NULL, action->optional, TRUE, data_set); add_hash_param(notify->extra, "notify_type", "pre"); add_hash_param(notify->extra, "notify_operation", action->task); if(clone_data->notify_confirm) { add_hash_param(notify->extra, "notify_confirm", "yes"); } else { add_hash_param(notify->extra, "notify_confirm", "no"); } notify->pseudo = TRUE; /* create pre_notify_complete */ notify_key = generate_notify_key( clone_data->self->id, "confirmed-pre", action->task); notify_complete = custom_action(clone_data->self, notify_key, CRMD_ACTION_NOTIFIED, NULL, action->optional, TRUE, data_set); add_hash_param(notify_complete->extra, "notify_type", "pre"); add_hash_param(notify_complete->extra, "notify_operation", action->task); if(clone_data->notify_confirm) { add_hash_param(notify->extra, "notify_confirm", "yes"); } else { add_hash_param(notify->extra, "notify_confirm", "no"); } notify->pseudo = TRUE; notify_complete->pseudo = TRUE; /* pre_notify before pre_notify_complete */ custom_action_order( clone_data->self, NULL, notify, clone_data->self, NULL, notify_complete, pe_ordering_manditory, data_set); /* pre_notify_complete before action */ custom_action_order( clone_data->self, NULL, notify_complete, clone_data->self, NULL, action, pe_ordering_manditory, data_set); action->pre_notify = notify; action->pre_notified = notify_complete; /* create post_notify */ notify_key = generate_notify_key (clone_data->self->id, "post", action->task); notify = custom_action(clone_data->self, notify_key, CRMD_ACTION_NOTIFY, NULL, action_complete->optional, TRUE, data_set); add_hash_param(notify->extra, "notify_type", "post"); add_hash_param(notify->extra, "notify_operation", action->task); if(clone_data->notify_confirm) { add_hash_param(notify->extra, "notify_confirm", "yes"); } else { add_hash_param(notify->extra, "notify_confirm", "no"); } notify->pseudo = TRUE; /* action_complete before post_notify */ custom_action_order( clone_data->self, NULL, action_complete, clone_data->self, NULL, notify, pe_ordering_postnotify, data_set); /* create post_notify_complete */ notify_key = generate_notify_key( clone_data->self->id, "confirmed-post", action->task); notify_complete = custom_action(clone_data->self, notify_key, CRMD_ACTION_NOTIFIED, NULL, action->optional, TRUE, data_set); add_hash_param(notify_complete->extra, "notify_type", "pre"); add_hash_param(notify_complete->extra, "notify_operation", action->task); if(clone_data->notify_confirm) { add_hash_param(notify->extra, "notify_confirm", "yes"); } else { add_hash_param(notify->extra, "notify_confirm", "no"); } notify_complete->pseudo = TRUE; /* post_notify before post_notify_complete */ custom_action_order( clone_data->self, NULL, notify, clone_data->self, NULL, notify_complete, pe_ordering_manditory, data_set); action->post_notify = notify; action->post_notified = notify_complete; if(safe_str_eq(action->task, CRMD_ACTION_STOP)) { /* post_notify_complete before start */ custom_action_order( clone_data->self, NULL, notify_complete, clone_data->self, start_key(clone_data->self), NULL, pe_ordering_optional, data_set); } else if(safe_str_eq(action->task, CRMD_ACTION_START)) { /* post_notify_complete before promote */ custom_action_order( clone_data->self, NULL, notify_complete, clone_data->self, promote_key(clone_data->self), NULL, pe_ordering_optional, data_set); } else if(safe_str_eq(action->task, CRMD_ACTION_DEMOTE)) { /* post_notify_complete before promote */ custom_action_order( clone_data->self, NULL, notify_complete, clone_data->self, stop_key(clone_data->self), NULL, pe_ordering_optional, data_set); } } void child_starting_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set) { if(clone_data->ordered || clone_data->self->restart_type == pe_restart_restart) { type = pe_ordering_manditory; } if(child == NULL) { if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version (last node)"); /* last child start before global started */ custom_action_order( last, start_key(last), NULL, clone_data->self, started_key(clone_data->self), NULL, type, data_set); } } else if(clone_data->ordered) { crm_debug_4("Ordered version"); if(last == NULL) { /* global start before first child start */ last = clone_data->self; } /* else: child/child relative start */ order_start_start(last, child, type); } else { crm_debug_4("Un-ordered version"); /* child start before global started */ custom_action_order( child, start_key(child), NULL, clone_data->self, started_key(clone_data->self), NULL, type, data_set); /* global start before child start */ /* order_start_start(clone_data->self, child, type); */ order_start_start( clone_data->self, child, pe_ordering_manditory); } } void child_stopping_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set) { if(clone_data->ordered || clone_data->self->restart_type == pe_restart_restart) { type = pe_ordering_manditory; } if(child == NULL) { if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version (last node)"); /* global stop before first child stop */ order_stop_stop(clone_data->self, last, pe_ordering_manditory); } } else if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version"); /* child/child relative stop */ order_stop_stop(child, last, type); } else if(clone_data->ordered) { crm_debug_4("Ordered version (1st node)"); /* first child stop before global stopped */ custom_action_order( child, stop_key(child), NULL, clone_data->self, stopped_key(clone_data->self), NULL, type, data_set); } else { crm_debug_4("Un-ordered version"); /* child stop before global stopped */ custom_action_order( child, stop_key(child), NULL, clone_data->self, stopped_key(clone_data->self), NULL, type, data_set); /* global stop before child stop */ order_stop_stop(clone_data->self, child, type); } } void clone_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { resource_t *last_rsc = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); /* global stop before stopped */ custom_action_order( clone_data->self, stop_key(clone_data->self), NULL, clone_data->self, stopped_key(clone_data->self), NULL, pe_ordering_optional, data_set); /* global start before started */ custom_action_order( clone_data->self, start_key(clone_data->self), NULL, clone_data->self, started_key(clone_data->self), NULL, pe_ordering_optional, data_set); /* global stopped before start */ custom_action_order( clone_data->self, stopped_key(clone_data->self), NULL, clone_data->self, start_key(clone_data->self), NULL, pe_ordering_optional, data_set); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, /* child stop before start */ order_restart(child_rsc); child_starting_constraints( clone_data, pe_ordering_optional, child_rsc, last_rsc, data_set); child_stopping_constraints( clone_data, pe_ordering_optional, child_rsc, last_rsc, data_set); last_rsc = child_rsc; ); } void clone_rsc_colocation_lh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { gboolean do_interleave = FALSE; resource_t *rsc = constraint->rsc_lh; clone_variant_data_t *clone_data = NULL; clone_variant_data_t *clone_data_rh = NULL; if(rsc == 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; } else { crm_debug_4("Processing constraints from %s", rsc->id); } get_clone_variant_data(clone_data, rsc); if(constraint->rsc_rh->variant == pe_clone) { get_clone_variant_data( clone_data_rh, constraint->rsc_rh); - if(clone_data->clone_max_node - != clone_data_rh->clone_max_node) { + if(clone_data->clone_node_max + != clone_data_rh->clone_node_max) { pe_err("Cannot interleave "XML_CIB_TAG_INCARNATION" %s and %s because" " they do not support the same number of" " resources per node", constraint->rsc_lh->id, constraint->rsc_rh->id); /* only the LHS side needs to be labeled as interleave */ } else if(clone_data->interleave) { do_interleave = TRUE; } else if(constraint->strength != pecs_must_not) { pe_warn("rsc_colocations other than \"-INFINITY\"" " are not supported for non-interleaved " XML_CIB_TAG_INCARNATION" resources"); return; } } else if(constraint->strength != pecs_must_not) { pe_warn("Co-location scores other than \"-INFINITY\" are not " " allowed for non-"XML_CIB_TAG_INCARNATION" resources"); return; } if(do_interleave) { resource_t *child_lh = NULL; resource_t *child_rh = NULL; GListPtr iter_lh = clone_data->child_list; GListPtr iter_rh = clone_data_rh->child_list; crm_debug_2("Interleaving %s with %s", constraint->rsc_lh->id, constraint->rsc_rh->id); /* If the resource have different numbers of incarnations, * then just do as many as are available */ while(iter_lh != NULL && iter_rh != NULL) { child_lh = iter_lh->data; child_rh = iter_rh->data; iter_lh = iter_lh->next; iter_rh = iter_rh->next; crm_debug_3("Colocating %s with %s", child_lh->id, child_rh->id); child_lh->fns->rsc_colocation_lh(child_lh, child_rh, constraint); } return; } slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, crm_action_debug_3(print_resource("LHS", child_rsc, TRUE)); child_rsc->fns->rsc_colocation_lh(child_rsc, constraint->rsc_rh, constraint); ); } void clone_rsc_colocation_rh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { clone_variant_data_t *clone_data = NULL; CRM_DEV_ASSERT(rsc_lh->variant == pe_native); crm_debug_3("Processing RH of constraint %s", constraint->id); if(rsc_lh == NULL) { pe_err("rsc_lh was NULL for %s", constraint->id); return; } else if(rsc_rh == NULL) { pe_err("rsc_rh was NULL for %s", constraint->id); return; } else if(constraint->strength != pecs_must_not) { pe_warn("rsc_dependencies other than \"must_not\" " "are not supported for clone resources"); return; } else { crm_action_debug_3(print_resource("LHS", rsc_lh, FALSE)); } get_clone_variant_data(clone_data, rsc_rh); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, crm_action_debug_3(print_resource("RHS", child_rsc, FALSE)); child_rsc->fns->rsc_colocation_rh(rsc_lh, child_rsc, constraint); ); } void clone_rsc_order_lh(resource_t *rsc, order_constraint_t *order) { char *stop_id = NULL; char *start_id = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); crm_debug_3("Processing LH of ordering constraint %d", order->id); stop_id = stop_key(rsc); start_id = start_key(rsc); if(safe_str_eq(order->lh_action_task, start_id)) { crm_free(order->lh_action_task); order->lh_action_task = started_key(rsc); } else if(safe_str_eq(order->lh_action_task, stop_id)) { crm_free(order->lh_action_task); order->lh_action_task = stopped_key(rsc); } crm_free(start_id); crm_free(stop_id); clone_data->self->fns->rsc_order_lh(clone_data->self, order); } void clone_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); crm_debug_3("Processing RH of ordering constraint %d", order->id); clone_data->self->fns->rsc_order_rh(lh_action, clone_data->self, order); } void clone_rsc_location(resource_t *rsc, rsc_to_node_t *constraint) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); crm_debug_3("Processing actions from %s", rsc->id); clone_data->self->fns->rsc_location(clone_data->self, constraint); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, child_rsc->fns->rsc_location(child_rsc, constraint); ); } static gint sort_notify_entries(gconstpointer a, gconstpointer b) { int tmp; const notify_entry_t *entry_a = a; const notify_entry_t *entry_b = b; if(entry_a == NULL && entry_b == NULL) { return 0; } if(entry_a == NULL) { return 1; } if(entry_b == NULL) { return -1; } if(entry_a->rsc == NULL && entry_b->rsc == NULL) { return 0; } if(entry_a->rsc == NULL) { return 1; } if(entry_b->rsc == NULL) { return -1; } tmp = strcmp(entry_a->rsc->id, entry_b->rsc->id); if(tmp != 0) { return tmp; } if(entry_a->node == NULL && entry_b->node == NULL) { return 0; } if(entry_a->node == NULL) { return 1; } if(entry_b->node == NULL) { return -1; } return strcmp(entry_a->node->details->id, entry_b->node->details->id); } static void expand_list(GListPtr list, int clones, char **rsc_list, char **node_list, char **uuid_list) { int rsc_len = 0; int node_len = 0; int uuid_len = 0; int list_len = 100 * clones; char *rsc_list_s = NULL; char *node_list_s = NULL; char *uuid_list_s = NULL; const char *uuid = NULL; const char *uname = NULL; const char *rsc_id = NULL; const char *last_uuid = NULL; const char *last_rsc_id = NULL; clone_expand_reallocate: if(rsc_list != NULL) { crm_malloc0(*rsc_list, sizeof(char)*list_len); rsc_list_s = *rsc_list; rsc_len = 0; } if(node_list != NULL) { crm_malloc0(*node_list, sizeof(char)*list_len); node_list_s = *node_list; node_len = 0; } if(uuid_list != NULL) { crm_malloc0(*uuid_list, sizeof(char)*list_len); uuid_list_s = *uuid_list; uuid_len = 0; } slist_iter(entry, notify_entry_t, list, lpc, rsc_id = entry->rsc->id; CRM_DEV_ASSERT(rsc_id != NULL); if(crm_assert_failed) { rsc_id = "__none__"; } uuid = NULL; if(entry->node) { uuid = entry->node->details->id; } CRM_DEV_ASSERT(uuid != NULL); if(crm_assert_failed) { uuid = "__none__"; } uname = NULL; if(entry->node) { uname = entry->node->details->uname; } CRM_DEV_ASSERT(uname != NULL); if(crm_assert_failed) { uname = "__none__"; } /* filter dups */ if(safe_str_eq(rsc_id, last_rsc_id) && safe_str_eq(uuid, last_uuid)) { continue; } last_rsc_id = rsc_id; last_uuid = uuid; if(rsc_len + 1 + strlen(rsc_id) >= list_len) { crm_free(*rsc_list); crm_free(*node_list); crm_free(*uuid_list); list_len *= 2; goto clone_expand_reallocate; } sprintf(rsc_list_s, "%s ", rsc_id); rsc_list_s += 1 + strlen(rsc_id); rsc_len += 1 + strlen(rsc_id); if(node_len + 1 + strlen(uname) >= list_len) { crm_free(*rsc_list); crm_free(*node_list); crm_free(*uuid_list); list_len *= 2; goto clone_expand_reallocate; } sprintf(node_list_s, "%s ", uname); node_list_s += 1 + strlen(uname); node_len += 1 + strlen(uname); if(uuid_len + 1 + strlen(uuid) >= list_len) { crm_free(*rsc_list); crm_free(*node_list); crm_free(*uuid_list); list_len *= 2; goto clone_expand_reallocate; } sprintf(uuid_list_s, "%s ", uuid); uuid_list_s += 1 + strlen(uuid); uuid_len += 1 + strlen(uuid); ); } void clone_expand(resource_t *rsc, pe_working_set_t *data_set) { char *rsc_list = NULL; char *node_list = NULL; char *uuid_list = NULL; notify_data_t *n_data = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); crm_malloc0(n_data, sizeof(notify_data_t)); n_data->keys = g_hash_table_new_full( g_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str); crm_debug_2("Processing actions from %s", rsc->id); if(rsc->notify) { slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, slist_iter( op, action_t, clone_data->self->actions, lpc2, child_rsc->fns->create_notify_element( child_rsc, op, n_data, data_set); ); ); } /* expand the notify data */ if(rsc->notify && n_data->stop) { n_data->stop = g_list_sort( n_data->stop, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->stop, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_stop_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_stop_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_stop_uuid"), uuid_list); } if(rsc->notify && n_data->start) { n_data->start = g_list_sort( n_data->start, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->start, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_start_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_start_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_start_uuid"), uuid_list); } if(rsc->notify && n_data->demote) { n_data->demote = g_list_sort( n_data->demote, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->demote, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_demote_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_demote_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_demote_uuid"), uuid_list); } if(rsc->notify && n_data->promote) { n_data->promote = g_list_sort( n_data->promote, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->promote, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_promote_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_promote_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_promote_uuid"), uuid_list); } if(rsc->notify && n_data->active) { n_data->active = g_list_sort( n_data->active, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->active, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_active_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_active_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_active_uuid"), uuid_list); } if(rsc->notify && n_data->slave) { n_data->slave = g_list_sort( n_data->slave, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->slave, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_slave_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_slave_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_slave_uuid"), uuid_list); } if(rsc->notify && n_data->master) { n_data->master = g_list_sort( n_data->master, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->master, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_master_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_master_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_master_uuid"), uuid_list); } if(rsc->notify && n_data->inactive) { n_data->inactive = g_list_sort( n_data->inactive, sort_notify_entries); rsc_list = NULL; node_list = NULL; uuid_list = NULL; expand_list(n_data->inactive, clone_data->clone_max, &rsc_list, &node_list, &uuid_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_inactive_resource"), rsc_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_inactive_uname"), node_list); g_hash_table_insert( n_data->keys, crm_strdup("notify_inactive_uuid"), uuid_list); } /* yes, we DO need this second loop */ slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, child_rsc->fns->expand(child_rsc, data_set); ); /* slist_iter( */ /* action, action_t, clone_data->self->actions, lpc2, */ /* if(safe_str_eq(action->task, CRMD_ACTION_NOTIFY)) { */ /* action->extra_xml = notify_xml; */ /* } */ /* ); */ clone_data->self->fns->expand(clone_data->self, data_set); /* destroy the notify_data */ pe_free_shallow(n_data->stop); pe_free_shallow(n_data->start); pe_free_shallow(n_data->demote); pe_free_shallow(n_data->promote); pe_free_shallow(n_data->master); pe_free_shallow(n_data->slave); pe_free_shallow(n_data->active); pe_free_shallow(n_data->inactive); g_hash_table_destroy(n_data->keys); crm_free(n_data); } gboolean clone_active(resource_t *rsc, gboolean all) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, gboolean child_active = child_rsc->fns->active(child_rsc, all); if(all == FALSE && child_active) { return TRUE; } else if(all && child_active == FALSE) { return FALSE; } ); if(all) { return TRUE; } else { return FALSE; } } void clone_print( resource_t *rsc, const char *pre_text, long options, void *print_data) { const char *child_text = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); if(pre_text != NULL) { child_text = " "; } else { child_text = " "; } if(rsc->variant == pe_master) { status_print("%sMaster/Slave Set: %s\n", pre_text?pre_text:"", clone_data->self->id); } else { status_print("%sClone Set: %s\n", pre_text?pre_text:"", clone_data->self->id); } if(options & pe_print_html) { status_print("
    \n"); } slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, if(options & pe_print_html) { status_print("
  • \n"); } child_rsc->fns->print( child_rsc, child_text, options, print_data); if(options & pe_print_html) { status_print("
    • \n"); } ); if(options & pe_print_html) { status_print("
\n"); } } void clone_free(resource_t *rsc) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); crm_debug_3("Freeing %s", rsc->id); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, crm_debug_3("Freeing child %s", child_rsc->id); free_xml(child_rsc->xml); child_rsc->fns->free(child_rsc); ); crm_debug_3("Freeing child list"); pe_free_shallow_adv(clone_data->child_list, FALSE); free_xml(clone_data->self->xml); clone_data->self->fns->free(clone_data->self); common_free(rsc); } void clone_agent_constraints(resource_t *rsc) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, child_rsc->fns->agent_constraints(child_rsc); ); } enum rsc_role_e clone_resource_state(resource_t *rsc) { return RSC_ROLE_UNKNOWN; } void clone_create_notify_element(resource_t *rsc, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, child_rsc->fns->create_notify_element( child_rsc, op, n_data, data_set); ); } gboolean clone_create_probe(resource_t *rsc, node_t *node, action_t *complete, pe_working_set_t *data_set) { gboolean any_created = FALSE; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, any_created = child_rsc->fns->create_probe( child_rsc, node, complete, data_set) || any_created; ); return any_created; } diff --git a/crm/pengine/master.c b/crm/pengine/master.c index 8d3a1927f2..8a76fcb9dc 100644 --- a/crm/pengine/master.c +++ b/crm/pengine/master.c @@ -1,480 +1,480 @@ -/* $Id: master.c,v 1.4 2005/09/21 10:32:09 andrew Exp $ */ +/* $Id: master.c,v 1.5 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 extern void clone_create_notifications( resource_t *rsc, action_t *action, action_t *action_complete, pe_working_set_t *data_set); typedef struct clone_variant_data_s { resource_t *self; int clone_max; - int clone_max_node; + int clone_node_max; int active_clones; int max_nodes; gboolean interleave; gboolean ordered; gboolean notify_confirm; GListPtr child_list; /* resource_t* */ } clone_variant_data_t; #define NO_MASTER_PREFS 0 #define get_clone_variant_data(data, rsc) \ CRM_ASSERT(rsc->variant == pe_master); \ data = (clone_variant_data_t *)rsc->variant_opaque; void master_unpack(resource_t *rsc, pe_working_set_t *data_set) { add_hash_param(rsc->parameters, "stateful", XML_BOOLEAN_TRUE); clone_unpack(rsc, data_set); } static void child_promoting_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set) { /* if(clone_data->ordered */ /* || clone_data->self->restart_type == pe_restart_restart) { */ /* type = pe_ordering_manditory; */ /* } */ if(child == NULL) { if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version (last node)"); /* last child promote before promoted started */ custom_action_order( last, promote_key(last), NULL, clone_data->self, promoted_key(clone_data->self), NULL, type, data_set); } } else if(clone_data->ordered) { crm_debug_4("Ordered version"); if(last == NULL) { /* global promote before first child promote */ last = clone_data->self; } /* else: child/child relative promote */ order_start_start(last, child, type); custom_action_order( last, promote_key(last), NULL, child, promote_key(child), NULL, type, data_set); } else { crm_debug_4("Un-ordered version"); /* child promote before global promoted */ custom_action_order( child, promote_key(child), NULL, clone_data->self, promoted_key(clone_data->self), NULL, type, data_set); /* global promote before child promote */ custom_action_order( clone_data->self, promote_key(clone_data->self), NULL, child, promote_key(child), NULL, type, data_set); } } static void child_demoting_constraints( clone_variant_data_t *clone_data, enum pe_ordering type, resource_t *child, resource_t *last, pe_working_set_t *data_set) { /* if(clone_data->ordered */ /* || clone_data->self->restart_type == pe_restart_restart) { */ /* type = pe_ordering_manditory; */ /* } */ if(child == NULL) { if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version (last node)"); /* global demote before first child demote */ custom_action_order( clone_data->self, demote_key(clone_data->self), NULL, last, demote_key(last), NULL, pe_ordering_manditory, data_set); } } else if(clone_data->ordered && last != NULL) { crm_debug_4("Ordered version"); /* child/child relative demote */ custom_action_order(child, demote_key(child), NULL, last, demote_key(last), NULL, type, data_set); } else if(clone_data->ordered) { crm_debug_4("Ordered version (1st node)"); /* first child stop before global stopped */ custom_action_order( child, demote_key(child), NULL, clone_data->self, demoted_key(clone_data->self), NULL, type, data_set); } else { crm_debug_4("Un-ordered version"); /* child demote before global demoted */ custom_action_order( child, demote_key(child), NULL, clone_data->self, demoted_key(clone_data->self), NULL, type, data_set); /* global demote before child demote */ custom_action_order( clone_data->self, demote_key(clone_data->self), NULL, child, demote_key(child), NULL, type, data_set); } } static void master_update_pseudo_status( resource_t *child, gboolean *demoting, gboolean *promoting) { CRM_ASSERT(demoting != NULL); CRM_ASSERT(promoting != NULL); slist_iter( action, action_t, child->actions, lpc, if(*promoting && *demoting) { return; } else if(action->optional) { continue; } else if(safe_str_eq(CRMD_ACTION_DEMOTE, action->task)) { *demoting = TRUE; } else if(safe_str_eq(CRMD_ACTION_PROMOTE, action->task)) { *promoting = TRUE; } ); } #define apply_master_location(list) \ slist_iter( \ cons, rsc_to_node_t, list, lpc2, \ cons_node = NULL; \ if(cons->role_filter == RSC_ROLE_MASTER) { \ crm_debug("Applying %s to %s", \ cons->id, child_rsc->id); \ cons_node = pe_find_node_id( \ cons->node_list_rh, chosen->details->id); \ } \ if(cons_node != NULL) { \ int new_priority = merge_weights( \ child_rsc->priority, cons_node->weight); \ crm_debug("\t%s: %d->%d", child_rsc->id, \ child_rsc->priority, new_priority); \ child_rsc->priority = new_priority; \ } \ ); struct masters_s { node_t *node; int num_masters; }; void master_create_actions(resource_t *rsc, pe_working_set_t *data_set) { int len = 0; node_t *chosen = NULL; char *attr_name = NULL; const char *attr_value = NULL; node_t *cons_node = NULL; action_t *action = NULL; action_t *action_complete = NULL; gboolean any_promoting = FALSE; gboolean any_demoting = FALSE; resource_t *last_promote_rsc = NULL; resource_t *last_demote_rsc = NULL; const char *master_max_s = get_rsc_param(rsc, XML_RSC_ATTR_MASTER_MAX); const char *master_node_max_s = get_rsc_param(rsc, XML_RSC_ATTR_MASTER_NODEMAX); int promoted = 0; int max_nodes = 0; int master_max = crm_atoi(master_max_s, "1"); int master_node_max = crm_atoi(master_node_max_s, "1"); struct masters_s *master_hash_obj = NULL; GHashTable *master_hash = g_hash_table_new_full( g_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str); clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); /* how many can we have? */ - if(master_max > clone_data->max_nodes * clone_data->clone_max_node) { - master_max = clone_data->max_nodes * clone_data->clone_max_node; + if(master_max > clone_data->max_nodes * clone_data->clone_node_max) { + master_max = clone_data->max_nodes * clone_data->clone_node_max; crm_info("Limited to %d masters (potential slaves)",master_max); } if(master_max > max_nodes * master_node_max) { master_max = clone_data->max_nodes * master_node_max; crm_info("Limited to %d masters (available nodes)", master_max); } /* * assign priority */ slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, CRM_DEV_ASSERT(child_rsc->color != NULL); chosen = child_rsc->color->details->chosen_node; switch(child_rsc->next_role) { case RSC_ROLE_STARTED: if(NO_MASTER_PREFS) { child_rsc->priority = clone_data->clone_max - lpc; break; } child_rsc->priority = -1; CRM_DEV_ASSERT(chosen != NULL); len = 8 + strlen(child_rsc->id); crm_malloc0(attr_name, len); sprintf(attr_name, "master-%s", child_rsc->id); attr_value = g_hash_table_lookup( chosen->details->attrs, attr_name); crm_info("%s=%s for %s", attr_name, crm_str(attr_value), chosen->details->uname); if(attr_value != NULL) { child_rsc->priority = char2score( attr_value); } crm_free(attr_name); apply_master_location(child_rsc->rsc_location); apply_master_location(rsc->rsc_location); break; case RSC_ROLE_SLAVE: case RSC_ROLE_STOPPED: child_rsc->priority = -INFINITY; break; default: CRM_DEV_ASSERT(FALSE/* unhandled */); } ); /* sort based on the new "promote" priority */ clone_data->child_list = g_list_sort( clone_data->child_list, sort_rsc_priority); /* mark the first N as masters */ slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, CRM_DEV_ASSERT(child_rsc->color != NULL); chosen = child_rsc->color->details->chosen_node; switch(child_rsc->next_role) { case RSC_ROLE_STARTED: master_hash_obj = g_hash_table_lookup( master_hash, chosen->details->id); if(master_hash_obj == NULL) { crm_malloc0(master_hash_obj, sizeof(struct masters_s)); master_hash_obj->node = chosen; g_hash_table_insert( master_hash, crm_strdup(chosen->details->id), master_hash_obj); } if(master_hash_obj->num_masters >= master_node_max) { crm_info("Demoting %s (node master max)", child_rsc->id); child_rsc->next_role = RSC_ROLE_SLAVE; } else if(child_rsc->priority < 0) { crm_info("Demoting %s (priority)", child_rsc->id); child_rsc->next_role = RSC_ROLE_SLAVE; } else if(master_max <= promoted) { crm_info("Demoting %s (masters max)", child_rsc->id); child_rsc->next_role = RSC_ROLE_SLAVE; } else { crm_info("Promoting %s", child_rsc->id); child_rsc->next_role = RSC_ROLE_MASTER; promoted++; master_hash_obj->num_masters++; } break; case RSC_ROLE_SLAVE: if(child_rsc->priority < 0 ||master_max <= lpc){ pe_warn("Cannot promote %s (slave)", child_rsc->id); lpc--; } break; case RSC_ROLE_STOPPED: if(child_rsc->priority < 0 ||master_max <= lpc){ pe_warn("Cannot promote %s (stopping)", child_rsc->id); lpc--; } break; default: CRM_DEV_ASSERT(FALSE/* unhandled */); } ); crm_info("Promoted %d (of %d) slaves to master", promoted, master_max); g_hash_table_destroy(master_hash); /* create actions as normal */ clone_create_actions(rsc, data_set); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, gboolean child_promoting = FALSE; gboolean child_demoting = FALSE; master_update_pseudo_status( child_rsc, &child_demoting, &child_promoting); any_demoting = any_demoting || child_demoting; any_promoting = any_promoting || child_promoting; ); /* promote */ action = promote_action(clone_data->self, NULL, !any_promoting); action_complete = custom_action( clone_data->self, promoted_key(rsc), CRMD_ACTION_PROMOTED, NULL, !any_promoting, TRUE, data_set); action->pseudo = TRUE; action_complete->pseudo = TRUE; child_promoting_constraints(clone_data, pe_ordering_optional, NULL, last_promote_rsc, data_set); clone_create_notifications(rsc, action, action_complete, data_set); /* demote */ action = demote_action(clone_data->self, NULL, !any_demoting); action_complete = custom_action( clone_data->self, demoted_key(rsc), CRMD_ACTION_DEMOTED, NULL, !any_demoting, TRUE, data_set); action->pseudo = TRUE; action_complete->pseudo = TRUE; child_demoting_constraints(clone_data, pe_ordering_optional, NULL, last_demote_rsc, data_set); clone_create_notifications(rsc, action, action_complete, data_set); } void master_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { resource_t *last_rsc = NULL; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); clone_internal_constraints(rsc, data_set); /* global demoted before start */ custom_action_order( clone_data->self, demoted_key(clone_data->self), NULL, clone_data->self, start_key(clone_data->self), NULL, pe_ordering_optional, data_set); /* global started before promote */ custom_action_order( clone_data->self, started_key(clone_data->self), NULL, clone_data->self, promote_key(clone_data->self), NULL, pe_ordering_optional, data_set); /* global demoted before stop */ custom_action_order( clone_data->self, demoted_key(clone_data->self), NULL, clone_data->self, stop_key(clone_data->self), NULL, pe_ordering_optional, data_set); /* global demote before demoted */ custom_action_order( clone_data->self, demote_key(clone_data->self), NULL, clone_data->self, demoted_key(clone_data->self), NULL, pe_ordering_optional, data_set); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, /* child demote before promote */ custom_action_order( child_rsc, demote_key(child_rsc), NULL, child_rsc, promote_key(child_rsc), NULL, pe_ordering_restart, data_set); child_promoting_constraints(clone_data, pe_ordering_optional, child_rsc, last_rsc, data_set); child_demoting_constraints(clone_data, pe_ordering_optional, child_rsc, last_rsc, data_set); last_rsc = child_rsc; ); } diff --git a/crm/pengine/native.c b/crm/pengine/native.c index 7e988ac1bf..1f884ec676 100644 --- a/crm/pengine/native.c +++ b/crm/pengine/native.c @@ -1,1875 +1,1871 @@ -/* $Id: native.c,v 1.88 2005/09/30 13:01:15 andrew Exp $ */ +/* $Id: native.c,v 1.89 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 extern color_t *add_color(resource_t *rh_resource, color_t *color); gboolean native_choose_color(resource_t *lh_resource, color_t *no_color); void native_update_node_weight(resource_t *rsc, rsc_to_node_t *cons, node_t *cons_node, GListPtr nodes); 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 filter_nodes(resource_t *rsc); int num_allowed_nodes4color(color_t *color); void create_notifications(resource_t *rsc, pe_working_set_t *data_set); void create_recurring_actions(resource_t *rsc, action_t *start, node_t *node, 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 StopRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set); gboolean StartRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set); gboolean DemoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set); gboolean PromoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set); gboolean RoleError(resource_t *rsc, node_t *next, pe_working_set_t *data_set); gboolean NullOp(resource_t *rsc, node_t *next, 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_UNKNOWN, }, /* 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*,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, RoleError, }, /* Slave */ { RoleError, StopRsc, RoleError, NullOp, PromoteRsc, }, /* Master */ { RoleError, RoleError, RoleError, DemoteRsc, NullOp, }, }; typedef struct native_variant_data_s { - GListPtr allowed_nodes; /* node_t* */ +/* GListPtr allowed_nodes; /\* node_t* *\/ */ } native_variant_data_t; #define get_native_variant_data(data, rsc) \ CRM_ASSERT(rsc->variant == pe_native); \ CRM_ASSERT(rsc->variant_opaque != NULL); \ data = (native_variant_data_t *)rsc->variant_opaque; void native_add_running(resource_t *rsc, node_t *node, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); CRM_DEV_ASSERT(node != NULL); if(crm_assert_failed) { return; } slist_iter( a_node, node_t, rsc->running_on, lpc, CRM_DEV_ASSERT(a_node != NULL); if(safe_str_eq(a_node->details->id, node->details->id)) { return; } ); rsc->running_on = g_list_append(rsc->running_on, node); node->details->running_rsc = g_list_append( node->details->running_rsc, rsc); if(rsc->is_managed == FALSE) { rsc2node_new( "not_managed_default", rsc, INFINITY, node, data_set); return; } else if(rsc->stickiness > 0 || rsc->stickiness < 0) { rsc2node_new("stickiness", rsc, rsc->stickiness, node,data_set); crm_info("Resource %s: preferring current location (%s/%s)", rsc->id, node->details->uname, node->details->id); } if(g_list_length(rsc->running_on) > 1) { pe_warn("Resource %s is (potentially) active on %d nodes." " Latest: %s/%s", rsc->id, g_list_length(rsc->running_on), node->details->uname, node->details->id); if(rsc->recovery_type == recovery_stop_only) { native_assign_color(rsc, data_set->no_color); } else if(rsc->recovery_type == recovery_block) { rsc->is_managed = FALSE; } } else { crm_info("Resource %s is active on: %s", rsc->id, node->details->uname); } } void native_unpack(resource_t *rsc, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; crm_debug_3("Processing resource %s...", rsc->id); crm_malloc0(native_data, sizeof(native_variant_data_t)); - native_data->allowed_nodes = NULL; + rsc->allowed_nodes = NULL; rsc->running_on = NULL; rsc->variant_opaque = native_data; } resource_t * native_find_child(resource_t *rsc, const char *id) { return NULL; } int native_num_allowed_nodes(resource_t *rsc) { int num_nodes = 0; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); if(rsc->color) { crm_debug_4("Colored case"); num_nodes = num_allowed_nodes4color(rsc->color); } else if(rsc->candidate_colors) { /* TODO: sort colors first */ color_t *color = g_list_nth_data(rsc->candidate_colors, 0); crm_debug_4("Candidate colors case"); num_nodes = num_allowed_nodes4color(color); } else { crm_debug_4("Default case"); slist_iter( - this_node, node_t, native_data->allowed_nodes, lpc, + this_node, node_t, rsc->allowed_nodes, lpc, crm_debug_3("Rsc %s Checking %s: %d", rsc->id, this_node->details->uname, this_node->weight); if(this_node->details->shutdown || this_node->details->online == FALSE) { this_node->weight = -INFINITY; } if(this_node->weight < 0) { continue; /* } else if(this_node->details->unclean) { */ /* continue; */ } num_nodes++; ); } crm_debug_2("Resource %s can run on %d nodes", rsc->id, num_nodes); return num_nodes; } int num_allowed_nodes4color(color_t *color) { int num_nodes = 0; if(color->details->pending == FALSE) { if(color->details->chosen_node) { return 1; } return 0; } slist_iter( this_node, node_t, color->details->candidate_nodes, lpc, crm_debug_3("Checking %s: %d", this_node->details->uname, this_node->weight); if(this_node->details->shutdown || this_node->details->online == FALSE) { this_node->weight = -INFINITY; } if(this_node->weight < 0) { continue; /* } else if(this_node->details->unclean) { */ /* continue; */ } num_nodes++; ); return num_nodes; } color_t * native_color(resource_t *rsc, pe_working_set_t *data_set) { color_t *new_color = NULL; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); if(rsc->provisional == FALSE) { return rsc->color; } else if( native_choose_color(rsc, data_set->no_color) ) { crm_debug_3("Colored resource %s with color %d", rsc->id, rsc->color->id); new_color = rsc->color; } else { - if(native_data->allowed_nodes != NULL) { + if(rsc->allowed_nodes != NULL) { /* filter out nodes with a negative weight */ filter_nodes(rsc); new_color = create_color(data_set, rsc, - native_data->allowed_nodes); + rsc->allowed_nodes); native_assign_color(rsc, new_color); } if(new_color == NULL) { pe_warn("Resource %s cannot run anywhere", rsc->id); print_resource("ERROR: No color", rsc, FALSE); native_assign_color(rsc, data_set->no_color); new_color = data_set->no_color; } } rsc->provisional = FALSE; return new_color; } void create_recurring_actions(resource_t *rsc, action_t *start, node_t *node, pe_working_set_t *data_set) { char *key = NULL; const char *name = NULL; const char *value = 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; } xml_child_iter( rsc->ops_xml, operation, "op", name = crm_element_value(operation, "name"); value = crm_element_value(operation, "interval"); interval_ms = crm_get_msec(value); if(interval_ms <= 0) { continue; } value = crm_element_value(operation, "role"); if(start != NULL && value != NULL && text2role(value) != start->rsc->next_role) { crm_debug_2("Skipping action %s::%s(%s) : %s", start->rsc->id, name, value, role2text(start->rsc->next_role)); continue; } key = generate_op_key(rsc->id, name, interval_ms); possible_matches = find_actions(rsc->actions, key, node); if(start != NULL) { is_optional = start->optional; } else { is_optional = TRUE; } /* start a monitor for an already active resource */ if(possible_matches == NULL) { is_optional = FALSE; } mon = custom_action(rsc, key, name, node, is_optional, TRUE, data_set); if(start == NULL || start->runnable == FALSE) { crm_warn(" %s:\t(%s) (cancelled : start un-runnable)", mon->uuid, crm_str(node_uname)); mon->runnable = FALSE; } else if(node == NULL || node->details->online == FALSE || node->details->unclean) { crm_warn(" %s:\t(%s) (cancelled : no node available)", mon->uuid, crm_str(node_uname)); mon->runnable = FALSE; } else if(mon->optional == FALSE) { crm_info(" %s:\t(%s)", mon->uuid, crm_str(node_uname)); } custom_action_order(rsc, start_key(rsc), NULL, NULL, crm_strdup(key), mon, pe_ordering_manditory, 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; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); if(rsc->color != NULL) { chosen = rsc->color->details->chosen_node; } unpack_instance_attributes( rsc->xml, XML_TAG_ATTR_SETS, chosen, rsc->parameters, NULL, 0, data_set); + + crm_info("%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_err("Attempting recovery of resource %s", rsc->id); StopRsc(rsc, NULL, 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; */ ); crm_debug_2("Stopping a stopped resource"); crm_free(key); return; } role = rsc->role; - crm_info("%s: %s->%s", rsc->id, - role2text(rsc->role), role2text(rsc->next_role)); while(role != rsc->next_role) { next_role = rsc_state_matrix[role][rsc->next_role]; crm_debug("Executing: %s->%s (%s)", role2text(role), role2text(next_role), rsc->id); if(rsc_action_matrix[role][next_role]( rsc, chosen, data_set) == FALSE) { break; } role = next_role; } if(rsc->next_role != RSC_ROLE_STOPPED && rsc->is_managed) { start = start_action(rsc, chosen, TRUE); create_recurring_actions(rsc, start, chosen, data_set); } } void native_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); order_restart(rsc); } 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->fns->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->strength == pecs_ignore || constraint->strength == pecs_startstop){ crm_debug_4("Skipping constraint type %d", constraint->strength); return FALSE; } if(constraint->state_lh != NULL && text2role(constraint->state_lh) != rsc_lh->next_role) { crm_debug_4("RH: Skipping constraint: \"%s\" state filter", constraint->state_rh); return FALSE; } if(constraint->state_rh != NULL && text2role(constraint->state_rh) != rsc_rh->next_role) { crm_debug_4("RH: Skipping constraint: \"%s\" state filter", constraint->state_rh); return FALSE; } return TRUE; } void native_rsc_colocation_rh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { gboolean do_check = FALSE; gboolean update_lh = FALSE; gboolean update_rh = FALSE; native_variant_data_t *native_data_lh = NULL; native_variant_data_t *native_data_rh = NULL; get_native_variant_data(native_data_lh, rsc_lh); get_native_variant_data(native_data_rh, rsc_rh); crm_debug_2("%sColocating %s with %s (%s)", constraint->strength == pecs_must?"":"Anti-", rsc_lh->id, rsc_rh->id, constraint->id); if(filter_colocation_constraint(rsc_lh, rsc_rh, constraint) == FALSE) { return; } if(rsc_lh->provisional && rsc_rh->provisional) { if(constraint->strength == pecs_must) { /* update effective_priorities */ crm_debug_3("Priority update"); native_rsc_colocation_rh_must( rsc_lh, update_lh, rsc_rh, update_rh); } else { /* nothing */ crm_debug_4( "Skipping constraint, both sides provisional"); } return; } else if( (!rsc_lh->provisional) && (!rsc_rh->provisional) && (!rsc_lh->color->details->pending) && (!rsc_rh->color->details->pending) ) { /* error check */ do_check = TRUE; if(rsc_lh->effective_priority < rsc_rh->effective_priority) { update_lh = TRUE; } else if(rsc_lh->effective_priority > rsc_rh->effective_priority) { update_rh = TRUE; } else { update_lh = TRUE; update_rh = TRUE; } } else if(rsc_lh->provisional == FALSE && rsc_lh->color->details->pending == FALSE) { /* update _them_ : postproc color version */ update_rh = TRUE; } else if(rsc_rh->provisional == FALSE && rsc_rh->color->details->pending == FALSE) { /* update _us_ : postproc color alt version */ update_lh = TRUE; } else if(rsc_lh->provisional == FALSE) { /* update _them_ : preproc version */ update_rh = TRUE; } else if(rsc_rh->provisional == FALSE) { /* update _us_ : postproc version */ update_lh = TRUE; } else { pe_warn("Un-expected combination of inputs"); return; } if(update_lh) { crm_debug_4("Updating LHS"); } if(update_rh) { crm_debug_4("Updating RHS"); } if(do_check) { if(native_constraint_violated( rsc_lh, rsc_rh, constraint) == FALSE) { crm_debug_4("Constraint satisfied"); return; } /* else constraint cant be satisified */ pe_warn("Constraint %s could not be satisfied", constraint->id); if(update_lh) { pe_warn("Marking resource %s unrunnable as a result", rsc_lh->id); rsc_lh->runnable = FALSE; } if(update_rh) { pe_warn("Marking resource %s unrunnable as a result", rsc_rh->id); rsc_rh->runnable = FALSE; } } if(constraint->strength == pecs_must) { native_rsc_colocation_rh_must( rsc_lh, update_lh, rsc_rh, update_rh); return; } else if(constraint->strength != pecs_must_not) { /* unknown type */ pe_err("Unknown constraint type %d", constraint->strength); return; } native_rsc_colocation_rh_mustnot(rsc_lh, update_lh,rsc_rh, update_rh); } void native_rsc_order_lh(resource_t *lh_rsc, order_constraint_t *order) { GListPtr lh_actions = NULL; action_t *lh_action = order->lh_action; crm_debug_3("Processing LH of ordering constraint %d", order->id); if(lh_action != NULL) { lh_actions = g_list_append(NULL, lh_action); } else if(lh_action == NULL && lh_rsc != NULL) { #if 0 /* this should be safe to remove */ if(order->strength == pecs_must) { crm_debug_4("No LH-Side (%s/%s) found for constraint..." " creating", lh_rsc->id, order->lh_action_task); pe_err("BROKEN CODE"); custom_action( lh_rsc, order->lh_action_task, NULL, NULL); } #endif lh_actions = find_actions( lh_rsc->actions, order->lh_action_task, NULL); if(lh_actions == NULL) { crm_debug_4("No LH-Side (%s/%s) found for constraint", lh_rsc->id, order->lh_action_task); if(order->rh_rsc != NULL) { crm_debug_4("RH-Side was: (%s/%s)", order->rh_rsc->id, order->rh_action_task); } else if(order->rh_action != NULL && order->rh_action->rsc != NULL) { crm_debug_4("RH-Side was: (%s/%s)", order->rh_action->rsc->id, order->rh_action_task); } else if(order->rh_action != NULL) { crm_debug_4("RH-Side was: %s", order->rh_action_task); } else { crm_debug_4("RH-Side was NULL"); } return; } } else { pe_warn("No LH-Side (%s) specified for constraint", order->lh_action_task); if(order->rh_rsc != NULL) { crm_debug_4("RH-Side was: (%s/%s)", order->rh_rsc->id, order->rh_action_task); } else if(order->rh_action != NULL && order->rh_action->rsc != NULL) { crm_debug_4("RH-Side was: (%s/%s)", order->rh_action->rsc->id, order->rh_action_task); } else if(order->rh_action != NULL) { crm_debug_4("RH-Side was: %s", order->rh_action_task); } else { crm_debug_4("RH-Side was NULL"); } return; } slist_iter( lh_action_iter, action_t, lh_actions, lpc, resource_t *rh_rsc = order->rh_rsc; if(rh_rsc == NULL && order->rh_action) { rh_rsc = order->rh_action->rsc; } if(rh_rsc) { rh_rsc->fns->rsc_order_rh( lh_action_iter, rh_rsc, order); } else if(order->rh_action) { order_actions(lh_action_iter, order->rh_action, order); } ); 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 = 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(rh_action == NULL && 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); crm_debug_4("LH-Side was: (%s/%s)", order->lh_rsc?order->lh_rsc->id:order->lh_action?order->lh_action->rsc->id:"", order->lh_action_task); return; } } else if(rh_action == NULL) { crm_debug_4("No RH-Side (%s) specified for constraint..." " ignoring", order->rh_action_task); crm_debug_4("LH-Side was: (%s/%s)", order->lh_rsc?order->lh_rsc->id:order->lh_action?order->lh_action->rsc->id:"", order->lh_action_task); return; } slist_iter( rh_action_iter, action_t, rh_actions, lpc, order_actions(lh_action, rh_action_iter, order); ); pe_free_shallow_adv(rh_actions, FALSE); } void native_rsc_location(resource_t *rsc, rsc_to_node_t *constraint) { GListPtr or_list; native_variant_data_t *native_data = NULL; crm_debug("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; } get_native_variant_data(native_data, rsc); if(constraint->node_list_rh == NULL) { crm_debug_2("RHS of constraint %s is NULL", constraint->id); return; } crm_action_debug_3(print_resource("before update", rsc,TRUE)); or_list = node_list_or( - native_data->allowed_nodes, constraint->node_list_rh, FALSE); + rsc->allowed_nodes, constraint->node_list_rh, FALSE); - pe_free_shallow(native_data->allowed_nodes); - native_data->allowed_nodes = or_list; + pe_free_shallow(rsc->allowed_nodes); + rsc->allowed_nodes = or_list; slist_iter(node_rh, node_t, constraint->node_list_rh, lpc, native_update_node_weight(rsc, constraint, node_rh, - native_data->allowed_nodes)); + rsc->allowed_nodes)); crm_action_debug_3(print_resource("after update", rsc, TRUE)); } 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); ); } gboolean native_active(resource_t *rsc, gboolean all) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); slist_iter( a_node, node_t, rsc->running_on, lpc, if(a_node->details->online == FALSE) { crm_debug("Resource %s: node %s is offline", rsc->id, a_node->details->uname); } else if(a_node->details->unclean) { crm_debug("Resource %s: node %s is unclean", rsc->id, a_node->details->uname); } else { crm_debug("Resource %s active on %s", rsc->id, a_node->details->uname); return TRUE; } ); return FALSE; } void native_print( resource_t *rsc, const char *pre_text, long options, void *print_data) { node_t *node = NULL; const char *prov = crm_element_value(rsc->xml,XML_AGENT_ATTR_PROVIDER); native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); if(rsc->running_on != NULL) { node = rsc->running_on->data; } if(options & pe_print_html) { if(rsc->is_managed == FALSE) { status_print(""); } else if(rsc->failed) { status_print(""); } else if(rsc->variant == pe_native && g_list_length(rsc->running_on) == 0) { status_print(""); } else if(g_list_length(rsc->running_on) > 1) { status_print(""); } else { status_print(""); } } if(options & pe_print_rsconly) { const char *desc = NULL; desc = crm_element_value(rsc->xml, XML_ATTR_DESC); status_print("%s%s (%s%s%s:%s)%s%s", pre_text?pre_text:"", rsc->id, prov?prov:"", prov?"::":"", crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS), crm_element_value(rsc->xml, XML_ATTR_TYPE), desc?": ":"", desc?desc:""); } else { status_print("%s%s (%s%s%s:%s):\t%s", pre_text?pre_text:"", rsc->id, prov?prov:"", prov?"::":"", crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS), crm_element_value(rsc->xml, XML_ATTR_TYPE), (rsc->variant!=pe_native)?"":node==NULL?"NOT ACTIVE":node->details->uname); } if(options & pe_print_html) { status_print(" "); } if(rsc->is_managed == FALSE) { status_print(" (unmanaged) "); } if((options & pe_print_rsconly) == 0) { } else if(g_list_length(rsc->running_on) > 1) { if(options & pe_print_html) { status_print("
    \n"); } else if((options & pe_print_printf) || (options & pe_print_ncurses)) { status_print("["); } slist_iter(node, node_t, rsc->running_on, lpc, if(options & pe_print_html) { status_print("
  • \n"); } else if((options & pe_print_printf) || (options & pe_print_ncurses)) { status_print(" "); } else if((options & pe_print_log)) { status_print("\t-"); } status_print("%s", node->details->uname); if(options & pe_print_html) { status_print("
    • \n"); } ); if(options & pe_print_html) { status_print("
\n"); } else if((options & pe_print_printf) || (options & pe_print_ncurses)) { status_print(" ]"); } } if(options & pe_print_html) { status_print("
\n"); } else if((options & pe_print_printf) || (options & pe_print_ncurses)) { status_print("\n"); } if(options & pe_print_details) { status_print("%s\t(%s%svariant=%s, priority=%f)", pre_text, rsc->provisional?"provisional, ":"", rsc->runnable?"":"non-startable, ", crm_element_name(rsc->xml), (double)rsc->priority); status_print("%s\t%d candidate colors, %d allowed nodes," " %d rsc_cons", pre_text, g_list_length(rsc->candidate_colors), - g_list_length(native_data->allowed_nodes), + g_list_length(rsc->allowed_nodes), g_list_length(rsc->rsc_cons)); } if(options & pe_print_max_details) { status_print("%s\t=== Actions.\n", pre_text); slist_iter( action, action_t, rsc->actions, lpc, log_action(LOG_DEBUG_4, "\trsc action: ", action, FALSE); ); status_print("%s\t=== Colors\n", pre_text); slist_iter( color, color_t, rsc->candidate_colors, lpc, print_color("\t", color, FALSE) ); status_print("%s\t=== Allowed Nodes\n", pre_text); slist_iter( - node, node_t, native_data->allowed_nodes, lpc, + node, node_t, rsc->allowed_nodes, lpc, print_node("\t", node, FALSE); ); } } void native_free(resource_t *rsc) { - native_variant_data_t *native_data = - (native_variant_data_t *)rsc->variant_opaque; - crm_debug_4("Freeing Allowed Nodes"); crm_free(rsc->color); - pe_free_shallow(native_data->allowed_nodes); common_free(rsc); } void native_rsc_colocation_rh_must(resource_t *rsc_lh, gboolean update_lh, resource_t *rsc_rh, gboolean update_rh) { native_variant_data_t *native_data_lh = NULL; native_variant_data_t *native_data_rh = NULL; gboolean do_merge = FALSE; GListPtr old_list = NULL; GListPtr merged_node_list = NULL; int max_pri = rsc_lh->effective_priority; if(max_pri < rsc_rh->effective_priority) { max_pri = rsc_rh->effective_priority; } rsc_lh->effective_priority = max_pri; rsc_rh->effective_priority = max_pri; get_native_variant_data(native_data_lh, rsc_lh); get_native_variant_data(native_data_rh, rsc_rh); crm_debug_2("Colocating %s with %s." " Update LHS: %s, Update RHS: %s", rsc_lh->id, rsc_rh->id, update_lh?"true":"false", update_rh?"true":"false"); if(rsc_lh->color && rsc_rh->color) { do_merge = TRUE; merged_node_list = node_list_and( rsc_lh->color->details->candidate_nodes, rsc_rh->color->details->candidate_nodes, TRUE); } else if(rsc_lh->color) { do_merge = TRUE; merged_node_list = node_list_and( rsc_lh->color->details->candidate_nodes, - native_data_rh->allowed_nodes, TRUE); + rsc_rh->allowed_nodes, TRUE); } else if(rsc_rh->color) { do_merge = TRUE; merged_node_list = node_list_and( - native_data_lh->allowed_nodes, + rsc_lh->allowed_nodes, rsc_rh->color->details->candidate_nodes, TRUE); } if(update_lh && rsc_rh != rsc_lh) { CRM_DEV_ASSERT(rsc_lh->color != rsc_rh->color); crm_free(rsc_lh->color); rsc_lh->runnable = rsc_rh->runnable; rsc_lh->provisional = rsc_rh->provisional; CRM_DEV_ASSERT(rsc_rh->color != NULL); native_assign_color(rsc_lh, rsc_rh->color); } if(update_rh && rsc_rh != rsc_lh) { CRM_DEV_ASSERT(rsc_lh->color != rsc_rh->color); crm_free(rsc_rh->color); rsc_rh->runnable = rsc_lh->runnable; rsc_rh->provisional = rsc_lh->provisional; CRM_DEV_ASSERT(rsc_lh->color != NULL); native_assign_color(rsc_rh, rsc_lh->color); } if((update_rh || update_lh) && do_merge) { crm_debug_4("Merging candidate nodes"); old_list = rsc_rh->color->details->candidate_nodes; rsc_rh->color->details->candidate_nodes = merged_node_list; pe_free_shallow(old_list); } crm_debug_4("Finished processing pecs_must constraint"); } void native_rsc_colocation_rh_mustnot(resource_t *rsc_lh, gboolean update_lh, resource_t *rsc_rh, gboolean update_rh) { color_t *color_lh = NULL; color_t *color_rh = NULL; native_variant_data_t *native_data_lh = NULL; native_variant_data_t *native_data_rh = NULL; get_native_variant_data(native_data_lh, rsc_lh); get_native_variant_data(native_data_rh, rsc_rh); crm_debug_4("Processing pecs_must_not constraint"); /* pecs_must_not */ if(update_lh) { color_rh = rsc_rh->color; if(rsc_lh->provisional && color_rh != NULL) { color_lh = add_color(rsc_lh, color_rh); color_lh->local_weight = -INFINITY; crm_debug_2("LH: Removed color %d from resource %s", color_lh->id, rsc_lh->id); crm_action_debug_3( print_color("Removed LH", color_lh, FALSE)); crm_action_debug_3( print_resource("Modified LH", rsc_lh, TRUE)); } else if(rsc_lh->provisional) { } else if(rsc_lh->color && rsc_lh->color->details->pending) { node_t *node_lh = NULL; color_lh = rsc_lh->color; node_lh = pe_find_node_id( color_lh->details->candidate_nodes, safe_val5(NULL, color_rh, details, chosen_node, details, id)); if(node_lh != NULL) { node_lh->weight = -INFINITY; crm_debug_2("LH: Removed node %s from color %d", node_lh->details->uname, color_lh->id); crm_action_debug_3( print_node("Removed LH", node_lh, FALSE)); crm_action_debug_3( print_color("Modified LH", color_lh, FALSE)); } } else { /* error, rsc marked as unrunnable above */ pe_warn("lh else"); } } if(update_rh) { color_lh = rsc_lh->color; if(rsc_rh->provisional && color_lh != NULL) { color_rh = add_color(rsc_lh, color_lh); color_rh->local_weight = -INFINITY; crm_debug_2("RH: Removed color %d from resource %s", color_rh->id, rsc_rh->id); crm_action_debug_3( print_color("Removed RH", color_rh, FALSE)); crm_action_debug_3( print_resource("Modified RH", rsc_rh, TRUE)); } else if(rsc_rh->provisional) { } else if(rsc_rh->color && rsc_rh->color->details->pending) { node_t *node_rh = NULL; color_rh = rsc_rh->color; node_rh = pe_find_node_id( color_rh->details->candidate_nodes, safe_val5(NULL, color_lh, details, chosen_node, details, id)); if(node_rh != NULL) { node_rh->weight = -INFINITY; crm_debug_2("RH: Removed node %s from color %d", node_rh->details->uname, color_rh->id); crm_action_debug_3( print_node("Removed RH", node_rh, FALSE)); crm_action_debug_3( print_color("Modified RH", color_rh, FALSE)); } } else { /* error, rsc marked as unrunnable above */ pe_warn("rh else"); } } } void native_agent_constraints(resource_t *rsc) { } gboolean native_choose_color(resource_t *rsc, color_t *no_color) { GListPtr sorted_colors = NULL; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); if(rsc->runnable == FALSE) { native_assign_color(rsc, no_color); } if(rsc->provisional == FALSE) { return !rsc->provisional; } sorted_colors = g_list_sort( rsc->candidate_colors, sort_color_weight); rsc->candidate_colors = sorted_colors; crm_debug("Choose a color from %d possibilities", g_list_length(sorted_colors)); slist_iter( this_color, color_t, rsc->candidate_colors, lpc, GListPtr intersection = NULL; GListPtr minus = NULL; int len = 0; if(this_color == NULL) { pe_err("color was NULL"); continue; } else if(this_color->local_weight < 0) { /* no valid color available */ crm_debug("no valid color available"); break; } else if(rsc->effective_priority < this_color->details->highest_priority) { minus = node_list_minus( this_color->details->candidate_nodes, - native_data->allowed_nodes, TRUE); + rsc->allowed_nodes, TRUE); len = g_list_length(minus); pe_free_shallow(minus); } else { intersection = node_list_and( this_color->details->candidate_nodes, - native_data->allowed_nodes, TRUE); + rsc->allowed_nodes, TRUE); len = g_list_length(intersection); pe_free_shallow(intersection); } if(len > 0) { crm_debug("Assigning color to %s", rsc->id); native_assign_color(rsc, this_color); break; } ); return !rsc->provisional; } void native_assign_color(resource_t *rsc, color_t *color) { native_variant_data_t *native_data = NULL; color_t *local_color = add_color(rsc, color); GListPtr intersection = NULL; GListPtr old_list = NULL; rsc->provisional = FALSE; CRM_DEV_ASSERT(local_color != NULL); if (crm_assert_failed) { pe_err("local color was NULL"); return; } local_color->details->allocated_resources = g_list_append(local_color->details->allocated_resources,rsc); if(rsc->variant == pe_native) { (local_color->details->num_resources)++; get_native_variant_data(native_data, rsc); rsc->color = copy_color(local_color); crm_debug_3("Created intersection for color %d", local_color->id); intersection = node_list_and( local_color->details->candidate_nodes, - native_data->allowed_nodes, FALSE); + rsc->allowed_nodes, FALSE); old_list = local_color->details->candidate_nodes; pe_free_shallow(old_list); local_color->details->candidate_nodes = intersection; } crm_debug("Colored resource %s with color %d", rsc->id, local_color->id); crm_action_debug_3( print_resource("Colored Resource", rsc, TRUE)); return; } void native_update_node_weight(resource_t *rsc, rsc_to_node_t *cons, node_t *cons_node, GListPtr nodes) { node_t *node_rh = NULL; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); CRM_DEV_ASSERT(cons_node != NULL); node_rh = pe_find_node_id( - native_data->allowed_nodes, cons_node->details->id); + rsc->allowed_nodes, cons_node->details->id); if(node_rh == NULL) { pe_err("Node not found - adding %s to %s", cons_node->details->id, rsc->id); node_rh = node_copy(cons_node); - native_data->allowed_nodes = g_list_append( - native_data->allowed_nodes, node_rh); + rsc->allowed_nodes = g_list_append( + rsc->allowed_nodes, node_rh); node_rh = pe_find_node_id( - native_data->allowed_nodes, cons_node->details->id); + rsc->allowed_nodes, cons_node->details->id); CRM_DEV_ASSERT(node_rh != NULL); return; } CRM_DEV_ASSERT(node_rh != NULL); if(node_rh == NULL) { pe_err("Node not found - cant update"); return; } if(node_rh->weight >= INFINITY && cons_node->weight <= -INFINITY) { pe_err("Constraint \"%s\" mixes +/- INFINITY (%s)", cons->id, rsc->id); } else if(node_rh->details->shutdown == TRUE || node_rh->details->online == FALSE || node_rh->details->unclean == TRUE) { } else if(node_rh->weight <= -INFINITY && cons_node->weight >= INFINITY) { pe_err("Constraint \"%s\" mixes +/- INFINITY (%s)", cons->id, rsc->id); } if(node_rh->fixed) { /* warning */ crm_debug_2("Constraint %s is irrelevant as the" " weight of node %s is fixed as %d (%s).", cons->id, node_rh->details->uname, node_rh->weight, rsc->id); return; } node_rh->weight = merge_weights(node_rh->weight, cons_node->weight); if(node_rh->weight <= -INFINITY) { crm_debug_3("Constraint %s (-INFINITY): node %s weight %d (%s).", cons->id, node_rh->details->uname, node_rh->weight, rsc->id); } else if(node_rh->weight >= INFINITY) { crm_debug_3("Constraint %s (+INFINITY): node %s weight %d (%s).", cons->id, node_rh->details->uname, node_rh->weight, rsc->id); } else { crm_debug_3("Constraint %s (%d): node %s weight %d (%s).", cons->id, cons_node->weight, node_rh->details->uname, node_rh->weight, rsc->id); } if(node_rh->weight < 0) { node_rh->fixed = TRUE; } crm_action_debug_3(print_node("Updated", node_rh, FALSE)); return; } gboolean native_constraint_violated( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { native_variant_data_t *native_data_lh = NULL; native_variant_data_t *native_data_rh = NULL; GListPtr result = NULL; color_t *color_lh = NULL; color_t *color_rh = NULL; GListPtr candidate_nodes_lh = NULL; GListPtr candidate_nodes_rh = NULL; gboolean matched = FALSE; get_native_variant_data(native_data_lh, rsc_lh); get_native_variant_data(native_data_rh, rsc_rh); color_lh = rsc_lh->color; color_rh = rsc_rh->color; if(constraint->strength == pecs_must_not) { matched = TRUE; } if(rsc_lh->provisional || rsc_rh->provisional) { return FALSE; } if(color_lh->details->pending && color_rh->details->pending) { candidate_nodes_lh = color_lh->details->candidate_nodes; candidate_nodes_rh = color_rh->details->candidate_nodes; } else if(color_lh->details->pending == FALSE && color_rh->details->pending == FALSE) { if(color_lh == NULL && color_rh == NULL) { return matched; } else if(color_lh == NULL || color_rh == NULL) { return !matched; } else if(color_lh->details->chosen_node == NULL && color_rh->details->chosen_node == NULL) { return matched; } else if(color_lh->details->chosen_node == NULL || color_rh->details->chosen_node == NULL) { return !matched; } else if(safe_str_eq( color_lh->details->chosen_node->details->id, color_rh->details->chosen_node->details->id)) { return matched; } return !matched; } else if(color_lh->details->pending) { candidate_nodes_lh = color_lh->details->candidate_nodes; candidate_nodes_rh = g_list_append( NULL, color_rh->details->chosen_node); } else if(color_rh->details->pending) { candidate_nodes_rh = color_rh->details->candidate_nodes; candidate_nodes_lh = g_list_append( NULL, color_lh->details->chosen_node); } result = node_list_and(candidate_nodes_lh, candidate_nodes_rh, TRUE); if(g_list_length(result) == 0 && constraint->strength == pecs_must) { /* free result */ return TRUE; } return FALSE; } /* * Remove any nodes with a -ve weight */ void filter_nodes(resource_t *rsc) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); crm_action_debug_3(print_resource("Filtering nodes for", rsc, FALSE)); slist_iter( - node, node_t, native_data->allowed_nodes, lpc, + node, node_t, rsc->allowed_nodes, lpc, if(node == NULL) { pe_err("Invalid NULL node"); } else if(node->weight < 0.0 || node->details->shutdown || node->details->online == FALSE || node->details->type == node_ping) { crm_action_debug_3(print_node("Removing", node, FALSE)); - native_data->allowed_nodes = - g_list_remove(native_data->allowed_nodes, node); + rsc->allowed_nodes = + g_list_remove(rsc->allowed_nodes, node); crm_free(node); lpc = -1; /* restart the loop */ } ); } enum rsc_role_e native_resource_state(resource_t *rsc) { if(rsc->next_role != RSC_ROLE_UNKNOWN) { return rsc->next_role; } if(rsc->role != RSC_ROLE_UNKNOWN) { return rsc->role; } return RSC_ROLE_STOPPED; } void create_notifications(resource_t *rsc, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); 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)); 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_err("%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"); 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->color->details->chosen_node; op_key = generate_op_key(rsc->id, op->task, 0); possible_matches = find_actions(rsc->actions, op_key, NULL); crm_err("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, 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_DEV_ASSERT(next_node != NULL); 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); pe_free_shallow_adv(possible_matches, FALSE); } static void dup_attr(gpointer key, gpointer value, gpointer user_data) { g_hash_table_replace(user_data, crm_strdup(key), crm_strdup(value)); } static void 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; action_wrapper_t *wrapper = NULL; const char *value = NULL; const char *task = NULL; if(op == NULL || confirm == NULL) { crm_debug_2("Op=%p confirm=%p", op, confirm); return; } CRM_DEV_ASSERT(node != NULL); value = g_hash_table_lookup(op->extra, "notify_type"); task = g_hash_table_lookup(op->extra, "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->extra, 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); crm_malloc0(wrapper, sizeof(action_wrapper_t)); wrapper->action = op; wrapper->type = pe_ordering_manditory; trigger->actions_before=g_list_append(trigger->actions_before, wrapper); wrapper = NULL; crm_malloc0(wrapper, sizeof(action_wrapper_t)); wrapper->action = trigger; wrapper->type = pe_ordering_manditory; op->actions_after = g_list_append(op->actions_after, wrapper); value = g_hash_table_lookup(op->extra, "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); wrapper = NULL; crm_malloc0(wrapper, sizeof(action_wrapper_t)); wrapper->action = trigger; wrapper->type = pe_ordering_manditory; confirm->actions_before = g_list_append( confirm->actions_before, wrapper); wrapper = NULL; crm_malloc0(wrapper, sizeof(action_wrapper_t)); wrapper->action = confirm; wrapper->type = pe_ordering_manditory; trigger->actions_after = g_list_append( trigger->actions_after, wrapper); } } 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) { crm_debug_2("%s: %s", rsc->id, op->uuid); pe_notify(rsc, node, op->post_notify, op->post_notified, n_data, data_set); } void NoRoleChange(resource_t *rsc, node_t *current, node_t *next, pe_working_set_t *data_set) { action_t *start = NULL; action_t *stop = NULL; action_t *delete = NULL; - crm_info("Executing: %s (role=%s)", - rsc->id, role2text(rsc->next_role)); + crm_debug("Executing: %s (role=%s)",rsc->id, role2text(rsc->next_role)); if(current == NULL || next == NULL) { return; } /* use StartRsc/StopRsc */ if(safe_str_neq(current->details->id, next->details->id)) { crm_info("Move resource %s\t(%s -> %s)", rsc->id, current->details->uname, next->details->uname); stop = stop_action(rsc, current, FALSE); start = start_action(rsc, next, FALSE); if(rsc->failed == FALSE && stop->runnable) { delete = delete_action(rsc, current); custom_action_order( rsc, NULL, stop, rsc, NULL, delete, pe_ordering_manditory, data_set); } } else { if(rsc->failed) { crm_info("Recover resource %s\t(%s)", rsc->id, next->details->uname); stop = stop_action(rsc, current, FALSE); start = start_action(rsc, next, FALSE); /* /\* make the restart required *\/ */ /* order_stop_start(rsc, rsc, pe_ordering_manditory); */ } else if(rsc->start_pending) { 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(start->runnable == FALSE) { rsc->next_role = RSC_ROLE_STOPPED; } else if(start->optional) { crm_info("Leave resource %s\t(%s)", rsc->id, next->details->uname); } else { crm_info("Restart resource %s\t(%s)", rsc->id, next->details->uname); } } } } gboolean StopRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { action_t *stop = NULL; action_t *delete = NULL; native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); crm_debug_2("Executing: %s", rsc->id); slist_iter( current, node_t, rsc->running_on, lpc, crm_info("Stop resource %s\t(%s)", rsc->id, current->details->uname); stop = stop_action(rsc, current, FALSE); if(rsc->failed == FALSE && stop->runnable) { delete = delete_action(rsc, current); custom_action_order( rsc, NULL, stop, rsc, NULL, delete, pe_ordering_manditory, data_set); } ); return TRUE; } gboolean StartRsc(resource_t *rsc, node_t *next, 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) { crm_info("Start resource %s\t(%s)", rsc->id, next->details->uname); start->optional = FALSE; } return TRUE; } gboolean PromoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); crm_debug_2("Executing: %s", rsc->id); CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_MASTER); crm_info("Promote resource %s\t(%s)", rsc->id, next->details->uname); promote_action(rsc, next, FALSE); return TRUE; } gboolean DemoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { native_variant_data_t *native_data = NULL; get_native_variant_data(native_data, rsc); crm_debug_2("Executing: %s", rsc->id); CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_SLAVE); slist_iter( current, node_t, rsc->running_on, lpc, crm_info("Demote resource %s\t(%s)", rsc->id, current->details->uname); demote_action(rsc, current, FALSE); ); return TRUE; } gboolean RoleError(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { crm_debug("Executing: %s", rsc->id); CRM_DEV_ASSERT(FALSE); return FALSE; } gboolean NullOp(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { crm_debug("Executing: %s", rsc->id); return FALSE; } gboolean native_create_probe(resource_t *rsc, node_t *node, action_t *complete, pe_working_set_t *data_set) { char *key = NULL; char *target_rc = NULL; action_t *probe = NULL; node_t *running = pe_find_node_id(rsc->running_on, node->details->id); if(running != NULL) { /* we already know the status of the resource on this node */ return FALSE; } target_rc = crm_itoa(EXECRA_NOT_RUNNING); key = generate_op_key(rsc->id, CRMD_ACTION_STATUS, 0); probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node, FALSE, TRUE, data_set); g_hash_table_insert(probe->extra, crm_strdup(XML_ATTR_TE_TARGET_RC), target_rc); g_hash_table_insert(probe->extra, crm_strdup(XML_ATTR_LRM_PROBE), crm_strdup(XML_BOOLEAN_TRUE)); custom_action_order(rsc, NULL, probe, rsc, NULL, complete, pe_ordering_manditory, data_set); return TRUE; } diff --git a/crm/pengine/pengine.h b/crm/pengine/pengine.h index 0c2a04f6a1..1e7112f0da 100644 --- a/crm/pengine/pengine.h +++ b/crm/pengine/pengine.h @@ -1,476 +1,477 @@ -/* $Id: pengine.h,v 1.95 2005/09/30 13:01:15 andrew Exp $ */ +/* $Id: pengine.h,v 1.96 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 */ #ifndef PENGINE__H #define PENGINE__H #include typedef struct node_s node_t; typedef struct color_s color_t; typedef struct rsc_to_node_s rsc_to_node_t; typedef struct rsc_colocation_s rsc_colocation_t; typedef struct resource_s resource_t; typedef struct lrm_agent_s lrm_agent_t; typedef struct order_constraint_s order_constraint_t; typedef struct action_s action_t; typedef struct action_wrapper_s action_wrapper_t; #include #include #include #include #include /* * The man pages for both curses and ncurses suggest inclusion of "curses.h". * We believe the following to be acceptable and portable. */ #if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES) #if defined(HAVE_NCURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW) # include # define CURSES_ENABLED 1 #elif defined(HAVE_NCURSES_NCURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW) # include # define CURSES_ENABLED 1 #elif defined(HAVE_CURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW) # include # define CURSES_ENABLED 1 #elif defined(HAVE_CURSES_CURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW) # include # define CURSES_ENABLED 1 #else # define CURSES_ENABLED 0 #endif #else # define CURSES_ENABLED 0 #endif typedef enum no_quorum_policy_e { no_quorum_freeze, no_quorum_stop, no_quorum_ignore } no_quorum_policy_t; enum pe_print_options { pe_print_log = 0x0001, pe_print_html = 0x0002, pe_print_ncurses = 0x0004, pe_print_printf = 0x0008, pe_print_details = 0x0010, pe_print_max_details = 0x0020, pe_print_rsconly = 0x0040, }; typedef struct pe_working_set_s { crm_data_t *input; ha_time_t *now; /* options extracted from the input */ char *transition_idle_timeout; char *dc_uuid; node_t *dc_node; gboolean have_quorum; gboolean stonith_enabled; gboolean symmetric_cluster; gboolean is_managed_default; gboolean stop_rsc_orphans; gboolean stop_action_orphans; int default_resource_stickiness; no_quorum_policy_t no_quorum_policy; GHashTable *config_hash; /* intermediate steps */ color_t *no_color; GListPtr nodes; GListPtr resources; GListPtr placement_constraints; GListPtr ordering_constraints; GListPtr colors; GListPtr actions; /* stats */ int num_synapse; int max_valid_nodes; int order_id; int action_id; int color_id; /* final output */ crm_data_t *graph; } pe_working_set_t; #include enum con_type { type_none, rsc_colocation, rsc_to_node, rsc_to_attr, base_weight }; enum node_type { node_ping, node_member }; enum con_strength { pecs_ignore, pecs_must, pecs_must_not, pecs_startstop }; enum action_tasks { no_action, monitor_rsc, stop_rsc, stopped_rsc, start_rsc, started_rsc, action_notify, action_notified, action_promote, action_promoted, action_demote, action_demoted, shutdown_crm, stonith_node }; enum rsc_recovery_type { recovery_stop_start, recovery_stop_only, recovery_block }; enum rsc_start_requirement { rsc_req_nothing, rsc_req_quorum, rsc_req_stonith }; enum pe_stop_fail { pesf_block, pesf_stonith, pesf_ignore }; enum pe_restart { pe_restart_restart, pe_restart_ignore }; enum pe_ordering { pe_ordering_manditory, pe_ordering_restart, pe_ordering_recover, pe_ordering_postnotify, pe_ordering_optional }; enum rsc_role_e { RSC_ROLE_UNKNOWN, RSC_ROLE_STOPPED, RSC_ROLE_STARTED, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }; #define RSC_ROLE_MAX RSC_ROLE_MASTER+1 #define RSC_ROLE_UNKNOWN_S "Unknown" #define RSC_ROLE_STOPPED_S "Stopped" #define RSC_ROLE_STARTED_S "Started" #define RSC_ROLE_SLAVE_S "Slave" #define RSC_ROLE_MASTER_S "Master" struct node_shared_s { const char *id; const char *uname; gboolean online; gboolean standby; gboolean unclean; gboolean shutdown; gboolean expected_up; gboolean is_dc; int num_resources; GListPtr running_rsc; /* resource_t* */ GHashTable *attrs; /* char* => char* */ enum node_type type; }; struct node_s { int weight; gboolean fixed; struct node_shared_s *details; }; struct color_shared_s { int id; int highest_priority; GListPtr candidate_nodes; /* node_t* */ GListPtr allocated_resources; /* resources_t* */ node_t *chosen_node; gboolean pending; int num_resources; }; struct color_s { int id; struct color_shared_s *details; int local_weight; }; struct rsc_colocation_s { const char *id; resource_t *rsc_lh; resource_t *rsc_rh; const char *state_lh; const char *state_rh; enum con_strength strength; }; struct rsc_to_node_s { const char *id; resource_t *rsc_lh; enum rsc_role_e role_filter; GListPtr node_list_rh; /* node_t* */ }; struct resource_s { const char *id; crm_data_t *xml; crm_data_t *ops_xml; + resource_t *parent; void *variant_opaque; enum pe_obj_types variant; resource_object_functions_t *fns; enum rsc_recovery_type recovery_type; enum pe_restart restart_type; int priority; int stickiness; int effective_priority; gboolean notify; gboolean is_managed; gboolean starting; gboolean stopping; gboolean runnable; gboolean provisional; gboolean failed; gboolean start_pending; gboolean orphan; GListPtr candidate_colors; /* color_t* */ GListPtr rsc_cons; /* rsc_colocation_t* */ GListPtr rsc_location; /* rsc_to_node_t* */ GListPtr actions; /* action_t* */ color_t *color; GListPtr colors; /* color_t* */ GListPtr running_on; /* node_t* */ GListPtr allowed_nodes; /* node_t* */ enum rsc_role_e role; enum rsc_role_e next_role; GHashTable *parameters; }; struct action_wrapper_s { enum pe_ordering type; action_t *action; }; enum action_fail_response { action_fail_ignore, action_fail_block, action_fail_recover, action_fail_migrate, /* action_fail_stop, */ action_fail_fence }; struct action_s { int id; resource_t *rsc; void *rsc_opaque; node_t *node; const char *task; char *uuid; crm_data_t *op_entry; gboolean pseudo; gboolean runnable; gboolean optional; gboolean failure_is_fatal; enum rsc_start_requirement needs; enum action_fail_response on_fail; enum rsc_role_e fail_role; gboolean dumped; gboolean processed; action_t *pre_notify; action_t *pre_notified; action_t *post_notify; action_t *post_notified; int seen_count; GHashTable *extra; GHashTable *notify_keys; /* do NOT free */ GListPtr actions_before; /* action_warpper_t* */ GListPtr actions_after; /* action_warpper_t* */ }; struct order_constraint_s { int id; enum pe_ordering type; void *lh_opaque; resource_t *lh_rsc; action_t *lh_action; char *lh_action_task; void *rh_opaque; resource_t *rh_rsc; action_t *rh_action; char *rh_action_task; /* (soon to be) variant specific */ /* int lh_rsc_incarnation; */ /* int rh_rsc_incarnation; */ }; extern gboolean stage0(pe_working_set_t *data_set); extern gboolean stage1(pe_working_set_t *data_set); extern gboolean stage2(pe_working_set_t *data_set); extern gboolean stage3(pe_working_set_t *data_set); extern gboolean stage4(pe_working_set_t *data_set); extern gboolean stage5(pe_working_set_t *data_set); extern gboolean stage6(pe_working_set_t *data_set); extern gboolean stage7(pe_working_set_t *data_set); extern gboolean stage8(pe_working_set_t *data_set); extern gboolean summary(GListPtr resources); extern gboolean pe_msg_dispatch(IPC_Channel *sender, void *user_data); extern gboolean process_pe_message( HA_Message *msg, crm_data_t *xml_data, IPC_Channel *sender); extern gboolean unpack_constraints( crm_data_t *xml_constraints, pe_working_set_t *data_set); extern gboolean unpack_resources( crm_data_t *xml_resources, pe_working_set_t *data_set); extern gboolean unpack_config(crm_data_t *config, pe_working_set_t *data_set); extern gboolean unpack_nodes(crm_data_t *xml_nodes, pe_working_set_t *data_set); extern gboolean unpack_status(crm_data_t *status, pe_working_set_t *data_set); extern gboolean apply_placement_constraints(pe_working_set_t *data_set); extern color_t *color_resource( resource_t *lh_resource, pe_working_set_t *data_set); extern gboolean choose_node_from_list(color_t *color); extern gboolean update_action_states(GListPtr actions); extern gboolean shutdown_constraints( node_t *node, action_t *shutdown_op, pe_working_set_t *data_set); extern gboolean stonith_constraints( node_t *node, action_t *stonith_op, action_t *shutdown_op, pe_working_set_t *data_set); extern gboolean custom_action_order( resource_t *lh_rsc, char *lh_task, action_t *lh_action, resource_t *rh_rsc, char *rh_task, action_t *rh_action, enum pe_ordering type, pe_working_set_t *data_set); #define order_start_start(rsc1,rsc2, type) \ custom_action_order(rsc1, start_key(rsc1), NULL, \ rsc2, start_key(rsc2) ,NULL, \ type, data_set) #define order_stop_stop(rsc1, rsc2, type) \ custom_action_order(rsc1, stop_key(rsc1), NULL, \ rsc2, stop_key(rsc2) ,NULL, \ type, data_set) #define order_restart(rsc1) \ custom_action_order(rsc1, stop_key(rsc1), NULL, \ rsc1, start_key(rsc1), NULL, \ pe_ordering_restart, data_set) #define order_stop_start(rsc1, rsc2, type) \ custom_action_order(rsc1, stop_key(rsc1), NULL, \ rsc2, start_key(rsc2) ,NULL, \ type, data_set) #define order_start_stop(rsc1, rsc2, type) \ custom_action_order(rsc1, start_key(rsc1), NULL, \ rsc2, stop_key(rsc2) ,NULL, \ type, data_set) #define pe_err(fmt...) { was_processing_error = TRUE; crm_err(fmt); } #define pe_warn(fmt...) { was_processing_warning = TRUE; crm_warn(fmt); } extern gboolean process_colored_constraints(resource_t *rsc); extern void graph_element_from_action( action_t *action, pe_working_set_t *data_set); extern void set_working_set_defaults(pe_working_set_t *data_set); extern void cleanup_calculations(pe_working_set_t *data_set); extern const char* transition_idle_timeout; extern gboolean was_processing_error; extern gboolean was_processing_warning; #endif diff --git a/crm/pengine/stages.c b/crm/pengine/stages.c index d2ec72c839..5fd963b90d 100644 --- a/crm/pengine/stages.c +++ b/crm/pengine/stages.c @@ -1,514 +1,515 @@ -/* $Id: stages.c,v 1.78 2005/09/27 13:22:02 andrew Exp $ */ +/* $Id: stages.c,v 1.79 2005/10/05 16:33:57 andrew Exp $ */ /* * 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 #include #include #include #include node_t *choose_fencer(action_t *stonith, node_t *node, GListPtr resources); void order_actions(action_t *lh, action_t *rh, order_constraint_t *order); /* * Unpack everything * At the end you'll have: * - A list of nodes * - A list of resources (each with any dependencies on other resources) * - A list of constraints between resources and nodes * - A list of constraints between start/stop actions * - A list of nodes that need to be stonith'd * - A list of nodes that need to be shutdown * - A list of the possible stop/start actions (without dependencies) */ gboolean stage0(pe_working_set_t *data_set) { /* int lpc; */ crm_data_t * config = get_object_root( XML_CIB_TAG_CRMCONFIG, data_set->input); crm_data_t * cib_nodes = get_object_root( XML_CIB_TAG_NODES, data_set->input); crm_data_t * cib_resources = get_object_root( XML_CIB_TAG_RESOURCES, data_set->input); crm_data_t * cib_status = get_object_root( XML_CIB_TAG_STATUS, data_set->input); crm_data_t * cib_constraints = get_object_root( XML_CIB_TAG_CONSTRAINTS, data_set->input); const char *value = crm_element_value( data_set->input, XML_ATTR_HAVE_QUORUM); crm_debug_3("Beginning unpack"); /* reset remaining global variables */ if(data_set->input == NULL) { return FALSE; } if(data_set->input != NULL && crm_element_value(data_set->input, XML_ATTR_DC_UUID) != NULL) { /* this should always be present */ data_set->dc_uuid = crm_element_value_copy( data_set->input, XML_ATTR_DC_UUID); } data_set->no_color = create_color(data_set, NULL, NULL); unpack_config(config, data_set); if(value != NULL) { cl_str_to_boolean(value, &data_set->have_quorum); } if(data_set->have_quorum == FALSE && data_set->no_quorum_policy != no_quorum_ignore) { crm_warn("We do not have quorum" " - fencing and resource management disabled"); } unpack_nodes(cib_nodes, data_set); unpack_resources(cib_resources, data_set); unpack_status(cib_status, data_set); unpack_constraints(cib_constraints, data_set); return TRUE; } /* * Count how many valid nodes we have (so we know the maximum number of * colors we can resolve). * * Apply node constraints (ie. filter the "allowed_nodes" part of resources */ gboolean stage1(pe_working_set_t *data_set) { crm_debug_3("Applying placement constraints"); slist_iter( node, node_t, data_set->nodes, lpc, if(node == NULL) { /* error */ } else if(node->weight >= 0.0 /* global weight */ && node->details->online && node->details->type == node_member) { data_set->max_valid_nodes++; } ); apply_placement_constraints(data_set); return TRUE; } /* * Choose a color for all resources from highest priority and XML_STRENGTH_VAL_MUST * dependencies to lowest, creating new colors as necessary (returned * as "colors"). * * Some nodes may be colored as a "no_color" meaning that it was unresolvable * given the current node stati and constraints. */ gboolean stage2(pe_working_set_t *data_set) { crm_debug_3("Coloring resources"); crm_debug_5("create \"no color\""); /* Take (next) highest resource */ slist_iter( lh_resource, resource_t, data_set->resources, lpc, /* if resource.provisional == FALSE, repeat */ if(lh_resource->provisional == FALSE) { /* already processed this resource */ continue; } crm_debug_2("Coloring %s::%d", lh_resource->id, lh_resource->variant); color_resource(lh_resource, data_set); /* next resource */ ); return TRUE; } /* * Check nodes for resources started outside of the LRM */ gboolean stage3(pe_working_set_t *data_set) { action_t *probe_complete = NULL; action_t *probe_node_complete = NULL; slist_iter( node, node_t, data_set->nodes, lpc, const char *probed = g_hash_table_lookup( node->details->attrs, CRMD_ACTION_PROBED); crm_info("%s probed: %s", node->details->uname, probed); if(crm_is_true(probed)) { continue; } else if(node->details->online == FALSE) { continue; } else if(node->details->unclean) { continue; } else if(probe_complete == NULL) { probe_complete = custom_action( NULL, crm_strdup(CRMD_ACTION_PROBED), CRMD_ACTION_PROBED, NULL, FALSE, TRUE, data_set); probe_complete->pseudo = TRUE; } probe_node_complete = custom_action( NULL, crm_strdup(CRMD_ACTION_PROBED), CRMD_ACTION_PROBED, node, FALSE, TRUE, data_set); add_hash_param(probe_node_complete->extra, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE); custom_action_order(NULL, NULL, probe_node_complete, NULL, NULL, probe_complete, pe_ordering_manditory, data_set); slist_iter( rsc, resource_t, data_set->resources, lpc2, if(rsc->fns->create_probe( rsc, node, probe_node_complete, data_set)) { custom_action_order( NULL, NULL, probe_complete, rsc, start_key(rsc), NULL, pe_ordering_manditory, data_set); } ); ); return TRUE; } /* * Choose a node for each (if possible) color */ gboolean stage4(pe_working_set_t *data_set) { node_t *chosen = NULL; crm_debug_3("Assigning nodes to colors"); slist_iter( color, color_t, data_set->colors, lpc, crm_debug_4("assigning node to color %d", color->id); if(color == NULL) { pe_err("NULL color detected"); continue; } else if(color->details->pending == FALSE) { continue; } choose_node_from_list(color); chosen = color->details->chosen_node; slist_iter( rsc, resource_t, color->details->allocated_resources, lpc2, crm_debug_2("Processing colocation constraints for %s" " now that color %d is allocated", rsc->id, color->details->id); if(rsc->next_role != RSC_ROLE_UNKNOWN) { } else if(chosen == NULL) { rsc->next_role = RSC_ROLE_STOPPED; } else { rsc->next_role = RSC_ROLE_STARTED; } slist_iter( constraint, rsc_colocation_t, rsc->rsc_cons, lpc, rsc->fns->rsc_colocation_lh( rsc, constraint->rsc_rh, constraint); ); ); ); crm_debug_3("done"); return TRUE; } /* * Attach nodes to the actions that need to be taken * * Mark actions XML_LRM_ATTR_OPTIONAL if possible (Ie. if the start and stop are * for the same node) * * Mark unrunnable actions */ gboolean stage5(pe_working_set_t *data_set) { crm_debug_3("Creating actions and internal ording constraints"); slist_iter( rsc, resource_t, data_set->resources, lpc, rsc->fns->create_actions(rsc, data_set); rsc->fns->internal_constraints(rsc, data_set); ); return TRUE; } /* * Create dependacies for stonith and shutdown operations */ gboolean stage6(pe_working_set_t *data_set) { action_t *down_op = NULL; action_t *stonith_op = NULL; crm_debug_3("Processing fencing and shutdown cases"); slist_iter( node, node_t, data_set->nodes, lpc, if(node->details->online && node->details->shutdown) { crm_info("Scheduling Node %s for shutdown", node->details->uname); down_op = custom_action( NULL, crm_strdup(CRM_OP_SHUTDOWN), CRM_OP_SHUTDOWN, node, FALSE, TRUE, data_set); down_op->runnable = TRUE; shutdown_constraints( node, down_op, data_set); } if(node->details->unclean && data_set->stonith_enabled == FALSE) { pe_err("Node %s is unclean!", node->details->uname); pe_warn("YOUR RESOURCES ARE NOW LIKELY COMPROMISED"); pe_warn("ENABLE STONITH TO KEEP YOUR RESOURCES SAFE"); } else if(node->details->unclean && data_set->stonith_enabled && (data_set->have_quorum || data_set->no_quorum_policy == no_quorum_ignore)) { pe_warn("Scheduling Node %s for STONITH", node->details->uname); stonith_op = custom_action( NULL, crm_strdup(CRM_OP_FENCE), CRM_OP_FENCE, node, FALSE, TRUE, data_set); stonith_op->runnable = TRUE; add_hash_param( stonith_op->extra, XML_LRM_ATTR_TARGET, node->details->uname); add_hash_param( stonith_op->extra, XML_LRM_ATTR_TARGET_UUID, node->details->id); if(down_op != NULL) { down_op->failure_is_fatal = FALSE; } } if(node->details->unclean) { stonith_constraints( node, stonith_op, down_op, data_set); } ); return TRUE; } /* * Determin the sets of independant actions and the correct order for the * actions in each set. * * Mark dependencies of un-runnable actions un-runnable * */ gboolean stage7(pe_working_set_t *data_set) { crm_debug_3("Applying ordering constraints"); slist_iter( order, order_constraint_t, data_set->ordering_constraints, lpc, /* try rsc_action-to-rsc_action */ resource_t *rsc = order->lh_rsc; if(rsc == NULL && order->lh_action) { rsc = order->lh_action->rsc; } if(rsc != NULL) { rsc->fns->rsc_order_lh(rsc, order); continue; } /* try action-to-rsc_action */ /* que off the rh resource */ rsc = order->rh_rsc; if(rsc == NULL && order->rh_action) { rsc = order->rh_action->rsc; } if(rsc != NULL) { rsc->fns->rsc_order_rh(order->lh_action, rsc, order); } else { /* fall back to action-to-action */ order_actions( order->lh_action, order->rh_action, order); } ); update_action_states(data_set->actions); return TRUE; } static int transition_id = -1; /* * Create a dependency graph to send to the transitioner (via the CRMd) */ gboolean stage8(pe_working_set_t *data_set) { char *transition_id_s = NULL; transition_id++; transition_id_s = crm_itoa(transition_id); crm_info("Creating transition graph %d.", transition_id); data_set->graph = create_xml_node(NULL, XML_TAG_GRAPH); crm_xml_add(data_set->graph, "global_timeout", data_set->transition_idle_timeout); crm_xml_add(data_set->graph, "transition_id", transition_id_s); crm_free(transition_id_s); /* errors... slist_iter(action, action_t, action_list, lpc, if(action->optional == FALSE && action->runnable == FALSE) { print_action("Ignoring", action, TRUE); } ); */ slist_iter( rsc, resource_t, data_set->resources, lpc, crm_debug_4("processing actions for rsc=%s", rsc->id); rsc->fns->expand(rsc, data_set); ); crm_log_xml_debug_3( data_set->graph, "created resource-driven action list"); /* catch any non-resource specific actions */ crm_debug_4("processing non-resource actions"); slist_iter( action, action_t, data_set->actions, lpc, graph_element_from_action(action, data_set); ); crm_log_xml_debug_3(data_set->graph, "created generic action list"); return TRUE; } gboolean choose_node_from_list(color_t *color) { /* 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 = color->details->candidate_nodes; node_t *chosen = NULL; crm_debug("Choosing node for color %d", color->id); color->details->candidate_nodes = g_list_sort(nodes, sort_node_weight); chosen = g_list_nth_data(color->details->candidate_nodes, 0); color->details->chosen_node = NULL; color->details->pending = FALSE; if(chosen == NULL) { crm_debug_2("Could not allocate a node for color %d", color->id); return FALSE; } else if(chosen->details->unclean || chosen->details->shutdown) { crm_debug_2("Even highest ranked node for color %d" " is unclean or shutting down", color->id); color->details->chosen_node = NULL; return FALSE; } else if(chosen->weight < 0) { crm_debug_2("Even highest ranked node for color %d, had weight %d", color->id, chosen->weight); color->details->chosen_node = NULL; return FALSE; } /* todo: update the old node for each resource to reflect its * new resource count */ crm_debug_2("assigned %s to color %d",chosen->details->uname,color->id); chosen->details->num_resources += color->details->num_resources; color->details->chosen_node = node_copy(chosen); + return TRUE; } diff --git a/crm/pengine/testcases/inc1.dot b/crm/pengine/testcases/inc1.dot index 35adaa52e1..7296eaa495 100644 --- a/crm/pengine/testcases/inc1.dot +++ b/crm/pengine/testcases/inc1.dot @@ -1,62 +1,62 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "probe_complete" -> "rsc1_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node2" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node2" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_start_0 node1" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] -"rsc2:child_rsc2:0_start_0 node2" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:1_start_0 node1" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:2_start_0 node2" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:0_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:2_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:3_start_0 node2" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = dashed] "probe_complete" -> "rsc3_start_0 node2" [ style = bold] "rsc2_running_0" -> "rsc3_start_0 node2" [ style = bold] } diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp index 1817db1282..e10036f725 100644 --- a/crm/pengine/testcases/inc1.exp +++ b/crm/pengine/testcases/inc1.exp @@ -1,324 +1,324 @@ - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc2.dot b/crm/pengine/testcases/inc2.dot index 601c208f4a..0447cb5b40 100644 --- a/crm/pengine/testcases/inc2.dot +++ b/crm/pengine/testcases/inc2.dot @@ -1,63 +1,63 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] -"rsc1:child_rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:2_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] -"rsc1:child_rsc1:2_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:1_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:1_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] -"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node1" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_delete_0 node1" [ style = bold] -"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0 node1" [ style = dashed] -"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node1" [ style = dashed] -"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node1" [ style = dashed] +"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node1" [ style = dashed] +"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node1" [ style = dashed] +"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node1" [ style = dashed] +"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0 node1" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_delete_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0 node1" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_delete_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0 node1" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1:child_rsc1:4_delete_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] -"rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = dashed] +"rsc1:child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = dashed] +"rsc1:child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1:child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] -"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] +"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] } diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp index cb114cb964..bf8cd12b73 100644 --- a/crm/pengine/testcases/inc2.exp +++ b/crm/pengine/testcases/inc2.exp @@ -1,267 +1,267 @@ - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - + + + + - + - + - + + + + + - + - + diff --git a/crm/pengine/testcases/inc3.dot b/crm/pengine/testcases/inc3.dot index 71d24f1398..5fc66902fa 100644 --- a/crm/pengine/testcases/inc3.dot +++ b/crm/pengine/testcases/inc3.dot @@ -1,124 +1,122 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] -"rsc1:child_rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:2_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] -"rsc1:child_rsc1:2_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:1_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:1_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] +"rsc1:child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2:child_rsc2:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:0_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc2:child_rsc2:0_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc2:child_rsc2:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc2:child_rsc2:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] -"rsc2:child_rsc2:2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_delete_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:3_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] -"rsc2:child_rsc2:3_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc2:child_rsc2:2_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc2:child_rsc2:2_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc2:child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] -"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node1" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_delete_0 node1" [ style = bold] -"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0 node1" [ style = dashed] -"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node1" [ style = dashed] -"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node1" [ style = dashed] +"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node1" [ style = dashed] +"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node1" [ style = dashed] +"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node1" [ style = dashed] +"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0 node1" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_delete_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0 node1" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_delete_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0 node1" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1:child_rsc1:4_delete_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] -"rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = dashed] +"rsc1:child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = dashed] +"rsc1:child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1:child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] -"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] +"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] -"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] -"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_delete_0 node2" [ style = bold] +"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0 node2" [ style = dashed] +"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_start_0 node2" [ style = dashed] +"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node2" [ style = dashed] "rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0 node2" [ style = dashed] "rsc2:child_rsc2:1_stop_0 node2" -> "rsc2:child_rsc2:1_start_0 node2" [ style = dashed] "rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node2" [ style = dashed] -"rsc2_stop_0" -> "rsc2:child_rsc2:2_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] -"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_delete_0 node2" [ style = bold] -"rsc2_stop_0" -> "rsc2:child_rsc2:3_stop_0 node2" [ style = dashed] -"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_start_0 node2" [ style = dashed] -"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node2" [ style = dashed] +"rsc2_stop_0" -> "rsc2:child_rsc2:2_stop_0 node2" [ style = dashed] +"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_start_0 node2" [ style = dashed] +"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node2" [ style = dashed] +"rsc2_stop_0" -> "rsc2:child_rsc2:3_stop_0 node2" [ style = bold] +"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_delete_0 node2" [ style = bold] "rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0 node2" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2:child_rsc2:4_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2:child_rsc2:4_start_0 node1" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2:child_rsc2:4_delete_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] -"rsc2:child_rsc2:0_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:0_start_0 node2" -> "rsc2_running_0" [ style = dashed] "rsc2:child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = dashed] -"rsc2:child_rsc2:2_start_0 node1" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:3_start_0 node2" -> "rsc2_running_0" [ style = dashed] +"rsc2:child_rsc2:2_start_0 node2" -> "rsc2_running_0" [ style = dashed] +"rsc2:child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] "rsc2:child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] +"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2_stopped_0" [ style = dashed] "rsc2:child_rsc2:1_stop_0 node2" -> "rsc2_stopped_0" [ style = dashed] -"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] -"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = dashed] +"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2_stopped_0" [ style = dashed] +"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] } diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp index 49fb16567c..6283376e36 100644 --- a/crm/pengine/testcases/inc3.exp +++ b/crm/pengine/testcases/inc3.exp @@ -1,526 +1,478 @@ - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - + + + + - + - + - + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + + + + + + + + + + - + - + - - - + + + - + - + - + - - - + + + - + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + - + - - - - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc4.dot b/crm/pengine/testcases/inc4.dot index ba28def361..f91bf6b1e4 100644 --- a/crm/pengine/testcases/inc4.dot +++ b/crm/pengine/testcases/inc4.dot @@ -1,109 +1,107 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2:child_rsc2:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_delete_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = bold] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = bold] "rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:1_stop_0 node1" [ style = bold] -"rsc1:child_rsc1:0_start_0 node1" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] -"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_delete_0 node1" [ style = bold] +"rsc1:child_rsc1:0_start_0 node1" -> "rsc1:child_rsc1:1_start_0 node1" [ style = bold] +"rsc1:child_rsc1:1_stop_0 node1" -> "rsc1:child_rsc1:1_start_0 node1" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:2_stop_0 node1" [ style = bold] -"rsc1:child_rsc1:1_start_0 node2" -> "rsc1:child_rsc1:2_start_0 node1" [ style = bold] -"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node1" [ style = bold] +"rsc1:child_rsc1:1_start_0 node1" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_start_0 node2" [ style = bold] +"rsc1:child_rsc1:2_stop_0 node1" -> "rsc1:child_rsc1:2_delete_0 node1" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1:child_rsc1:3_stop_0 node1" [ style = bold] -"rsc1:child_rsc1:2_start_0 node1" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] +"rsc1:child_rsc1:2_start_0 node2" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] "rsc1:child_rsc1:3_stop_0 node1" -> "rsc1:child_rsc1:3_delete_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0 node1" [ style = bold] "rsc1:child_rsc1:4_stop_0 node1" -> "rsc1:child_rsc1:4_delete_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1:child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc2:child_rsc2:1_stop_0 node2" -> "rsc2:child_rsc2:0_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] -"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_delete_0 node2" [ style = bold] +"rsc2:child_rsc2:0_stop_0 node2" -> "rsc2:child_rsc2:0_start_0 node2" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node2" [ style = bold] "rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:1_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:0_start_0 node1" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] +"rsc2:child_rsc2:0_start_0 node2" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2:child_rsc2:1_stop_0 node2" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:2_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:1_start_0 node2" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] -"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] -"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_delete_0 node2" [ style = bold] +"rsc2:child_rsc2:1_start_0 node2" -> "rsc2:child_rsc2:2_start_0 node2" [ style = bold] +"rsc2:child_rsc2:2_stop_0 node2" -> "rsc2:child_rsc2:2_start_0 node2" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2:child_rsc2:3_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:2_start_0 node1" -> "rsc2:child_rsc2:3_start_0 node2" [ style = bold] -"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_start_0 node2" [ style = bold] +"rsc2:child_rsc2:2_start_0 node2" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2:child_rsc2:3_stop_0 node2" -> "rsc2:child_rsc2:3_delete_0 node2" [ style = bold] "rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0 node2" [ style = bold] -"rsc2:child_rsc2:3_start_0 node2" -> "rsc2:child_rsc2:4_start_0 node1" [ style = bold] +"rsc2:child_rsc2:3_start_0 node1" -> "rsc2:child_rsc2:4_start_0 node1" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2:child_rsc2:4_start_0 node1" [ style = bold] "rsc2:child_rsc2:4_stop_0 node2" -> "rsc2:child_rsc2:4_delete_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2:child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2:child_rsc2:0_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] } diff --git a/crm/pengine/testcases/inc4.exp b/crm/pengine/testcases/inc4.exp index caa15cb810..58530d8c94 100644 --- a/crm/pengine/testcases/inc4.exp +++ b/crm/pengine/testcases/inc4.exp @@ -1,621 +1,608 @@ - + - + - - - + + + - - - - - + - + - + - + + + + + - + - + + + + - + - - - - + - + - + - + - + - + - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc5.dot b/crm/pengine/testcases/inc5.dot index 28e435761a..aebdc7dcaf 100644 --- a/crm/pengine/testcases/inc5.dot +++ b/crm/pengine/testcases/inc5.dot @@ -1,264 +1,264 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc1_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2:child_rsc2:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc2:child_rsc2:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc2:child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc3:child_rsc3:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc3_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc4:child_rsc4:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc4:child_rsc4:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc4:child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc5:child_rsc5:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] -"rsc5:child_rsc5:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:0_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:0_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc5:child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc5:child_rsc5:1_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc6:child_rsc6:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc6_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc6_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc6_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc6_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] -"rsc7:child_rsc7:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] -"rsc7:child_rsc7:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc7:child_rsc7:0_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc7:child_rsc7:0_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc7:child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc7:child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc7:child_rsc7:1_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc8:child_rsc8:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc8_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3:child_rsc3:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3:child_rsc3:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc4:child_rsc4:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc6:child_rsc6:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc6:child_rsc6:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc8:child_rsc8:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc8:child_rsc8:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3:child_rsc3:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3:child_rsc3:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc5:child_rsc5:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6:child_rsc6:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6:child_rsc6:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc7:child_rsc7:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8:child_rsc8:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8:child_rsc8:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node2" [ style = dashed] "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1:child_rsc1:1_start_0 node2" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = dashed] "probe_complete" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_start_0" -> "rsc1_running_0" [ style = dashed] "rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] "rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = dashed] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = dashed] "rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0 node1" [ style = dashed] "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2:child_rsc2:0_start_0 node1" [ style = dashed] "rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = dashed] "rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0 node1" [ style = bold] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2:child_rsc2:1_delete_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2:child_rsc2:0_start_0 node1" -> "rsc2_running_0" [ style = dashed] "rsc2:child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = dashed] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0 node1" [ style = dashed] "rsc3:child_rsc3:0_stop_0 node1" -> "rsc3:child_rsc3:0_start_0 node1" [ style = dashed] "rsc3_start_0" -> "rsc3:child_rsc3:0_start_0 node1" [ style = dashed] "rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0 node2" [ style = dashed] "rsc3:child_rsc3:1_stop_0 node2" -> "rsc3:child_rsc3:1_start_0 node2" [ style = dashed] "rsc3_start_0" -> "rsc3:child_rsc3:1_start_0 node2" [ style = dashed] "probe_complete" -> "rsc3_start_0" [ style = dashed] "rsc3_stopped_0" -> "rsc3_start_0" [ style = dashed] "rsc3_start_0" -> "rsc3_running_0" [ style = dashed] "rsc3:child_rsc3:0_start_0 node1" -> "rsc3_running_0" [ style = dashed] "rsc3:child_rsc3:1_start_0 node2" -> "rsc3_running_0" [ style = dashed] "rsc4_stopped_0" -> "rsc3_stop_0" [ style = dashed] "rsc3_stop_0" -> "rsc3_stopped_0" [ style = dashed] "rsc3:child_rsc3:0_stop_0 node1" -> "rsc3_stopped_0" [ style = dashed] "rsc3:child_rsc3:1_stop_0 node2" -> "rsc3_stopped_0" [ style = dashed] "rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0 node1" [ style = dashed] "rsc4:child_rsc4:0_stop_0 node1" -> "rsc4:child_rsc4:0_start_0 node1" [ style = dashed] "rsc4_start_0" -> "rsc4:child_rsc4:0_start_0 node1" [ style = dashed] "rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0 node1" [ style = bold] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4:child_rsc4:1_start_0 node2" [ style = bold] "rsc4_start_0" -> "rsc4:child_rsc4:1_start_0 node2" [ style = bold] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4:child_rsc4:1_delete_0 node1" [ style = bold] "probe_complete" -> "rsc4_start_0" [ style = bold] "rsc3_running_0" -> "rsc4_start_0" [ style = dashed] "rsc4_stopped_0" -> "rsc4_start_0" [ style = bold] "rsc4:child_rsc4:0_start_0 node1" -> "rsc4_running_0" [ style = dashed] "rsc4:child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "rsc4_start_0" -> "rsc4_running_0" [ style = bold] "rsc4:child_rsc4:0_stop_0 node1" -> "rsc4_stopped_0" [ style = dashed] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "rsc4_stop_0" -> "rsc4_stopped_0" [ style = bold] -"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0 node2" [ style = bold] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_start_0 node1" [ style = bold] -"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0 node1" [ style = bold] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_delete_0 node2" [ style = bold] -"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0 node2" [ style = dashed] -"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_start_0 node2" [ style = dashed] -"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0 node2" [ style = dashed] +"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0 node2" [ style = dashed] +"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_start_0 node2" [ style = dashed] +"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0 node2" [ style = dashed] +"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0 node2" [ style = bold] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_start_0 node1" [ style = bold] +"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0 node1" [ style = bold] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_delete_0 node2" [ style = bold] "probe_complete" -> "rsc5_start_0" [ style = bold] "rsc5_stopped_0" -> "rsc5_start_0" [ style = bold] -"rsc5:child_rsc5:0_start_0 node1" -> "rsc5_running_0" [ style = bold] -"rsc5:child_rsc5:1_start_0 node2" -> "rsc5_running_0" [ style = dashed] +"rsc5:child_rsc5:0_start_0 node2" -> "rsc5_running_0" [ style = dashed] +"rsc5:child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "rsc5_start_0" -> "rsc5_running_0" [ style = bold] "rsc6_stopped_0" -> "rsc5_stop_0" [ style = dashed] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] -"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = dashed] +"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5_stopped_0" [ style = dashed] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "rsc5_stop_0" -> "rsc5_stopped_0" [ style = bold] "rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0 node1" [ style = dashed] "rsc6:child_rsc6:0_stop_0 node1" -> "rsc6:child_rsc6:0_start_0 node1" [ style = dashed] "rsc6_start_0" -> "rsc6:child_rsc6:0_start_0 node1" [ style = dashed] "rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0 node2" [ style = dashed] "rsc6:child_rsc6:1_stop_0 node2" -> "rsc6:child_rsc6:1_start_0 node2" [ style = dashed] "rsc6_start_0" -> "rsc6:child_rsc6:1_start_0 node2" [ style = dashed] "rsc5_running_0" -> "rsc6_start_0" [ style = dashed] "probe_complete" -> "rsc6_start_0" [ style = dashed] "rsc6_stopped_0" -> "rsc6_start_0" [ style = dashed] "rsc6_start_0" -> "rsc6_running_0" [ style = dashed] "rsc6:child_rsc6:0_start_0 node1" -> "rsc6_running_0" [ style = dashed] "rsc6:child_rsc6:1_start_0 node2" -> "rsc6_running_0" [ style = dashed] "rsc6_stop_0" -> "rsc6_stopped_0" [ style = dashed] "rsc6:child_rsc6:0_stop_0 node1" -> "rsc6_stopped_0" [ style = dashed] "rsc6:child_rsc6:1_stop_0 node2" -> "rsc6_stopped_0" [ style = dashed] -"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0 node2" [ style = bold] -"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_start_0 node1" [ style = bold] -"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0 node1" [ style = bold] -"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_delete_0 node2" [ style = bold] -"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0 node2" [ style = dashed] -"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_start_0 node2" [ style = dashed] -"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0 node2" [ style = dashed] +"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0 node2" [ style = dashed] +"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_start_0 node2" [ style = dashed] +"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0 node2" [ style = dashed] +"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0 node2" [ style = bold] +"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_start_0 node1" [ style = bold] +"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0 node1" [ style = bold] +"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_delete_0 node2" [ style = bold] "probe_complete" -> "rsc7_start_0" [ style = bold] "rsc7_stopped_0" -> "rsc7_start_0" [ style = bold] -"rsc7:child_rsc7:0_start_0 node1" -> "rsc7_running_0" [ style = bold] -"rsc7:child_rsc7:1_start_0 node2" -> "rsc7_running_0" [ style = dashed] +"rsc7:child_rsc7:0_start_0 node2" -> "rsc7_running_0" [ style = dashed] +"rsc7:child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "rsc7_start_0" -> "rsc7_running_0" [ style = bold] "rsc8_stopped_0" -> "rsc7_stop_0" [ style = dashed] -"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] -"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = dashed] +"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7_stopped_0" [ style = dashed] +"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "rsc7_stop_0" -> "rsc7_stopped_0" [ style = bold] "rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0 node1" [ style = dashed] "rsc8:child_rsc8:0_stop_0 node1" -> "rsc8:child_rsc8:0_start_0 node1" [ style = dashed] "rsc8_start_0" -> "rsc8:child_rsc8:0_start_0 node1" [ style = dashed] "rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0 node2" [ style = dashed] "rsc8:child_rsc8:1_stop_0 node2" -> "rsc8:child_rsc8:1_start_0 node2" [ style = dashed] "rsc8_start_0" -> "rsc8:child_rsc8:1_start_0 node2" [ style = dashed] "rsc7_running_0" -> "rsc8_start_0" [ style = dashed] "probe_complete" -> "rsc8_start_0" [ style = dashed] "rsc8_stopped_0" -> "rsc8_start_0" [ style = dashed] "rsc8_start_0" -> "rsc8_running_0" [ style = dashed] "rsc8:child_rsc8:0_start_0 node1" -> "rsc8_running_0" [ style = dashed] "rsc8:child_rsc8:1_start_0 node2" -> "rsc8_running_0" [ style = dashed] "rsc8_stop_0" -> "rsc8_stopped_0" [ style = dashed] "rsc8:child_rsc8:0_stop_0 node1" -> "rsc8_stopped_0" [ style = dashed] "rsc8:child_rsc8:1_stop_0 node2" -> "rsc8_stopped_0" [ style = dashed] } diff --git a/crm/pengine/testcases/inc5.exp b/crm/pengine/testcases/inc5.exp index 6bcb1e4e7a..ce9ab797bb 100644 --- a/crm/pengine/testcases/inc5.exp +++ b/crm/pengine/testcases/inc5.exp @@ -1,800 +1,800 @@ - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - + + + + - + - + - + + + + + - + - + - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - + + + + - + - + - + + + + + - + - + diff --git a/crm/pengine/testcases/inc6.dot b/crm/pengine/testcases/inc6.dot index 852a09928d..286f6eb5cf 100644 --- a/crm/pengine/testcases/inc6.dot +++ b/crm/pengine/testcases/inc6.dot @@ -1,264 +1,264 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3:child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5:child_rsc5:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6:child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8:child_rsc8:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc1:child_rsc1:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc1_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2:child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc3:child_rsc3:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc3:child_rsc3:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc3_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc3_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc4:child_rsc4:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc4:child_rsc4:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc4:child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4:child_rsc4:1_delete_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc4_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc5:child_rsc5:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5:child_rsc5:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] -"rsc5:child_rsc5:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:0_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:0_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] +"rsc5:child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc5:child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc5:child_rsc5:1_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc5_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc6:child_rsc6:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc6:child_rsc6:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc6_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc6_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc6_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc6_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc7:child_rsc7:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:0_delete_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc7:child_rsc7:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7:child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc7:child_rsc7:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc7:child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc7:child_rsc7:1_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc7_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc8:child_rsc8:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc8:child_rsc8:1_start_0 node2" [ style="dashed" color="blue" fontcolor="black" ] "rsc8_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc8_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3:child_rsc3:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc3:child_rsc3:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc4:child_rsc4:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc5:child_rsc5:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc6:child_rsc6:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc6:child_rsc6:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc7:child_rsc7:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc8:child_rsc8:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc8:child_rsc8:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3:child_rsc3:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc3:child_rsc3:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc4:child_rsc4:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc5:child_rsc5:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6:child_rsc6:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc6:child_rsc6:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc7:child_rsc7:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8:child_rsc8:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc8:child_rsc8:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node2" [ style = dashed] "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1:child_rsc1:1_start_0 node2" [ style = dashed] "rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = dashed] "probe_complete" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_start_0" -> "rsc1_running_0" [ style = dashed] "rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] "rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = dashed] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = dashed] "rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0 node1" [ style = bold] "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0 node1" [ style = bold] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2:child_rsc2:1_delete_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2:child_rsc2:0_start_0 node1" -> "rsc2_running_0" [ style = bold] "rsc2:child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2:child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0 node1" [ style = dashed] "rsc3:child_rsc3:0_stop_0 node1" -> "rsc3:child_rsc3:0_start_0 node1" [ style = dashed] "rsc3_start_0" -> "rsc3:child_rsc3:0_start_0 node1" [ style = dashed] "rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0 node2" [ style = dashed] "rsc3:child_rsc3:1_stop_0 node2" -> "rsc3:child_rsc3:1_start_0 node2" [ style = dashed] "rsc3_start_0" -> "rsc3:child_rsc3:1_start_0 node2" [ style = dashed] "probe_complete" -> "rsc3_start_0" [ style = dashed] "rsc3_stopped_0" -> "rsc3_start_0" [ style = dashed] "rsc3_start_0" -> "rsc3_running_0" [ style = dashed] "rsc3:child_rsc3:0_start_0 node1" -> "rsc3_running_0" [ style = dashed] "rsc3:child_rsc3:1_start_0 node2" -> "rsc3_running_0" [ style = dashed] "rsc4_stopped_0" -> "rsc3_stop_0" [ style = dashed] "rsc3_stop_0" -> "rsc3_stopped_0" [ style = dashed] "rsc3:child_rsc3:0_stop_0 node1" -> "rsc3_stopped_0" [ style = dashed] "rsc3:child_rsc3:1_stop_0 node2" -> "rsc3_stopped_0" [ style = dashed] "rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0 node1" [ style = dashed] "rsc4:child_rsc4:0_stop_0 node1" -> "rsc4:child_rsc4:0_start_0 node1" [ style = dashed] "rsc4_start_0" -> "rsc4:child_rsc4:0_start_0 node1" [ style = dashed] "rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0 node1" [ style = bold] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4:child_rsc4:1_start_0 node2" [ style = bold] "rsc4_start_0" -> "rsc4:child_rsc4:1_start_0 node2" [ style = bold] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4:child_rsc4:1_delete_0 node1" [ style = bold] "probe_complete" -> "rsc4_start_0" [ style = bold] "rsc3_running_0" -> "rsc4_start_0" [ style = dashed] "rsc4_stopped_0" -> "rsc4_start_0" [ style = bold] "rsc4:child_rsc4:0_start_0 node1" -> "rsc4_running_0" [ style = dashed] "rsc4:child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "rsc4_start_0" -> "rsc4_running_0" [ style = bold] "rsc4:child_rsc4:0_stop_0 node1" -> "rsc4_stopped_0" [ style = dashed] "rsc4:child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "rsc4_stop_0" -> "rsc4_stopped_0" [ style = bold] -"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0 node2" [ style = bold] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_start_0 node1" [ style = bold] -"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0 node1" [ style = bold] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_delete_0 node2" [ style = bold] -"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0 node2" [ style = dashed] -"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_start_0 node2" [ style = dashed] -"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0 node2" [ style = dashed] +"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0 node2" [ style = dashed] +"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5:child_rsc5:0_start_0 node2" [ style = dashed] +"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0 node2" [ style = dashed] +"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0 node2" [ style = bold] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_start_0 node1" [ style = bold] +"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0 node1" [ style = bold] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5:child_rsc5:1_delete_0 node2" [ style = bold] "probe_complete" -> "rsc5_start_0" [ style = bold] "rsc5_stopped_0" -> "rsc5_start_0" [ style = bold] -"rsc5:child_rsc5:0_start_0 node1" -> "rsc5_running_0" [ style = bold] -"rsc5:child_rsc5:1_start_0 node2" -> "rsc5_running_0" [ style = dashed] +"rsc5:child_rsc5:0_start_0 node2" -> "rsc5_running_0" [ style = dashed] +"rsc5:child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "rsc5_start_0" -> "rsc5_running_0" [ style = bold] "rsc6_stopped_0" -> "rsc5_stop_0" [ style = dashed] -"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] -"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = dashed] +"rsc5:child_rsc5:0_stop_0 node2" -> "rsc5_stopped_0" [ style = dashed] +"rsc5:child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "rsc5_stop_0" -> "rsc5_stopped_0" [ style = bold] "rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0 node1" [ style = dashed] "rsc6:child_rsc6:0_stop_0 node1" -> "rsc6:child_rsc6:0_start_0 node1" [ style = dashed] "rsc6_start_0" -> "rsc6:child_rsc6:0_start_0 node1" [ style = dashed] "rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0 node2" [ style = dashed] "rsc6:child_rsc6:1_stop_0 node2" -> "rsc6:child_rsc6:1_start_0 node2" [ style = dashed] "rsc6_start_0" -> "rsc6:child_rsc6:1_start_0 node2" [ style = dashed] "probe_complete" -> "rsc6_start_0" [ style = bold] "rsc5_running_0" -> "rsc6_start_0" [ style = bold] "rsc6_stopped_0" -> "rsc6_start_0" [ style = dashed] "rsc6_start_0" -> "rsc6_running_0" [ style = dashed] "rsc6:child_rsc6:0_start_0 node1" -> "rsc6_running_0" [ style = dashed] "rsc6:child_rsc6:1_start_0 node2" -> "rsc6_running_0" [ style = dashed] "rsc6_stop_0" -> "rsc6_stopped_0" [ style = dashed] "rsc6:child_rsc6:0_stop_0 node1" -> "rsc6_stopped_0" [ style = dashed] "rsc6:child_rsc6:1_stop_0 node2" -> "rsc6_stopped_0" [ style = dashed] "rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0 node2" [ style = bold] -"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_start_0 node1" [ style = bold] -"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0 node1" [ style = bold] -"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_delete_0 node2" [ style = bold] +"rsc7:child_rsc7:0_stop_0 node2" -> "rsc7:child_rsc7:0_start_0 node2" [ style = bold] +"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0 node2" [ style = bold] "rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0 node2" [ style = bold] -"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_start_0 node2" [ style = bold] -"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0 node2" [ style = bold] +"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_start_0 node1" [ style = bold] +"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0 node1" [ style = bold] +"rsc7:child_rsc7:1_stop_0 node2" -> "rsc7:child_rsc7:1_delete_0 node2" [ style = bold] "probe_complete" -> "rsc7_start_0" [ style = bold] "rsc7_stopped_0" -> "rsc7_start_0" [ style = bold] -"rsc7:child_rsc7:0_start_0 node1" -> "rsc7_running_0" [ style = bold] -"rsc7:child_rsc7:1_start_0 node2" -> "rsc7_running_0" [ style = bold] +"rsc7:child_rsc7:0_start_0 node2" -> "rsc7_running_0" [ style = bold] +"rsc7:child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "rsc7_start_0" -> "rsc7_running_0" [ style = bold] "rsc8_stopped_0" -> "rsc7_stop_0" [ style = dashed] "rsc7:child_rsc7:0_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "rsc7:child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "rsc7_stop_0" -> "rsc7_stopped_0" [ style = bold] "rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0 node1" [ style = dashed] "rsc8:child_rsc8:0_stop_0 node1" -> "rsc8:child_rsc8:0_start_0 node1" [ style = dashed] "rsc8_start_0" -> "rsc8:child_rsc8:0_start_0 node1" [ style = dashed] "rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0 node2" [ style = dashed] "rsc8:child_rsc8:1_stop_0 node2" -> "rsc8:child_rsc8:1_start_0 node2" [ style = dashed] "rsc8_start_0" -> "rsc8:child_rsc8:1_start_0 node2" [ style = dashed] "rsc7_running_0" -> "rsc8_start_0" [ style = dashed] "probe_complete" -> "rsc8_start_0" [ style = dashed] "rsc8_stopped_0" -> "rsc8_start_0" [ style = dashed] "rsc8_start_0" -> "rsc8_running_0" [ style = dashed] "rsc8:child_rsc8:0_start_0 node1" -> "rsc8_running_0" [ style = dashed] "rsc8:child_rsc8:1_start_0 node2" -> "rsc8_running_0" [ style = dashed] "rsc8_stop_0" -> "rsc8_stopped_0" [ style = dashed] "rsc8:child_rsc8:0_stop_0 node1" -> "rsc8_stopped_0" [ style = dashed] "rsc8:child_rsc8:1_stop_0 node2" -> "rsc8_stopped_0" [ style = dashed] } diff --git a/crm/pengine/testcases/inc6.exp b/crm/pengine/testcases/inc6.exp index 9305688fa8..b2a5d4945c 100644 --- a/crm/pengine/testcases/inc6.exp +++ b/crm/pengine/testcases/inc6.exp @@ -1,885 +1,885 @@ - - - + + + - - - - - + - - - + + + - - - - + - - - + + + - + + + + - + - + - + + + + + - + - + - + - - - - - - - - - - - - - - + - + - + - + - + + + + + + + + + + + + + + - + - + - + diff --git a/crm/pengine/testcases/inc7.dot b/crm/pengine/testcases/inc7.dot index 7570a90eaf..0269c3eb4d 100644 --- a/crm/pengine/testcases/inc7.dot +++ b/crm/pengine/testcases/inc7.dot @@ -1,126 +1,126 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node3" [ style=bold color="green" fontcolor="black" ] "rsc0_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_start_0 node3" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:4_start_0 node3" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:2_start_0 node3" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] -"rsc2:child_rsc2:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:1_start_0 node3" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:child_rsc2:4_start_0 node3" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:2_start_0 node3" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2:child_rsc2:4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node3" -> "probe_complete" [ style = bold] "rsc0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc0_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node3" -> "probe_complete node3" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node3" -> "probe_complete node3" [ style = bold] "probe_complete" -> "rsc0_start_0 node1" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node2" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node3" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node1" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0 node2" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:4_start_0 node3" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0 node3" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0 node1" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:4_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] -"rsc1:child_rsc1:0_start_0 node2" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:1_start_0 node3" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:4_start_0 node3" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:2_start_0 node3" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:3_start_0 node1" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:4_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] -"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node2" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node3" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node1" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node2" [ style = bold] -"rsc2_start_0" -> "rsc2:child_rsc2:4_start_0 node3" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0 node2" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0 node3" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0 node1" [ style = bold] +"rsc2_start_0" -> "rsc2:child_rsc2:4_start_0 node2" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] -"rsc2:child_rsc2:0_start_0 node2" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:1_start_0 node3" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:2_start_0 node1" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:3_start_0 node2" -> "rsc2_running_0" [ style = bold] -"rsc2:child_rsc2:4_start_0 node3" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:0_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:2_start_0 node3" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] +"rsc2:child_rsc2:4_start_0 node2" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = dashed] } diff --git a/crm/pengine/testcases/inc7.exp b/crm/pengine/testcases/inc7.exp index 8eff61ec21..64ece60b86 100644 --- a/crm/pengine/testcases/inc7.exp +++ b/crm/pengine/testcases/inc7.exp @@ -1,668 +1,668 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc8.dot b/crm/pengine/testcases/inc8.dot index 73ff3eab31..d50e293a4b 100644 --- a/crm/pengine/testcases/inc8.dot +++ b/crm/pengine/testcases/inc8.dot @@ -1,76 +1,76 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "rsc0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2:child_rsc2:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:0_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1:child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "rsc0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1:child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc2:child_rsc2:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "probe_complete" -> "rsc0_start_0 node1" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node2" [ style = bold] -"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node1" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = bold] +"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] -"rsc1:child_rsc1:0_start_0 node2" -> "rsc1_running_0" [ style = bold] -"rsc1:child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold] +"rsc1:child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "probe_complete" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] "rsc2_start_0" -> "rsc2_running_0" [ style = dashed] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = dashed] } diff --git a/crm/pengine/testcases/inc8.exp b/crm/pengine/testcases/inc8.exp index 38beed4b2c..0b17b07281 100644 --- a/crm/pengine/testcases/inc8.exp +++ b/crm/pengine/testcases/inc8.exp @@ -1,369 +1,369 @@ - + - + - + - +