diff --git a/crm/pengine/complex.c b/crm/pengine/complex.c index 1862960783..ede788c924 100644 --- a/crm/pengine/complex.c +++ b/crm/pengine/complex.c @@ -1,617 +1,621 @@ -/* $Id: complex.c,v 1.79 2006/04/06 13:05:21 andrew Exp $ */ +/* $Id: complex.c,v 1.80 2006/04/10 07:23:27 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 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_children, + native_stonith_ordering, native_parameter, 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_children, + group_stonith_ordering, native_parameter, 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_children, + clone_stonith_ordering, native_parameter, 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_children, + clone_stonith_ordering, native_parameter, clone_print, clone_active, clone_resource_state, clone_create_notify_element, clone_free } }; 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, XML_RSC_ATTR_STICKINESS, XML_RSC_ATTR_FAIL_STICKINESS, XML_RSC_ATTR_TARGET_ROLE, }; const char *rsc_attrs[] = { XML_RSC_ATTR_STOPFAIL, XML_RSC_ATTR_RESTART, XML_RSC_ATTR_MANAGED, XML_RSC_ATTR_UNIQUE, XML_RSC_ATTR_NOTIFY, XML_RSC_ATTR_MULTIPLE, XML_RSC_ATTR_START, #if CRM_DEPRECATED_SINCE_2_0_4 XML_RSC_ATTR_STICKINESS, #endif }; 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)->graph_name = crm_strdup(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)->failed = FALSE; (*rsc)->start_pending = FALSE; (*rsc)->globally_unique = TRUE; (*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; (*rsc)->fail_stickiness = data_set->default_resource_fail_stickiness; value = g_hash_table_lookup((*rsc)->parameters, XML_CIB_ATTR_PRIORITY); (*rsc)->priority = crm_parse_int(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, "globally_unique"); if(value != NULL) { cl_str_to_boolean(value, &((*rsc)->globally_unique)); } 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)":""); } value = g_hash_table_lookup( (*rsc)->parameters, XML_RSC_ATTR_FAIL_STICKINESS); if(value != NULL) { (*rsc)->fail_stickiness = char2score(value); } crm_debug_2("\tNode score per failure: %d%s", (*rsc)->fail_stickiness, value == NULL?" (default)":""); value = g_hash_table_lookup( (*rsc)->parameters, XML_RSC_ATTR_TARGET_ROLE); if(value != NULL) { (*rsc)->next_role = text2role(value); if((*rsc)->next_role == RSC_ROLE_UNKNOWN) { pe_config_err("%s: Unknown value for " XML_RSC_ATTR_TARGET_ROLE": %s", (*rsc)->id, value); } } crm_debug_2("\tDesired next state: %s", (*rsc)->next_role!=RSC_ROLE_UNKNOWN?role2text((*rsc)->next_role):"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->running_on, FALSE); pe_free_shallow_adv(rsc->known_on, FALSE); 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->graph_name); crm_free(rsc->variant_opaque); crm_free(rsc); crm_debug_5("Resource freed"); } typedef struct sorted_set_s { const char *name; int score; crm_data_t *attr_set; node_t *node; GHashTable *hash; pe_working_set_t *data_set; int attrs_length; const char **attrs; } sorted_set_t; static gint sort_pairs(gconstpointer a, gconstpointer b) { const sorted_set_t *pair_a = a; const sorted_set_t *pair_b = b; if(a == NULL && b == NULL) { return 0; } else if(a == NULL) { return 1; } else if(b == NULL) { return -1; } if(safe_str_eq(pair_a->name, CIB_OPTIONS_FIRST)) { return -1; } else if(safe_str_eq(pair_b->name, CIB_OPTIONS_FIRST)) { return 1; } if(pair_a->score < pair_b->score) { return 1; } else if(pair_a->score > pair_b->score) { return -1; } return 0; } static void unpack_attr_set(gpointer data, gpointer user_data) { sorted_set_t *pair = data; sorted_set_t *unpack_data = user_data; crm_data_t *attributes = NULL; if(test_ruleset(pair->attr_set, unpack_data->node, unpack_data->data_set) == FALSE) { return; } crm_debug_2("Adding attributes from %s", pair->name); attributes = cl_get_struct(pair->attr_set, XML_TAG_ATTRS); populate_hash(attributes, unpack_data->hash, unpack_data->attrs, unpack_data->attrs_length); } static void free_pair(gpointer data, gpointer user_data) { sorted_set_t *pair = data; crm_free(pair); } 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) { GListPtr sorted = NULL; const char *score = NULL; sorted_set_t *pair = 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_filter( xml_obj, attr_set, set_name, pair = NULL; crm_malloc0(pair, sizeof(sorted_set_t)); pair->name = ID(attr_set); pair->attr_set = attr_set; score = crm_element_value(attr_set, XML_RULE_ATTR_SCORE); pair->score = char2score(score); sorted = g_list_prepend(sorted, pair); ); if(pair != NULL) { pair->hash = hash; pair->node = node; pair->attrs = attrs; pair->data_set = data_set; pair->attrs_length = attrs_length; } sorted = g_list_sort(sorted, sort_pairs); g_list_foreach(sorted, unpack_attr_set, pair); g_list_foreach(sorted, free_pair, NULL); g_list_free(sorted); } 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_filter( 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_CHECK(rsc != NULL, return); add_hash_param(rsc->parameters, name, value); } void add_hash_param(GHashTable *hash, const char *name, const char *value) { CRM_CHECK(hash != NULL, 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)); } } diff --git a/crm/pengine/complex.h b/crm/pengine/complex.h index 50040a5520..ddd5bc618c 100644 --- a/crm/pengine/complex.h +++ b/crm/pengine/complex.h @@ -1,253 +1,261 @@ -/* $Id: complex.h,v 1.31 2006/03/21 17:56:35 andrew Exp $ */ +/* $Id: complex.h,v 1.32 2006/04/10 07:23:27 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 CRM_PENGINE_COMPLEX__H #define CRM_PENGINE_COMPLEX__H #include #include #include #define n_object_classes 3 /*#define PE_OBJ_F_ ""*/ #define PE_OBJ_T_NATIVE "native" #define PE_OBJ_T_GROUP "group" #define PE_OBJ_T_INCARNATION "clone" #define PE_OBJ_T_MASTER "master" enum pe_obj_types { pe_unknown = -1, pe_native = 0, pe_group = 1, pe_clone = 2, pe_master = 3 }; extern int get_resource_type(const char *name); typedef struct notify_entry_s { resource_t *rsc; node_t *node; } notify_entry_t; typedef struct notify_data_s { GHashTable *keys; GListPtr active; /* notify_entry_t* */ GListPtr inactive; /* notify_entry_t* */ GListPtr start; /* notify_entry_t* */ GListPtr stop; /* notify_entry_t* */ GListPtr demote; /* notify_entry_t* */ GListPtr promote; /* notify_entry_t* */ GListPtr master; /* notify_entry_t* */ GListPtr slave; /* notify_entry_t* */ } notify_data_t; typedef struct resource_object_functions_s { void (*unpack)(resource_t *, pe_working_set_t *); resource_t *(*find_child)(resource_t *, const char *); int (*num_allowed_nodes)(resource_t *); color_t *(*color)(resource_t *, pe_working_set_t *); void (*create_actions)(resource_t *, pe_working_set_t *); gboolean (*create_probe)( resource_t *, node_t *, action_t *, gboolean, pe_working_set_t *); void (*internal_constraints)(resource_t *, pe_working_set_t *); void (*agent_constraints)(resource_t *); void (*rsc_colocation_lh)(resource_t *, resource_t *, rsc_colocation_t *); void (*rsc_colocation_rh)(resource_t *, resource_t *, rsc_colocation_t *); void (*rsc_order_lh)(resource_t *, order_constraint_t *); void (*rsc_order_rh)( action_t *, resource_t *, order_constraint_t *); void (*rsc_location)(resource_t *, rsc_to_node_t *); void (*expand)(resource_t *, pe_working_set_t *); GListPtr (*children)(resource_t *); + void (*stonith_ordering)( + resource_t *, action_t *, pe_working_set_t *); /* parameter result must be free'd */ char *(*parameter)( resource_t *, node_t *, gboolean, const char *, pe_working_set_t *); void (*print)(resource_t *, const char *, long, void *); gboolean (*active)(resource_t *,gboolean); enum rsc_role_e (*state)(resource_t *); void (*create_notify_element)(resource_t*,action_t*, notify_data_t*,pe_working_set_t*); void (*free)(resource_t *); } resource_object_functions_t; extern char *native_parameter( resource_t *rsc, node_t *node, gboolean create, const char *name, pe_working_set_t *data_set); extern void native_unpack(resource_t *rsc, pe_working_set_t *data_set); extern GListPtr native_children(resource_t *rsc); extern resource_t *native_find_child(resource_t *rsc, const char *id); extern int native_num_allowed_nodes(resource_t *rsc); extern color_t * native_color(resource_t *rsc, pe_working_set_t *data_set); extern void native_create_actions( resource_t *rsc, pe_working_set_t *data_set); extern void native_internal_constraints( resource_t *rsc, pe_working_set_t *data_set); extern void native_agent_constraints(resource_t *rsc); extern void native_rsc_colocation_lh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void native_rsc_colocation_rh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void native_rsc_order_lh(resource_t *rsc, order_constraint_t *order); extern void native_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order); extern void native_rsc_location(resource_t *rsc, rsc_to_node_t *constraint); extern void native_expand(resource_t *rsc, pe_working_set_t *data_set); extern void native_dump(resource_t *rsc, const char *pre_text, gboolean details); extern gboolean native_active(resource_t *rsc, gboolean all); extern void native_print(resource_t *rsc, const char *pre_text, long options, void *print_data); extern void native_print(resource_t *rsc, const char *pre_text, long options, void *print_data); extern void native_html(resource_t *rsc, const char *pre_text, FILE *stream); extern void native_free(resource_t *rsc); extern enum rsc_role_e native_resource_state(resource_t *rsc); extern void native_create_notify_element( resource_t *rsc, action_t *op, notify_data_t *n_data,pe_working_set_t *data_set); extern void native_assign_color(resource_t *rsc, color_t *color); extern gboolean native_create_probe( resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set); +extern void native_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set); extern void group_unpack(resource_t *rsc, pe_working_set_t *data_set); extern GListPtr group_children(resource_t *rsc); extern resource_t *group_find_child(resource_t *rsc, const char *id); extern int group_num_allowed_nodes(resource_t *rsc); extern color_t *group_color(resource_t *rsc, pe_working_set_t *data_set); extern void group_create_actions( resource_t *rsc, pe_working_set_t *data_set); extern void group_internal_constraints( resource_t *rsc, pe_working_set_t *data_set); extern void group_agent_constraints(resource_t *rsc); extern void group_rsc_colocation_lh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void group_rsc_colocation_rh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void group_rsc_order_lh(resource_t *rsc, order_constraint_t *order); extern void group_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order); extern void group_rsc_location(resource_t *rsc, rsc_to_node_t *constraint); extern void group_expand(resource_t *rsc, pe_working_set_t *data_set); extern gboolean group_active(resource_t *rsc, gboolean all); extern void group_print(resource_t *rsc, const char *pre_text, long options, void *print_data); extern void group_free(resource_t *rsc); extern enum rsc_role_e group_resource_state(resource_t *rsc); extern void group_create_notify_element( resource_t *rsc, action_t *op, notify_data_t *n_data,pe_working_set_t *data_set); extern gboolean group_create_probe( resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set); +extern void group_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set); extern void clone_unpack(resource_t *rsc, pe_working_set_t *data_set); extern GListPtr clone_children(resource_t *rsc); extern resource_t *clone_find_child(resource_t *rsc, const char *id); extern int clone_num_allowed_nodes(resource_t *rsc); extern color_t *clone_color(resource_t *rsc, pe_working_set_t *data_set); extern void clone_create_actions(resource_t *rsc, pe_working_set_t *data_set); extern void clone_internal_constraints( resource_t *rsc, pe_working_set_t *data_set); extern void clone_agent_constraints(resource_t *rsc); extern void clone_rsc_colocation_lh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void clone_rsc_colocation_rh( resource_t *lh_rsc, resource_t *rh_rsc, rsc_colocation_t *constraint); extern void clone_rsc_order_lh(resource_t *rsc, order_constraint_t *order); extern void clone_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order); extern void clone_rsc_location(resource_t *rsc, rsc_to_node_t *constraint); extern void clone_expand(resource_t *rsc, pe_working_set_t *data_set); extern gboolean clone_active(resource_t *rsc, gboolean all); extern void clone_print(resource_t *rsc, const char *pre_text, long options, void *print_data); extern void clone_free(resource_t *rsc); extern enum rsc_role_e clone_resource_state(resource_t *rsc); extern void clone_create_notify_element( resource_t *rsc, action_t *op, notify_data_t *n_data,pe_working_set_t *data_set); extern gboolean clone_create_probe( resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set); +extern void clone_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set); extern void master_unpack(resource_t *rsc, pe_working_set_t *data_set); extern void master_create_actions(resource_t *rsc, pe_working_set_t *data_set); extern void master_internal_constraints( resource_t *rsc, pe_working_set_t *data_set); /* extern resource_object_functions_t resource_variants[]; */ extern resource_object_functions_t resource_class_functions[]; extern gboolean common_unpack(crm_data_t *xml_obj, resource_t **rsc, GHashTable *defaults, pe_working_set_t *data_set); extern void common_print(resource_t *rsc, const char *pre_text, long options, void *print_data); extern void common_free(resource_t *rsc); extern void native_add_running( resource_t *rsc, node_t *node, pe_working_set_t *data_set); extern gboolean is_active(rsc_to_node_t *cons); extern gboolean native_constraint_violated( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint); extern void order_actions(action_t *lh, action_t *rh, order_constraint_t *order); extern void common_agent_constraints( GListPtr node_list, lrm_agent_t *agent, const char *id); extern void unpack_instance_attributes( crm_data_t *xml_obj, const char *set_name, node_t *node, GHashTable *hash, const char **attr_filter, int attrs_length, pe_working_set_t *data_set); extern void add_rsc_param(resource_t *rsc, const char *name, const char *value); extern void add_hash_param(GHashTable *hash, const char *name, const char *value); #if CURSES_ENABLED # define status_printw(fmt...) printw(fmt) #else # define status_printw(fmt...) \ crm_err("printw support requires ncurses to be available during configure"); \ do_crm_log(LOG_WARNING, NULL, NULL, fmt); #endif #define status_print(fmt...) \ if(options & pe_print_html) { \ FILE *stream = print_data; \ fprintf(stream, fmt); \ } else if(options & pe_print_ncurses) { \ status_printw(fmt); \ } else if(options & pe_print_printf) { \ FILE *stream = print_data; \ fprintf(stream, fmt); \ } else if(options & pe_print_log) { \ int log_level = *(int*)print_data; \ do_crm_log(log_level, NULL, NULL, fmt); \ } #endif diff --git a/crm/pengine/graph.c b/crm/pengine/graph.c index 697482f021..fe9a02e5a2 100644 --- a/crm/pengine/graph.c +++ b/crm/pengine/graph.c @@ -1,556 +1,538 @@ -/* $Id: graph.c,v 1.79 2006/04/07 14:28:12 andrew Exp $ */ +/* $Id: graph.c,v 1.80 2006/04/10 07:23:27 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 gboolean update_action(action_t *action); gboolean update_action_states(GListPtr actions) { crm_debug_2("Updating %d actions", g_list_length(actions)); slist_iter( action, action_t, actions, lpc, update_action(action); ); return TRUE; } #define UPDATE_THEM 1 gboolean update_action(action_t *action) { gboolean change = FALSE; enum action_tasks task = no_action; crm_debug_3("Processing action %s: %s", action->uuid, action->optional?"optional":"required"); slist_iter( other, action_wrapper_t, action->actions_before, lpc, crm_debug_3("\tChecking action %s: %s/%s", other->action->uuid, ordering_type2text(other->type), other->action->optional?"optional":"required"); if(other->type == pe_ordering_restart && action->rsc->role > RSC_ROLE_STOPPED) { crm_debug_3("Upgrading %s constraint to %s", ordering_type2text(other->type), ordering_type2text(pe_ordering_manditory)); other->type = pe_ordering_manditory; } if(other->type != pe_ordering_manditory) { crm_debug_3("\t Ignoring: %s", ordering_type2text(other->type)); continue; } else if(action->optional || other->action->optional == FALSE){ crm_debug_3("\t Ignoring: %s/%s", other->action->optional?"-":"they are not optional", action->optional?"we are optional":"-"); continue; } else if(safe_str_eq(other->action->task, CRMD_ACTION_START)) { const char *interval = g_hash_table_lookup( action->extra, "interval"); int interval_i = 0; if(interval != NULL) { interval_i = crm_parse_int(interval, NULL); if(interval_i > 0) { crm_debug_3("Ignoring: start + recurring"); continue; } } } other->action->optional = FALSE; crm_debug_2("* Marking action %s manditory because of %s", other->action->uuid, action->uuid); update_action(other->action); ); slist_iter( other, action_wrapper_t, action->actions_after, lpc, if(action->pseudo == FALSE && action->runnable == FALSE) { if(other->action->runnable == FALSE) { crm_debug_2("Action %s already un-runnable", other->action->uuid); } else if(action->optional == FALSE) { other->action->runnable = FALSE; crm_debug_2("Marking action %s un-runnable" " because of %s", other->action->uuid, action->uuid); update_action(other->action); } } crm_debug_3("\t(Recover) Checking action %s: %s/%s", other->action->uuid, ordering_type2text(other->type), other->action->optional?"optional":"required"); if(other->action->rsc == NULL) { continue; } else if(other->type == pe_ordering_recover) { if(other->action->rsc->restart_type != pe_restart_restart) { crm_debug_3("\t Ignoring: restart type %d", other->action->rsc->restart_type); continue; } } else if(other->type == pe_ordering_restart) { } else if(other->type == pe_ordering_postnotify) { CRM_CHECK(action->rsc == other->action->rsc, continue); } else { crm_debug_3("\t Ignoring: ordering %s", ordering_type2text(other->type)); continue; } if(other->action->optional == FALSE || action->optional) { crm_debug_3("\t Ignoring: %s/%s", action->optional?"we are optional":"-", other->action->optional?"-":"they are not optional"); continue; } task = text2task(action->task); switch(task) { case stop_rsc: case stopped_rsc: crm_debug_3("\t Ignoring: action %s", action->uuid); break; case start_rsc: case started_rsc: crm_debug_2("* (Recover) Marking action %s" " manditory because of %s", other->action->uuid, action->uuid); other->action->optional = FALSE; update_action(other->action); break; default: crm_debug_3("\t Ignoring: action %s", action->uuid); break; } ); if(change) { update_action(action); } crm_debug_3("Action %s: %s", action->uuid, change?"update":"untouched"); return change; } gboolean shutdown_constraints( node_t *node, action_t *shutdown_op, pe_working_set_t *data_set) { /* add the stop to the before lists so it counts as a pre-req * for the shutdown */ slist_iter( rsc, resource_t, node->details->running_rsc, lpc, if(rsc->is_managed == FALSE) { continue; } custom_action_order( rsc, stop_key(rsc), NULL, NULL, crm_strdup(CRM_OP_SHUTDOWN), shutdown_op, pe_ordering_manditory, data_set); ); return TRUE; } gboolean stonith_constraints(node_t *node, action_t *stonith_op, action_t *shutdown_op, pe_working_set_t *data_set) { GListPtr stop_actions = NULL; - gboolean run_unprotected = TRUE; if(shutdown_op != NULL && stonith_op != NULL) { /* stop everything we can via shutdown_constraints() and then * shoot the node... the shutdown has been superceeded */ shutdown_op->pseudo = TRUE; shutdown_op->runnable = TRUE; /* shutdown before stonith */ /* Give any resources a chance to shutdown normally */ crm_debug_4("Adding shutdown (%d) as an input to stonith (%d)", shutdown_op->id, stonith_op->id); custom_action_order( NULL, crm_strdup(CRM_OP_SHUTDOWN), shutdown_op, NULL, crm_strdup(CRM_OP_FENCE), stonith_op, pe_ordering_manditory, data_set); } /* * Make sure the stonith OP occurs before we start any shared resources */ - slist_iter( - rsc, resource_t, data_set->resources, lpc, - - slist_iter(action, action_t, rsc->actions, lpc2, - if(action->needs != rsc_req_stonith) { - continue; - } - if(stonith_op != NULL) { - custom_action_order( - NULL, crm_strdup(CRM_OP_FENCE), stonith_op, - rsc, NULL, action, - pe_ordering_manditory, data_set); - - } else if(run_unprotected == FALSE) { - /* mark the start unrunnable */ - action->runnable = FALSE; - - } else { - pe_err("SHARED RESOURCE %s IS NOT PROTECTED:" - " Stonith disabled", rsc->id); - } + if(stonith_op != NULL) { + slist_iter( + rsc, resource_t, data_set->resources, lpc, + rsc->fns->stonith_ordering(rsc, stonith_op, data_set); ); - ); + } /* add the stonith OP as a stop pre-req and the mark the stop * as a pseudo op - since its now redundant */ slist_iter( rsc, resource_t, node->details->running_rsc, lpc, if(rsc->is_managed == FALSE) { crm_debug_2("Skipping fencing constraints for unmanaged resource: %s", rsc->id); } else if(stonith_op != NULL) { char *key = stop_key(rsc); stop_actions = find_actions(rsc->actions, key, node); crm_free(key); slist_iter( action, action_t, stop_actions, lpc2, if(node->details->online == FALSE || rsc->failed) { crm_info("Stop of failed resource %s is" " implict after %s is fenced", rsc->id, node->details->uname); /* the stop would never complete and is * now implied by the stonith operation */ action->pseudo = TRUE; action->runnable = TRUE; custom_action_order( NULL, crm_strdup(CRM_OP_FENCE),stonith_op, rsc, start_key(rsc), NULL, pe_ordering_manditory, data_set); } else { crm_info("Moving healthy resource %s" " off %s before fencing", rsc->id, node->details->uname); /* stop healthy resources before the * stonith op */ custom_action_order( rsc, stop_key(rsc), NULL, NULL,crm_strdup(CRM_OP_FENCE),stonith_op, pe_ordering_manditory, data_set); } ); crm_debug_4("Adding stonith (%d) as an input to stop", stonith_op->id); /* } else if((rsc->unclean || node->details->unclean) */ /* && rsc->stopfail_type == pesf_block) { */ /* /\* depend on the stop action which will fail *\/ */ /* pe_err("SHARED RESOURCE %s WILL REMAIN BLOCKED" */ /* " ON NODE %s UNTIL %s", */ /* rsc->id, node->details->uname, */ /* data_set->stonith_enabled?"QUORUM RETURNS":"CLEANED UP MANUALLY"); */ /* continue; */ /* } else if((rsc->unclean || node->details->unclean) */ /* && rsc->stopfail_type == pesf_ignore) { */ /* /\* nothing to do here *\/ */ /* pe_err("SHARED RESOURCE %s IS NOT PROTECTED", rsc->id); */ /* continue; */ } ); return TRUE; } static void dup_attr(gpointer key, gpointer value, gpointer user_data) { g_hash_table_replace(user_data, crm_strdup(key), crm_strdup(value)); } crm_data_t * action2xml(action_t *action, gboolean as_input) { gboolean needs_node_info = TRUE; crm_data_t * action_xml = NULL; crm_data_t * args_xml = NULL; char *action_id_s = NULL; if(action == NULL) { return NULL; } crm_debug_4("Dumping action %d as XML", action->id); if(safe_str_eq(action->task, CRM_OP_FENCE)) { action_xml = create_xml_node(NULL, XML_GRAPH_TAG_CRM_EVENT); /* needs_node_info = FALSE; */ } else if(safe_str_eq(action->task, CRM_OP_SHUTDOWN)) { action_xml = create_xml_node(NULL, XML_GRAPH_TAG_CRM_EVENT); } else if(safe_str_eq(action->task, CRM_OP_LRM_REFRESH)) { action_xml = create_xml_node(NULL, XML_GRAPH_TAG_CRM_EVENT); /* } else if(safe_str_eq(action->task, CRMD_ACTION_PROBED)) { */ /* action_xml = create_xml_node(NULL, XML_GRAPH_TAG_CRM_EVENT); */ } else if(action->pseudo) { action_xml = create_xml_node(NULL, XML_GRAPH_TAG_PSEUDO_EVENT); needs_node_info = FALSE; } else { action_xml = create_xml_node(NULL, XML_GRAPH_TAG_RSC_OP); } action_id_s = crm_itoa(action->id); crm_xml_add(action_xml, XML_ATTR_ID, action_id_s); crm_free(action_id_s); if(action->rsc != NULL) { crm_xml_add(action_xml, XML_LRM_ATTR_RSCID, action->rsc->graph_name); } crm_xml_add(action_xml, XML_LRM_ATTR_TASK, action->task); crm_xml_add(action_xml, XML_LRM_ATTR_TASK_KEY, action->uuid); if(needs_node_info && action->node != NULL) { crm_xml_add(action_xml, XML_LRM_ATTR_TARGET, action->node->details->uname); crm_xml_add(action_xml, XML_LRM_ATTR_TARGET_UUID, action->node->details->id); } if(action->failure_is_fatal == FALSE) { g_hash_table_insert( action->extra, crm_strdup(XML_ATTR_TE_ALLOWFAIL), crm_strdup(XML_BOOLEAN_TRUE)); } if(as_input) { return action_xml; } if(action->notify_keys != NULL) { g_hash_table_foreach( action->notify_keys, dup_attr, action->extra); } if(action->rsc != NULL && action->pseudo == FALSE) { crm_data_t *rsc_xml = create_xml_node( action_xml, crm_element_name(action->rsc->xml)); copy_in_properties(rsc_xml, action->rsc->xml); crm_xml_add(rsc_xml, XML_ATTR_ID, action->rsc->graph_name); args_xml = create_xml_node(action_xml, XML_TAG_ATTRS); g_hash_table_foreach(action->extra, hash2field, args_xml); g_hash_table_foreach( action->rsc->parameters, hash2field, args_xml); } else { args_xml = create_xml_node(action_xml, XML_TAG_ATTRS); g_hash_table_foreach(action->extra, hash2field, args_xml); } crm_log_xml_debug_2(action_xml, "dumped action"); return action_xml; } static gboolean should_dump_action(action_t *action) { const char * interval = NULL; CRM_CHECK(action != NULL, return FALSE); interval = g_hash_table_lookup(action->extra, "interval"); if(action->optional) { crm_debug_5("action %d was optional", action->id); return FALSE; } else if(action->pseudo == FALSE && action->runnable == FALSE) { crm_debug_5("action %d was not runnable", action->id); return FALSE; } else if(action->dumped) { crm_debug_5("action %d was already dumped", action->id); return FALSE; } else if(action->rsc != NULL && action->rsc->is_managed == FALSE) { /* make sure probes go through */ if(safe_str_neq(action->task, CRMD_ACTION_STATUS)) { pe_warn("action %d (%s) was for an unmanaged resource (%s)", action->id, action->uuid, action->rsc->id); return FALSE; } if(interval != NULL && safe_str_neq(interval, "0")) { pe_warn("action %d (%s) was for an unmanaged resource (%s)", action->id, action->uuid, action->rsc->id); return FALSE; } } if(action->pseudo || safe_str_eq(action->task, CRM_OP_FENCE) || safe_str_eq(action->task, CRM_OP_SHUTDOWN)) { /* skip the next checks */ return TRUE; } if(action->node == NULL) { pe_err("action %d (%s) was not allocated", action->id, action->uuid); log_action(LOG_DEBUG, "Unallocated action", action, FALSE); return FALSE; } else if(action->node->details->online == FALSE) { pe_err("action %d was (%s) scheduled for offline node", action->id, action->uuid); log_action(LOG_DEBUG, "Action for offline node", action, FALSE); return FALSE; #if 0 /* but this would also affect resources that can be safely * migrated before a fencing op */ } else if(action->node->details->unclean == FALSE) { pe_err("action %d was (%s) scheduled for unclean node", action->id, action->uuid); log_action(LOG_DEBUG, "Action for unclean node", action, FALSE); return FALSE; #endif } return TRUE; } void graph_element_from_action(action_t *action, pe_working_set_t *data_set) { int last_action = -1; int synapse_priority = 0; crm_data_t * syn = NULL; crm_data_t * set = NULL; crm_data_t * in = NULL; crm_data_t * input = NULL; crm_data_t * xml_action = NULL; if(should_dump_action(action) == FALSE) { return; } action->dumped = TRUE; syn = create_xml_node(data_set->graph, "synapse"); set = create_xml_node(syn, "action_set"); in = create_xml_node(syn, "inputs"); crm_xml_add_int(syn, XML_ATTR_ID, data_set->num_synapse); data_set->num_synapse++; if(action->rsc != NULL) { synapse_priority = action->rsc->priority; } if(synapse_priority > 0) { crm_xml_add_int(syn, XML_CIB_ATTR_PRIORITY, synapse_priority); } xml_action = action2xml(action, FALSE); add_node_copy(set, xml_action); free_xml(xml_action); action->actions_before = g_list_sort( action->actions_before, sort_action_id); slist_iter(wrapper,action_wrapper_t,action->actions_before,lpc, if(last_action == wrapper->action->id) { crm_debug_2("Input (%d) %s duplicated", wrapper->action->id, wrapper->action->uuid); continue; } else if(wrapper->action->optional == TRUE) { crm_debug_2("Input (%d) %s optional", wrapper->action->id, wrapper->action->uuid); continue; } CRM_CHECK(last_action < wrapper->action->id, ;); last_action = wrapper->action->id; input = create_xml_node(in, "trigger"); xml_action = action2xml(wrapper->action, TRUE); add_node_copy(input, xml_action); free_xml(xml_action); ); } diff --git a/crm/pengine/group.c b/crm/pengine/group.c index 416669d4ff..7243beed21 100644 --- a/crm/pengine/group.c +++ b/crm/pengine/group.c @@ -1,628 +1,647 @@ -/* $Id: group.c,v 1.59 2006/04/09 12:57:37 andrew Exp $ */ +/* $Id: group.c,v 1.60 2006/04/10 07:23:27 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 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 group_variant_data_s { int num_children; GListPtr child_list; /* resource_t* */ resource_t *self; resource_t *first_child; resource_t *last_child; gboolean colocated; gboolean ordered; gboolean child_starting; gboolean child_stopping; } group_variant_data_t; #define get_group_variant_data(data, rsc) \ CRM_ASSERT(rsc != NULL); \ CRM_ASSERT(rsc->variant == pe_group); \ CRM_ASSERT(rsc->variant_opaque != NULL); \ data = (group_variant_data_t *)rsc->variant_opaque; \ void group_unpack(resource_t *rsc, pe_working_set_t *data_set) { resource_t *self = NULL; crm_data_t *xml_obj = rsc->xml; crm_data_t *xml_self = copy_xml(rsc->xml); group_variant_data_t *group_data = NULL; const char *group_ordered = g_hash_table_lookup( rsc->parameters, XML_RSC_ATTR_ORDERED); const char *group_colocated = g_hash_table_lookup( rsc->parameters, "collocated"); crm_debug_3("Processing resource %s...", rsc->id); /* rsc->id = "dummy_group_rsc_id"; */ crm_malloc0(group_data, sizeof(group_variant_data_t)); group_data->num_children = 0; group_data->self = NULL; group_data->child_list = NULL; group_data->first_child = NULL; group_data->last_child = NULL; rsc->variant_opaque = group_data; group_data->ordered = TRUE; group_data->colocated = TRUE; if(group_ordered != NULL) { cl_str_to_boolean(group_ordered, &(group_data->ordered)); } if(group_colocated != NULL) { cl_str_to_boolean(group_colocated, &(group_data->colocated)); } /* this is a bit of a hack - but simplifies everything else */ ha_msg_mod(xml_self, F_XML_TAGNAME, XML_CIB_TAG_RESOURCE); /* set_id(xml_self, "self", -1); */ if(common_unpack(xml_self, &self, NULL, data_set)) { group_data->self = self; self->restart_type = pe_restart_restart; } else { crm_log_xml_err(xml_self, "Couldnt unpack dummy child"); return; } xml_child_iter_filter( xml_obj, xml_native_rsc, XML_CIB_TAG_RESOURCE, resource_t *new_rsc = NULL; if(common_unpack(xml_native_rsc, &new_rsc, group_data->self->parameters, data_set) == FALSE) { pe_err("Failed unpacking resource %s", crm_element_value(xml_obj, XML_ATTR_ID)); continue; } crm_free(new_rsc->graph_name); if(data_set->short_rsc_names) { new_rsc->graph_name = crm_strdup(new_rsc->id); } else { new_rsc->graph_name = crm_concat( group_data->self->id, new_rsc->id, ':'); } new_rsc->parent = rsc; group_data->num_children++; group_data->child_list = g_list_append( group_data->child_list, new_rsc); if(group_data->first_child == NULL) { group_data->first_child = new_rsc; } else if(group_data->colocated) { rsc_colocation_new( "pe_group_internal_colo", pecs_must, group_data->first_child, new_rsc, NULL, NULL); } group_data->last_child = new_rsc; print_resource(LOG_DEBUG_3, "Added", new_rsc, FALSE); ); crm_debug_3("Added %d children to resource %s...", group_data->num_children, group_data->self->id); } resource_t * group_find_child(resource_t *rsc, const char *id) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); return pe_find_resource(group_data->child_list, id); } GListPtr group_children(resource_t *rsc) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); return group_data->child_list; } int group_num_allowed_nodes(resource_t *rsc) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); if(group_data->colocated == FALSE) { pe_config_err("Cannot clone non-colocated group: %s", rsc->id); return 0; } return group_data->self->fns->num_allowed_nodes(group_data->self); } color_t * group_color(resource_t *rsc, pe_working_set_t *data_set) { color_t *group_color = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, group_color = child_rsc->fns->color(child_rsc, data_set); CRM_CHECK(group_color != NULL, continue); native_assign_color(rsc, group_color); ); return group_color; } void group_update_pseudo_status(resource_t *parent, resource_t *child); void group_create_actions(resource_t *rsc, pe_working_set_t *data_set) { action_t *op = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->create_actions(child_rsc, data_set); group_update_pseudo_status(rsc, child_rsc); ); op = start_action(group_data->self, NULL, !group_data->child_starting); op->pseudo = TRUE; op = custom_action(group_data->self, started_key(group_data->self), CRMD_ACTION_STARTED, NULL, !group_data->child_starting, TRUE, data_set); op->pseudo = TRUE; op = stop_action(group_data->self, NULL, !group_data->child_stopping); op->pseudo = TRUE; op = custom_action(group_data->self, stopped_key(group_data->self), CRMD_ACTION_STOPPED, NULL, !group_data->child_stopping, TRUE, data_set); op->pseudo = TRUE; rsc->actions = group_data->self->actions; } void group_update_pseudo_status(resource_t *parent, resource_t *child) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, parent); if(group_data->child_stopping && group_data->child_starting) { return; } slist_iter( action, action_t, child->actions, lpc, if(action->optional) { continue; } if(safe_str_eq(CRMD_ACTION_STOP, action->task) && action->runnable) { group_data->child_stopping = TRUE; } else if(safe_str_eq(CRMD_ACTION_START, action->task) && action->runnable) { group_data->child_starting = TRUE; } ); } void group_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { resource_t *last_rsc = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); custom_action_order( group_data->self, stopped_key(group_data->self), NULL, group_data->self, start_key(group_data->self), NULL, pe_ordering_optional, data_set); custom_action_order( group_data->self, stop_key(group_data->self), NULL, group_data->self, stopped_key(group_data->self), NULL, pe_ordering_optional, data_set); custom_action_order( group_data->self, start_key(group_data->self), NULL, group_data->self, started_key(group_data->self), NULL, pe_ordering_optional, data_set); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, order_restart(child_rsc); if(group_data->ordered == FALSE) { order_start_start( group_data->self, child_rsc, pe_ordering_optional); custom_action_order( child_rsc, start_key(child_rsc), NULL, group_data->self, started_key(group_data->self), NULL, pe_ordering_optional, data_set); order_stop_stop( group_data->self, child_rsc, pe_ordering_optional); custom_action_order( child_rsc, stop_key(child_rsc), NULL, group_data->self, stopped_key(group_data->self), NULL, pe_ordering_optional, data_set); continue; } if(last_rsc != NULL) { order_start_start( last_rsc, child_rsc, pe_ordering_optional); order_stop_stop( child_rsc, last_rsc, pe_ordering_optional); /* recovery */ child_rsc->restart_type = pe_restart_restart; order_start_start( last_rsc, child_rsc, pe_ordering_recover); order_stop_stop( child_rsc, last_rsc, pe_ordering_recover); } else { custom_action_order( child_rsc, stop_key(child_rsc), NULL, group_data->self, stopped_key(group_data->self), NULL, pe_ordering_optional, data_set); order_start_start(group_data->self, child_rsc, pe_ordering_optional); } last_rsc = child_rsc; ); if(group_data->ordered && last_rsc != NULL) { custom_action_order( last_rsc, start_key(last_rsc), NULL, group_data->self, started_key(group_data->self), NULL, pe_ordering_optional, data_set); order_stop_stop( group_data->self, last_rsc, pe_ordering_optional); } } void group_rsc_colocation_lh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { group_variant_data_t *group_data = NULL; if(rsc_lh == NULL) { pe_err("rsc_lh was NULL for %s", constraint->id); return; } else if(rsc_rh == NULL) { pe_err("rsc_rh was NULL for %s", constraint->id); return; } crm_debug_4("Processing constraints from %s", rsc_lh->id); get_group_variant_data(group_data, rsc_lh); CRM_CHECK(group_data->self != NULL, return); if(group_data->colocated) { group_data->first_child->fns->rsc_colocation_lh( group_data->first_child, rsc_rh, constraint); return; } if(constraint->strength != pecs_must_not) { pe_config_err("Cannot colocate resources with" " non-colocated group: %s", rsc_lh->id); return; } slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->rsc_colocation_lh( child_rsc, rsc_rh, constraint); ); } void group_rsc_colocation_rh( resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc_rh); CRM_CHECK(group_data->self != NULL, return); CRM_CHECK(rsc_lh->variant == pe_native, return); crm_debug_3("Processing RH of constraint %s", constraint->id); print_resource(LOG_DEBUG_3, "LHS", rsc_lh, TRUE); if(group_data->colocated) { group_data->first_child->fns->rsc_colocation_rh( rsc_lh, group_data->first_child, constraint); return; } if(constraint->strength != pecs_must_not) { pe_config_err("Cannot colocate resources with" " non-colocated group: %s", rsc_rh->id); return; } slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->rsc_colocation_rh( rsc_lh, child_rsc, constraint); ); } void group_rsc_order_lh(resource_t *rsc, order_constraint_t *order) { char *stop_id = NULL; char *start_id = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_3("Processing LH of ordering constraint %d", order->id); if(group_data->self == NULL) { return; } stop_id = stop_key(group_data->self); start_id = start_key(group_data->self); if(safe_str_eq(order->lh_action_task, start_id)) { crm_free(order->lh_action_task); order->lh_action_task = started_key(group_data->self); } else if(safe_str_eq(order->lh_action_task, stop_id)) { crm_free(order->lh_action_task); order->lh_action_task = stopped_key(group_data->self); } crm_free(start_id); crm_free(stop_id); group_data->self->fns->rsc_order_lh(group_data->self, order); } void group_rsc_order_rh( action_t *lh_action, resource_t *rsc, order_constraint_t *order) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_3("Processing RH of ordering constraint %d", order->id); if(group_data->self == NULL) { return; } group_data->self->fns->rsc_order_rh(lh_action, group_data->self, order); } void group_rsc_location(resource_t *rsc, rsc_to_node_t *constraint) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_3("Processing actions from %s", group_data->self->id); group_data->self->fns->rsc_location(group_data->self, constraint); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->rsc_location(child_rsc, constraint); ); } void group_expand(resource_t *rsc, pe_working_set_t *data_set) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); crm_debug_3("Processing actions from %s", rsc->id); CRM_CHECK(group_data->self != NULL, return); group_data->self->fns->expand(group_data->self, data_set); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->expand(child_rsc, data_set); ); } gboolean group_active(resource_t *rsc, gboolean all) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, gboolean child_active = child_rsc->fns->active(child_rsc, all); if(all == FALSE && child_active) { return TRUE; } else if(child_active == FALSE) { return FALSE; } ); if(all) { return TRUE; } else { return FALSE; } } void group_print( resource_t *rsc, const char *pre_text, long options, void *print_data) { const char *child_text = NULL; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); if(pre_text != NULL) { child_text = " "; } else { child_text = " "; } status_print("%sResource Group: %s", pre_text?pre_text:"", rsc->id); if(options & pe_print_html) { status_print("\n
    \n"); } else if((options & pe_print_log) == 0) { status_print("\n"); } slist_iter( child_rsc, resource_t, group_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 group_free(resource_t *rsc) { group_variant_data_t *group_data = NULL; CRM_CHECK(rsc != NULL, return); get_group_variant_data(group_data, rsc); crm_debug_3("Freeing %s", rsc->id); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, crm_debug_3("Freeing child %s", child_rsc->id); child_rsc->fns->free(child_rsc); ); crm_debug_3("Freeing child list"); pe_free_shallow_adv(group_data->child_list, FALSE); if(group_data->self != NULL) { free_xml(group_data->self->xml); group_data->self->fns->free(group_data->self); } common_free(rsc); } void group_agent_constraints(resource_t *rsc) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->agent_constraints(child_rsc); ); } enum rsc_role_e group_resource_state(resource_t *rsc) { enum rsc_role_e group_role = RSC_ROLE_UNKNOWN; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, if(child_rsc->next_role > group_role) { group_role = rsc->next_role; } if(child_rsc->failed) { rsc->failed = TRUE; } ); return group_role; } void group_create_notify_element(resource_t *rsc, action_t *op, notify_data_t *n_data, pe_working_set_t *data_set) { group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, child_rsc->fns->create_notify_element( child_rsc, op, n_data, data_set); ); } gboolean group_create_probe(resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set) { gboolean any_created = FALSE; group_variant_data_t *group_data = NULL; get_group_variant_data(group_data, rsc); slist_iter( child_rsc, resource_t, group_data->child_list, lpc, any_created = child_rsc->fns->create_probe( child_rsc, node, complete, force, data_set) || any_created; ); return any_created; } + +void +group_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set) +{ +#if 0 + /* I dont think it is a good idea to be poking inside groups */ + group_variant_data_t *group_data = NULL; + get_group_variant_data(group_data, rsc); + + slist_iter( + child_rsc, resource_t, group_data->child_list, lpc, + + child_rsc->fns->stonith_ordering( + child_rsc, stonith_op, data_set); + ); +#endif + native_stonith_ordering(rsc, stonith_op, data_set); +} diff --git a/crm/pengine/incarnation.c b/crm/pengine/incarnation.c index b8c3bfaa9b..8893fecc3f 100644 --- a/crm/pengine/incarnation.c +++ b/crm/pengine/incarnation.c @@ -1,1422 +1,1452 @@ -/* $Id: incarnation.c,v 1.77 2006/04/07 14:28:12 andrew Exp $ */ +/* $Id: incarnation.c,v 1.78 2006/04/10 07:23:27 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_node_max; int active_clones; int max_nodes; gboolean interleave; gboolean ordered; 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) { char *inc_num = NULL; char *inc_max = NULL; 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_CHECK(clone_data->xml_obj_child != NULL, return FALSE); child_copy = copy_xml(clone_data->xml_obj_child); set_id(child_copy, NULL, sub_id); if(common_unpack(child_copy, &child_rsc, clone_data->self->parameters, data_set) == FALSE) { pe_err("Failed unpacking resource %s", crm_element_value(child_copy, XML_ATTR_ID)); return FALSE; } crm_free(child_rsc->graph_name); if(data_set->short_rsc_names == FALSE) { child_rsc->graph_name = crm_concat( clone_data->self->id, child_rsc->id, ':'); } else { child_rsc->graph_name = crm_strdup(child_rsc->id); } inc_num = crm_itoa(sub_id); inc_max = crm_itoa(clone_data->clone_max); crm_debug_3("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); print_resource(LOG_DEBUG_3, "Added", child_rsc, FALSE); crm_free(inc_num); crm_free(inc_max); return TRUE; } void clone_unpack(resource_t *rsc, pe_working_set_t *data_set) { int lpc = 0; crm_data_t * xml_tmp = NULL; crm_data_t * xml_obj = rsc->xml; crm_data_t *xml_self = copy_xml(rsc->xml); clone_variant_data_t *clone_data = NULL; resource_t *self = 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 = g_hash_table_lookup( rsc->parameters, XML_RSC_ATTR_INCARNATION_MAX); const char *max_clones_node = g_hash_table_lookup( rsc->parameters, 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->active_clones = 0; clone_data->xml_obj_child = NULL; clone_data->clone_max = crm_parse_int(max_clones, "1"); clone_data->clone_node_max = crm_parse_int(max_clones_node,"1"); /* this is a bit of a hack - but simplifies everything else */ ha_msg_mod(xml_self, F_XML_TAGNAME, XML_CIB_TAG_RESOURCE); /* set_id(xml_self, "self", -1); */ xml_tmp = find_xml_node(xml_obj, "operations", FALSE); if(xml_tmp != NULL) { add_node_copy(xml_self, xml_tmp); } 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_CHECK(clone_data->xml_obj_child != NULL, 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; } clone_data->notify_confirm = clone_data->self->notify; rsc->variant_opaque = clone_data; /* clone_data->gloabally_unique && */ for(lpc = 0; lpc < clone_data->clone_max; lpc++) { create_child_clone(rsc, lpc, data_set); } crm_debug_3("Added %d children to resource %s...", clone_data->clone_max, rsc->id); } 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); } GListPtr clone_children(resource_t *rsc) { clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); return clone_data->child_list; } 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_CHECK(FALSE, return 0); 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) { 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; 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); crm_debug_2("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); } } 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_2("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_CHECK(child->color != NULL, continue); current = child->color->details->chosen_node; } else if(child->running_on != NULL) { current = child->running_on->data; } if(current == NULL) { crm_debug_2("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) { crm_debug_3("Skipping optional: %s", action->uuid); continue; } else if(action->pseudo == FALSE && action->runnable == FALSE){ crm_debug_3("Skipping unrunnable: %s", action->uuid); continue; } else if(safe_str_eq(CRMD_ACTION_STOP, action->task)) { crm_debug_2("Stopping due to: %s", action->uuid); *stopping = TRUE; } else if(safe_str_eq(CRMD_ACTION_START, action->task)) { if(action->runnable == FALSE) { crm_debug_3("Skipping pseduo-op: %s run=%d, pseudo=%d", action->uuid, action->runnable, action->pseudo); } else { crm_debug_2("Starting due to: %s", action->uuid); crm_debug_3("%s run=%d, pseudo=%d", action->uuid, action->runnable, action->pseudo); *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); rsc->actions = clone_data->self->actions; } 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->graph_name, "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->graph_name, "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->graph_name, "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->graph_name, "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_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, print_resource(LOG_DEBUG_3, "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_CHECK(rsc_lh != NULL, return); CRM_CHECK(rsc_lh->variant == pe_native, return); crm_debug_3("Processing RH of constraint %s", constraint->id); 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 { print_resource(LOG_DEBUG_3, "LHS", rsc_lh, FALSE); } get_clone_variant_data(clone_data, rsc_rh); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, print_resource(LOG_DEBUG_3, "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 list_len = 100 * clones; char *rsc_list_s = NULL; char *node_list_s = NULL; const char *uname = NULL; const char *rsc_id = NULL; const char *last_rsc_id = NULL; clone_expand_reallocate: if(rsc_list != NULL) { crm_free(*rsc_list); crm_malloc0(*rsc_list, sizeof(char)*list_len); CRM_ASSERT(*rsc_list != NULL); rsc_list_s = *rsc_list; rsc_len = 0; } if(node_list != NULL) { crm_free(*node_list); crm_malloc0(*node_list, sizeof(char)*list_len); CRM_ASSERT(*node_list != NULL); node_list_s = *node_list; node_len = 0; } /* keep BEAM extra happy */ if(rsc_list_s == NULL || node_list_s == NULL) { return; } slist_iter(entry, notify_entry_t, list, lpc, rsc_id = entry->rsc->id; CRM_CHECK(rsc_id != NULL, rsc_id = "__none__"); uname = NULL; if(entry->node) { uname = entry->node->details->uname; } CRM_CHECK(uname != NULL, uname = "__none__"); /* filter dups */ if(safe_str_eq(rsc_id, last_rsc_id)) { continue; } last_rsc_id = rsc_id; if(rsc_list != NULL) { if(rsc_len + 1 + strlen(rsc_id) >= list_len) { list_len *= 2; goto clone_expand_reallocate; } sprintf(rsc_list_s, "%s ", rsc_id); rsc_list_s += strlen(rsc_id); rsc_len += strlen(rsc_id); rsc_list_s++; rsc_len++; } if(node_list != NULL) { if(node_len + 1 + strlen(uname) >= list_len) { list_len *= 2; goto clone_expand_reallocate; } sprintf(node_list_s, "%s ", uname); node_list_s += strlen(uname); node_len += strlen(uname); node_list_s++; node_len++; } ); } 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; 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); } if(rsc->notify && n_data->start) { n_data->start = g_list_sort( n_data->start, sort_notify_entries); rsc_list = NULL; node_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); } if(rsc->notify && n_data->demote) { n_data->demote = g_list_sort( n_data->demote, sort_notify_entries); rsc_list = NULL; node_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); } 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); } 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); } 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); } 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); } 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); } /* 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", pre_text?pre_text:"", clone_data->self->id); } else { status_print("%sClone Set: %s", pre_text?pre_text:"", clone_data->self->id); } if(options & pe_print_html) { status_print("\n
    \n"); } else if((options & pe_print_log) == 0) { 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); ); } static gint sort_rsc_id(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); return strcmp(resource1->id, resource2->id); } gboolean clone_create_probe(resource_t *rsc, node_t *node, action_t *complete, gboolean force, pe_working_set_t *data_set) { int num_probes = 0; gboolean any_created = FALSE; clone_variant_data_t *clone_data = NULL; get_clone_variant_data(clone_data, rsc); /* we may already be running but under different names */ slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, if(num_probes >= clone_data->clone_node_max) { return FALSE; } if(pe_find_node_id(child_rsc->running_on, node->details->id)) { num_probes++; } ); clone_data->child_list = g_list_sort( clone_data->child_list, sort_rsc_id); slist_iter( child_rsc, resource_t, clone_data->child_list, lpc, if(num_probes >= clone_data->clone_node_max) { break; } if(child_rsc->fns->create_probe( child_rsc, node, complete, force, data_set)) { any_created = TRUE; num_probes++; } ); return any_created; } + +void +clone_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set) +{ + gboolean is_fencing = 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, + + const char *class = crm_element_value( + child_rsc->xml, XML_AGENT_ATTR_CLASS); + + if(safe_str_eq(class, "stonith")) { + is_fencing = TRUE; + break; + } + ); + + if(is_fencing && stonith_op != NULL) { + char *key = started_key(rsc); + crm_err("Ordering %s before stonith op", key); + custom_action_order( + rsc, key, NULL, + NULL, crm_strdup(CRM_OP_FENCE), stonith_op, + pe_ordering_optional, data_set); + } +} diff --git a/crm/pengine/native.c b/crm/pengine/native.c index 3c2d6e0f37..e0d49bd92d 100644 --- a/crm/pengine/native.c +++ b/crm/pengine/native.c @@ -1,2059 +1,2100 @@ -/* $Id: native.c,v 1.123 2006/03/31 15:33:16 andrew Exp $ */ +/* $Id: native.c,v 1.124 2006/04/10 07:23:27 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 #define DELETE_THEN_REFRESH 1 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 Recurring(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); gboolean DeleteRsc(resource_t *rsc, node_t *node, 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_MASTER, }, /* Slave */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_UNKNOWN, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }, /* Master */ { RSC_ROLE_STOPPED, RSC_ROLE_SLAVE, RSC_ROLE_UNKNOWN, RSC_ROLE_SLAVE, RSC_ROLE_MASTER, }, }; gboolean (*rsc_action_matrix[RSC_ROLE_MAX][RSC_ROLE_MAX])(resource_t*,node_t*,pe_working_set_t*) = { /* Current State */ /* Next State: Unknown Stopped Started Slave Master */ /* Unknown */ { RoleError, StopRsc, RoleError, RoleError, RoleError, }, /* Stopped */ { RoleError, NullOp, StartRsc, StartRsc, RoleError, }, /* Started */ { RoleError, StopRsc, NullOp, NullOp, PromoteRsc, }, /* Slave */ { RoleError, StopRsc, RoleError, NullOp, PromoteRsc, }, /* Master */ { RoleError, RoleError, RoleError, DemoteRsc, NullOp, }, }; typedef struct native_variant_data_s { /* 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) { CRM_CHECK(node != NULL, return); slist_iter( a_node, node_t, rsc->running_on, lpc, CRM_CHECK(a_node != NULL, return); if(safe_str_eq(a_node->details->id, node->details->id)) { return; } ); rsc->running_on = g_list_append(rsc->running_on, node); if(rsc->variant == pe_native) { node->details->running_rsc = g_list_append( node->details->running_rsc, rsc); } if(rsc->variant != pe_native) { } else if(rsc->is_managed == FALSE) { crm_info("resource %s isnt managed", rsc->id); rsc2node_new( "not_managed_default", rsc, INFINITY, node, data_set); return; #if 0 } else if(rsc->failed) { crm_info("Skipping resource stickiness for failed resource %s", rsc->id); #endif } else if(rsc->stickiness > 0 || rsc->stickiness < 0) { rsc2node_new("stickiness", rsc, rsc->stickiness, node,data_set); crm_debug("Resource %s: preferring current location (%s/%s)", rsc->id, node->details->uname, node->details->id); } if(rsc->variant == pe_native && g_list_length(rsc->running_on) > 1) { const char *type = crm_element_value(rsc->xml, XML_ATTR_TYPE); const char *class = crm_element_value( rsc->xml, XML_AGENT_ATTR_CLASS); /* these are errors because hardly any gets it right * at the moment and this way the might notice */ pe_err("Resource %s::%s:%s appears to be active on %d nodes.", class, type, rsc->id, g_list_length(rsc->running_on)); cl_log(LOG_ERR, "See %s for more information.", HAURL("v2/faq/resource_too_active")); 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_debug_2("Resource %s is active on: %s", rsc->id, node->details->uname); } if(rsc->parent != NULL) { native_add_running(rsc->parent, node, data_set); } } 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)); 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; } GListPtr native_children(resource_t *rsc) { return NULL; } static void hash_copy_field(gpointer key, gpointer value, gpointer user_data) { const char *name = key; const char *s_value = value; GHashTable *hash_copy = user_data; g_hash_table_insert(hash_copy, crm_strdup(name), crm_strdup(s_value)); } char * native_parameter( resource_t *rsc, node_t *node, gboolean create, const char *name, pe_working_set_t *data_set) { char *value_copy = NULL; const char *value = NULL; CRM_CHECK(rsc != NULL, return NULL); + CRM_CHECK(name != NULL && strlen(name) != 0, return NULL); crm_debug_2("Looking up %s in %s", name, rsc->id); if(create) { GHashTable *local_hash = NULL; if(node != NULL) { crm_debug_2("Creating hash with node %s", node->details->uname); } else { crm_debug_2("Creating default hash"); } local_hash = g_hash_table_new_full( g_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str); g_hash_table_foreach( rsc->parameters, hash_copy_field, local_hash); unpack_instance_attributes( rsc->xml, XML_TAG_ATTR_SETS, node, local_hash, NULL, 0, data_set); value = g_hash_table_lookup(local_hash, name); if(value != NULL) { value_copy = crm_strdup(value); } g_hash_table_destroy(local_hash); } else { value = g_hash_table_lookup(rsc->parameters, name); if(value != NULL) { value_copy = crm_strdup(value); } } return value_copy; } int native_num_allowed_nodes(resource_t *rsc) { int num_nodes = 0; 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, 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; print_resource(LOG_DEBUG_2, "Coloring: ", rsc, FALSE); if(rsc->provisional == FALSE) { return rsc->color; } rsc->rsc_cons = g_list_sort( rsc->rsc_cons, sort_cons_strength); /*------ Pre-processing */ slist_iter( constraint, rsc_colocation_t, rsc->rsc_cons, lpc, crm_action_debug_3( print_rsc_colocation( "Pre-Processing constraint", constraint,FALSE)); rsc->fns->rsc_colocation_lh( rsc, constraint->rsc_rh, constraint); ); 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(rsc->allowed_nodes != NULL) { /* filter out nodes with a negative weight */ filter_nodes(rsc); new_color = create_color(data_set, rsc, rsc->allowed_nodes); native_assign_color(rsc, new_color); } if(new_color == NULL) { pe_warn("Resource %s cannot run anywhere", rsc->id); print_resource(LOG_ERR, "No color: ", rsc, FALSE); native_assign_color(rsc, data_set->no_color); new_color = data_set->no_color; } } rsc->provisional = FALSE; /*------ Post-processing */ #if 1 slist_iter( constraint, rsc_colocation_t, rsc->rsc_cons, lpc, crm_action_debug_3( print_rsc_colocation( "Post-Processing constraint",constraint,FALSE)); rsc->fns->rsc_colocation_lh( rsc, constraint->rsc_rh, constraint); ); #endif print_resource(LOG_DEBUG_3, "Colored", rsc, TRUE); return new_color; } void Recurring(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 *interval = NULL; const char *node_uname = NULL; int interval_ms = 0; action_t *mon = NULL; gboolean is_optional = TRUE; GListPtr possible_matches = NULL; crm_debug_2("Creating recurring actions for %s", rsc->id); if(node != NULL) { node_uname = node->details->uname; } xml_child_iter_filter( rsc->ops_xml, operation, "op", is_optional = TRUE; name = crm_element_value(operation, "name"); interval = crm_element_value(operation, "interval"); interval_ms = crm_get_msec(interval); if(interval_ms <= 0) { continue; } key = generate_op_key(rsc->graph_name, name, interval_ms); if(start != NULL) { crm_debug_3("Marking %s %s due to %s", key, start->optional?"optional":"manditory", start->uuid); is_optional = start->optional; } else { crm_debug_2("Marking %s optional", key); is_optional = TRUE; } /* start a monitor for an already active resource */ possible_matches = find_actions_exact(rsc->actions, key, node); if(possible_matches == NULL) { is_optional = FALSE; crm_debug_3("Marking %s manditory: not active", key); } value = crm_element_value(operation, "role"); if((rsc->next_role == RSC_ROLE_MASTER && value == NULL) || (value != NULL && text2role(value) != rsc->next_role)) { int log_level = LOG_DEBUG_2; const char *foo = "Ignoring"; if(is_optional) { log_level = LOG_INFO; foo = "Cancelling"; /* its running : cancel it */ mon = custom_action( rsc, crm_strdup(key), CRMD_ACTION_CANCEL, node, FALSE, TRUE, data_set); mon->task = CRMD_ACTION_CANCEL; add_hash_param(mon->extra, "interval", interval); add_hash_param(mon->extra, "task", name); custom_action_order( rsc, NULL, mon, rsc, promote_key(rsc), NULL, pe_ordering_optional, data_set); mon = NULL; } crm_log_maybe(log_level, "%s action %s (%s vs. %s)", foo , key, value?value:role2text(RSC_ROLE_SLAVE), role2text(rsc->next_role)); crm_free(key); key = NULL; continue; } mon = custom_action(rsc, key, name, node, is_optional, TRUE, data_set); if(is_optional) { crm_debug("%s\t %s (optional)", crm_str(node_uname), mon->uuid); } if(start == NULL || start->runnable == FALSE) { crm_debug("%s\t %s (cancelled : start un-runnable)", crm_str(node_uname), mon->uuid); mon->runnable = FALSE; } else if(node == NULL || node->details->online == FALSE || node->details->unclean) { crm_debug("%s\t %s (cancelled : no node available)", crm_str(node_uname), mon->uuid); mon->runnable = FALSE; } else if(mon->optional == FALSE) { crm_notice("%s\t %s", crm_str(node_uname),mon->uuid); } custom_action_order(rsc, start_key(rsc), NULL, NULL, crm_strdup(key), mon, pe_ordering_restart, data_set); if(rsc->next_role == RSC_ROLE_MASTER) { char *running_master = crm_itoa(EXECRA_RUNNING_MASTER); add_hash_param(mon->extra, XML_ATTR_TE_TARGET_RC, running_master); custom_action_order( rsc, promote_key(rsc), NULL, rsc, NULL, mon, pe_ordering_optional, data_set); crm_free(running_master); } ); } 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; 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_debug("%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; while(role != rsc->next_role) { next_role = rsc_state_matrix[role][rsc->next_role]; crm_debug_2("Executing: %s->%s (%s)", role2text(role), role2text(next_role), rsc->id); if(rsc_action_matrix[role][next_role]( rsc, chosen, data_set) == FALSE) { break; } role = next_role; } if(rsc->next_role != RSC_ROLE_STOPPED && rsc->is_managed) { start = start_action(rsc, chosen, TRUE); Recurring(rsc, start, chosen, data_set); } } void native_internal_constraints(resource_t *rsc, pe_working_set_t *data_set) { 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; 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; crm_debug_2("Applying %s (%s) to %s", constraint->id, role2text(constraint->role_filter), rsc->id); /* take "lifetime" into account */ if(constraint == NULL) { pe_err("Constraint is NULL"); return; } else if(rsc == NULL) { pe_err("LHS of rsc_to_node (%s) is NULL", constraint->id); return; } else if(constraint->role_filter > 0 && constraint->role_filter != rsc->next_role) { crm_debug("Constraint (%s) is not active (role : %s)", constraint->id, role2text(constraint->role_filter)); return; } else if(is_active(constraint) == FALSE) { crm_debug_2("Constraint (%s) is not active", constraint->id); return; } if(constraint->node_list_rh == NULL) { crm_debug_2("RHS of constraint %s is NULL", constraint->id); return; } print_resource(LOG_DEBUG_3, "before update: ", rsc, TRUE); or_list = node_list_or( rsc->allowed_nodes, constraint->node_list_rh, FALSE); pe_free_shallow(rsc->allowed_nodes); rsc->allowed_nodes = or_list; slist_iter(node_rh, node_t, constraint->node_list_rh, lpc, native_update_node_weight(rsc, constraint, node_rh, rsc->allowed_nodes) ); print_resource(LOG_DEBUG_3, "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) { 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; } struct print_data_s { long options; void *print_data; }; static void native_print_attr(gpointer key, gpointer value, gpointer user_data) { long options = ((struct print_data_s*)user_data)->options; void *print_data = ((struct print_data_s*)user_data)->print_data; status_print("Option: %s = %s\n", (char*)key, (char*)value); } void native_print( resource_t *rsc, const char *pre_text, long options, void *print_data) { node_t *node = NULL; const char *prov = NULL; const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS); if(safe_str_eq(class, "ocf")) { prov = crm_element_value(rsc->xml, XML_AGENT_ATTR_PROVIDER); } 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) || g_list_length(rsc->running_on) > 1) { const char *desc = NULL; desc = crm_element_value(rsc->xml, XML_ATTR_DESC); status_print("%s%s\t(%s%s%s:%s)%s%s", pre_text?pre_text:"", rsc->id, prov?prov:"", prov?"::":"", class, crm_element_value(rsc->xml, XML_ATTR_TYPE), desc?": ":"", desc?desc:""); } else { status_print("%s%s\t(%s%s%s:%s):\t%s %s%s", pre_text?pre_text:"", rsc->id, prov?prov:"", prov?"::":"", class, crm_element_value(rsc->xml, XML_ATTR_TYPE), (rsc->variant!=pe_native)?"":role2text(rsc->role), (rsc->variant!=pe_native)?"":node!=NULL?node->details->uname:"", rsc->is_managed?"":" (unmanaged) "); #if CURSES_ENABLED if(options & pe_print_ncurses) { move(-1, 0); } #endif } if(options & pe_print_html) { status_print(" "); } if((options & pe_print_rsconly)) { } 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%s", node->details->uname); } else if((options & pe_print_printf) || (options & pe_print_ncurses)) { status_print("\t%s", node->details->uname); } else if((options & pe_print_log)) { status_print("\t%d : %s", lpc, node->details->uname); } else { 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) { struct print_data_s pdata; pdata.options = options; pdata.print_data = print_data; g_hash_table_foreach(rsc->parameters, native_print_attr, &pdata); } if(options & pe_print_dev) { 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(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, rsc->allowed_nodes, lpc, print_node("\t", node, FALSE); ); } } void native_free(resource_t *rsc) { crm_debug_4("Freeing Allowed Nodes"); crm_free(rsc->color); common_free(rsc); } void native_rsc_colocation_rh_must(resource_t *rsc_lh, gboolean update_lh, resource_t *rsc_rh, gboolean update_rh) { 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; 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, rsc_rh->allowed_nodes, TRUE); } else if(rsc_rh->color) { do_merge = TRUE; merged_node_list = node_list_and( rsc_lh->allowed_nodes, rsc_rh->color->details->candidate_nodes, TRUE); } if(update_lh && rsc_rh != rsc_lh) { CRM_CHECK(rsc_lh->color != rsc_rh->color, return); crm_free(rsc_lh->color); rsc_lh->runnable = rsc_rh->runnable; rsc_lh->provisional = rsc_rh->provisional; CRM_CHECK(rsc_rh->color != NULL, return); native_assign_color(rsc_lh, rsc_rh->color); } if(update_rh && rsc_rh != rsc_lh) { CRM_CHECK(rsc_lh->color != rsc_rh->color, return); crm_free(rsc_rh->color); rsc_rh->runnable = rsc_lh->runnable; rsc_rh->provisional = rsc_lh->provisional; CRM_CHECK(rsc_lh->color != NULL, return); 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; crm_debug_4("Processing pecs_must_not constraint"); /* pecs_must_not */ color_rh = rsc_rh->color; color_lh = rsc_lh->color; if(update_lh) { 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)); print_resource(LOG_DEBUG_3, "Modified LH", rsc_lh,TRUE); } else if(rsc_lh->provisional) { } else if(color_lh && color_lh->details->pending) { node_t *node_lh = NULL; 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"); } } /* in case anything was modified */ color_rh = rsc_rh->color; color_lh = rsc_lh->color; if(update_rh) { 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)); print_resource(LOG_DEBUG_3, "Modified RH", rsc_rh, TRUE); } else if(rsc_rh->provisional) { } else if(color_rh && color_rh->details->pending) { node_t *node_rh = NULL; 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; 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_2("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, rsc->allowed_nodes, TRUE); len = g_list_length(minus); pe_free_shallow(minus); } else { intersection = node_list_and( this_color->details->candidate_nodes, 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) { color_t *local_color = add_color(rsc, color); GListPtr intersection = NULL; GListPtr old_list = NULL; rsc->provisional = FALSE; CRM_CHECK(local_color != 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)++; 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, rsc->allowed_nodes, FALSE); old_list = local_color->details->candidate_nodes; pe_free_shallow(old_list); local_color->details->candidate_nodes = intersection; } crm_debug_2("Colored resource %s with color %d", rsc->id, local_color->id); print_resource(LOG_DEBUG_3, "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; CRM_CHECK(cons_node != NULL, return); node_rh = pe_find_node_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); rsc->allowed_nodes = g_list_append( rsc->allowed_nodes, node_rh); node_rh = pe_find_node_id( rsc->allowed_nodes, cons_node->details->id); CRM_CHECK(node_rh != NULL, return); return; } CRM_CHECK(node_rh != NULL, return); 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) { 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; 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) { print_resource(LOG_DEBUG_3, "Filtering nodes for: ", rsc, FALSE); slist_iter( 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)); 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) { 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->graph_name, op->task, 0); possible_matches = find_actions(rsc->actions, op_key, NULL); crm_debug_2("Creating notificaitons for: %s (%s->%s)", op->uuid, role2text(rsc->role), role2text(rsc->next_role)); if(rsc->role == rsc->next_role) { register_state(rsc, next_node, n_data); } slist_iter( local_op, action_t, possible_matches, lpc, local_op->notify_keys = n_data->keys; if(local_op->optional == FALSE) { registered = TRUE; register_activity(rsc, task, local_op->node, n_data); } ); /* stop / demote */ if(rsc->role != RSC_ROLE_STOPPED) { if(task == stop_rsc || task == action_demote) { slist_iter( current_node, node_t, rsc->running_on, lpc, pe_pre_notify(rsc, current_node, op, n_data, data_set); if(task == action_demote || registered == FALSE) { pe_post_notify(rsc, current_node, op, n_data, data_set); } ); } } /* start / promote */ if(rsc->next_role != RSC_ROLE_STOPPED) { CRM_CHECK(next_node != NULL, return); 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_CHECK(node != NULL, return); 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->graph_name, 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; GListPtr possible_matches = NULL; 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_notice("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); possible_matches = find_recurring_actions(rsc->actions, next); slist_iter(match, action_t, possible_matches, lpc, if(match->optional == FALSE) { crm_err("Found bad recurring action: %s", match->uuid); match->optional = TRUE; } ); if(data_set->remove_after_stop) { DeleteRsc(rsc, current, data_set); } } else { if(rsc->failed) { crm_notice("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_notice("Leave resource %s\t(%s)", rsc->id, next->details->uname); } else { crm_notice("Restart resource %s\t(%s)", rsc->id, next->details->uname); } } } } gboolean StopRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { action_t *stop = NULL; crm_debug_2("Executing: %s", rsc->id); slist_iter( current, node_t, rsc->running_on, lpc, crm_notice(" %s\tStop %s", current->details->uname, rsc->id); stop = stop_action(rsc, current, FALSE); if(data_set->remove_after_stop) { DeleteRsc(rsc, current, data_set); } ); return TRUE; } gboolean DeleteRsc(resource_t *rsc, node_t *node, pe_working_set_t *data_set) { action_t *delete = NULL; action_t *refresh = NULL; char *stop = NULL; char *start = NULL; if(rsc->failed) { crm_debug_2("Resource %s not deleted from %s: failed", rsc->id, node->details->uname); return FALSE; } else if(node == NULL) { crm_debug_2("Resource %s not deleted: NULL node", rsc->id); return FALSE; } else if(node->details->unclean || node->details->online == FALSE) { crm_debug_2("Resource %s not deleted from %s: unrunnable", rsc->id, node->details->uname); return FALSE; } stop = stop_key(rsc); start = start_key(rsc); crm_notice("Removing %s from %s", rsc->id, node->details->uname); delete = delete_action(rsc, node); custom_action_order( rsc, stop, NULL, rsc, NULL, delete, pe_ordering_optional, data_set); custom_action_order( rsc, NULL, delete, rsc, start, NULL, pe_ordering_manditory, data_set); #if DELETE_THEN_REFRESH refresh = custom_action( NULL, crm_strdup(CRM_OP_LRM_REFRESH), CRM_OP_LRM_REFRESH, node, FALSE, TRUE, data_set); add_hash_param(refresh->extra, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE); custom_action_order( rsc, NULL, delete, NULL, NULL, refresh, pe_ordering_optional, data_set); #endif 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_notice(" %s\tStart %s", next->details->uname, rsc->id); start->optional = FALSE; } return TRUE; } gboolean PromoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { crm_debug_2("Executing: %s", rsc->id); CRM_CHECK(rsc->next_role == RSC_ROLE_MASTER, return FALSE); crm_notice("%s\tPromote %s", next->details->uname, rsc->id); promote_action(rsc, next, FALSE); return TRUE; } gboolean DemoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set) { crm_debug_2("Executing: %s", rsc->id); /* CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE); */ slist_iter( current, node_t, rsc->running_on, lpc, crm_notice("%s\tDeomote %s", current->details->uname, rsc->id); 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_CHECK(FALSE, return 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, gboolean force, pe_working_set_t *data_set) { char *key = NULL; char *target_rc = NULL; action_t *probe = NULL; node_t *running = NULL; CRM_CHECK(node != NULL, return FALSE); if(rsc->orphan) { return FALSE; } running = pe_find_node_id(rsc->known_on, node->details->id); if(force == FALSE && running != NULL) { /* we already know the status of the resource on this node */ return FALSE; } target_rc = crm_itoa(EXECRA_NOT_RUNNING); key = generate_op_key(rsc->graph_name, CRMD_ACTION_STATUS, 0); probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node, FALSE, TRUE, data_set); crm_notice("%s: Created probe for %s", node->details->uname, rsc->id); 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; } + + +void +native_stonith_ordering( + resource_t *rsc, action_t *stonith_op, pe_working_set_t *data_set) +{ + gboolean run_unprotected = TRUE; + const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS); + crm_err("%s class: %s", rsc->id, class); + + if(stonith_op != NULL && safe_str_eq(class, "stonith")) { + char *key = start_key(rsc); + crm_err("Ordering %s before stonith op", key); + custom_action_order( + rsc, key, NULL, + NULL, crm_strdup(CRM_OP_FENCE), stonith_op, + pe_ordering_optional, data_set); + return; + } + + slist_iter(action, action_t, rsc->actions, lpc2, + if(action->needs != rsc_req_stonith) { + continue; + } + if(stonith_op != NULL) { + custom_action_order( + NULL, crm_strdup(CRM_OP_FENCE), stonith_op, + rsc, NULL, action, + pe_ordering_manditory, data_set); + + } else if(run_unprotected == FALSE) { + /* mark the start unrunnable */ + action->runnable = FALSE; + + } else { + pe_err("SHARED RESOURCE %s IS NOT PROTECTED:" + " Stonith disabled", rsc->id); + } + ); +} diff --git a/crm/pengine/regression.sh b/crm/pengine/regression.sh index eb34397ddb..79dca69ab7 100755 --- a/crm/pengine/regression.sh +++ b/crm/pengine/regression.sh @@ -1,209 +1,210 @@ #!/bin/bash # 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 # . regression.core.sh create_mode="true" echo Generating test outputs for these tests... echo "" echo Done. echo "" echo Performing the following tests... create_mode="false" echo "" do_test simple1 "Offline " do_test simple2 "Start " do_test simple3 "Start 2 " do_test simple4 "Start Failed" do_test simple6 "Stop Start " do_test simple7 "Shutdown " #do_test simple8 "Stonith " #do_test simple9 "Lower version" #do_test simple10 "Higher version" do_test simple11 "Priority (ne)" do_test simple12 "Priority (eq)" do_test simple8 "Stickiness" echo "" do_test date-1 "Dates" do_test comments "Comments" do_test params-0 "Params: No change" do_test params-1 "Params: Changed" do_test params-2 "Params: Resource definition" do_test orphan-0 "Orphan ignore" do_test orphan-1 "Orphan stop" do_test target-0 "Target Role : baseline" do_test target-1 "Target Role : test" echo "" do_test master-0 "Stopped -> Slave" do_test master-1 "Stopped -> Promote" do_test master-2 "Stopped -> Promote : notify" do_test master-3 "Stopped -> Promote : master location" do_test master-4 "Started -> Promote : master location" do_test master-5 "Promoted -> Promoted" do_test master-6 "Promoted -> Promoted (2)" echo "" do_test rsc_dep1 "Must not " do_test rsc_dep3 "Must " do_test rsc_dep5 "Must not 3 " do_test rsc_dep7 "Must 3 " do_test rsc_dep10 "Must (but cant)" do_test rsc_dep2 "Must (running) " do_test rsc_dep8 "Must (running : alt) " do_test rsc_dep4 "Must (running + move)" echo "" do_test order1 "Order start 1 " do_test order2 "Order start 2 " do_test order3 "Order stop " do_test order4 "Order (multiple) " do_test order5 "Order (move) " do_test order6 "Order (move w/ restart) " #echo "" #do_test agent1 "version: lt (empty)" #do_test agent2 "version: eq " #do_test agent3 "version: gt " echo "" do_test attrs1 "string: eq (and) " do_test attrs2 "string: lt / gt (and)" do_test attrs3 "string: ne (or) " do_test attrs4 "string: exists " do_test attrs5 "string: not_exists " do_test attrs6 "is_dc: true " do_test attrs7 "is_dc: false " echo "" do_test mon-rsc-1 "Schedule Monitor - start" do_test mon-rsc-2 "Schedule Monitor - move " do_test mon-rsc-3 "Schedule Monitor - pending start " do_test mon-rsc-4 "Schedule Monitor - move/pending start" echo "" do_test rec-rsc-0 "Resource Recover - no start " do_test rec-rsc-1 "Resource Recover - start " do_test rec-rsc-2 "Resource Recover - monitor " do_test rec-rsc-3 "Resource Recover - stop - ignore" do_test rec-rsc-4 "Resource Recover - stop - block " do_test rec-rsc-5 "Resource Recover - stop - fence " do_test rec-rsc-6 "Resource Recover - multiple - restart" do_test rec-rsc-7 "Resource Recover - multiple - stop " do_test rec-rsc-8 "Resource Recover - multiple - block " echo "" do_test quorum-1 "No quorum - ignore" do_test quorum-2 "No quorum - freeze" do_test quorum-3 "No quorum - stop " do_test quorum-4 "No quorum - start anyway" do_test quorum-5 "No quorum - start anyway (group)" do_test quorum-6 "No quorum - start anyway (clone)" echo "" do_test rec-node-1 "Node Recover - Startup - no fence" do_test rec-node-2 "Node Recover - Startup - fence " do_test rec-node-3 "Node Recover - HA down - no fence" do_test rec-node-4 "Node Recover - HA down - fence " do_test rec-node-5 "Node Recover - CRM down - no fence" do_test rec-node-6 "Node Recover - CRM down - fence " do_test rec-node-7 "Node Recover - no quorum - ignore " do_test rec-node-8 "Node Recover - no quorum - freeze " do_test rec-node-9 "Node Recover - no quorum - stop " do_test rec-node-10 "Node Recover - no quorum - stop w/fence" do_test rec-node-11 "Node Recover - CRM down w/ group - fence " +do_test rec-node-12 "Node Recover - nothing active - fence " echo "" do_test multi1 "Multiple Active (stop/start)" #echo "" #do_test complex1 "Complex " echo "" do_test group1 "Group " do_test group2 "Group + Native " do_test group3 "Group + Group " do_test group4 "Group + Native (nothing)" do_test group5 "Group + Native (move) " do_test group6 "Group + Group (move) " do_test group7 "Group colocation" do_test group8 "Group anti-colocation" do_test group9 "Group recovery" do_test group10 "Group partial recovery" echo "" do_test inc0 "Incarnation start " do_test inc1 "Incarnation start order " do_test inc2 "Incarnation silent restart, stop, move " do_test inc3 "Inter-incarnation ordering, silent restart, stop, move" do_test inc4 "Inter-incarnation ordering, silent restart, stop, move (ordered)" do_test inc5 "Inter-incarnation ordering, silent restart, stop, move (restart 1)" do_test inc6 "Inter-incarnation ordering, silent restart, stop, move (restart 2)" do_test inc7 "Clone colocation" do_test inc8 "Clone anti-colocation" do_test inc9 "Non-unique clone" echo "" do_test managed-0 "Managed (reference)" do_test managed-1 "Not managed - down " do_test managed-2 "Not managed - up " echo "" do_test interleave-0 "Interleave (reference)" do_test interleave-1 "coloc - not interleaved" do_test interleave-2 "coloc - interleaved " do_test interleave-3 "coloc - interleaved (2)" echo "" do_test notify-0 "Notify reference" do_test notify-1 "Notify simple" do_test notify-2 "Notify simple, confirm" do_test notify-3 "Notify move, confirm" #do_test notify-2 "Notify - 764" echo "" do_test 594 "Bugzilla 594" do_test 662 "Bugzilla 662" do_test 696 "Bugzilla 696" do_test 726 "Bugzilla 726" do_test 735 "Bugzilla 735" do_test 764 "Bugzilla 764" do_test 797 "Bugzilla 797" do_test 829 "Bugzilla 829" do_test 994 "Bugzilla 994" do_test unrunnable-1 "Unrunnable" echo "" do_test bad1 "Bad node " do_test bad2 "Bad rsc " do_test bad3 "No rsc class " do_test bad4 "Bad data " do_test bad5 "Bad data " do_test bad6 "Bad lrm_rsc " echo "" test_results diff --git a/crm/pengine/testcases/594.dot b/crm/pengine/testcases/594.dot index 4a86c41602..16e59aeac4 100644 --- a/crm/pengine/testcases/594.dot +++ b/crm/pengine/testcases/594.dot @@ -1,57 +1,58 @@ digraph "g" { size = "30,30" "rsc_hadev3_monitor_5000 hadev3" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_monitor_5000 hadev3" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev3" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:0_monitor_5000 hadev2" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev2" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev2" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev1_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:1_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev3_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev3_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "rsc_hadev1_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:0_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "DoFencing:child_DoFencing:1_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:1_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "stonith hadev3" [ style=bold color="green" fontcolor="black" ] "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_start_0 hadev1" -> "rsc_hadev1_monitor_5000 hadev1" [ style = dashed] "DoFencing:child_DoFencing:1_start_0 hadev1" -> "DoFencing:child_DoFencing:1_monitor_5000 hadev1" [ style = dashed] "rsc_hadev3_start_0 hadev1" -> "rsc_hadev3_monitor_5000 hadev1" [ style = dashed] "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_start_0 hadev1" [ style = bold] "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold] "rsc_hadev3_stop_0 hadev1" -> "rsc_hadev3_start_0 hadev1" [ style = dashed] "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold] "rsc_hadev1_stop_0 hadev1" -> "rsc_hadev1_start_0 hadev1" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 hadev2" [ style = bold] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 hadev1" [ style = dashed] "DoFencing:child_DoFencing:1_stop_0 hadev1" -> "DoFencing:child_DoFencing:1_start_0 hadev1" [ style = dashed] "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 hadev1" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 hadev1" [ style = bold] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed] "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed] "DoFencing:child_DoFencing:1_start_0 hadev1" -> "DoFencing_running_0" [ style = dashed] "DoFencing:child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold] "DoFencing:child_DoFencing:1_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = dashed] "DoFencing:child_DoFencing:2_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] +"DoFencing_running_0" -> "stonith hadev3" [ style = dashed] "DcIPaddr_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "DoFencing:child_DoFencing:0_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] } diff --git a/crm/pengine/testcases/594.exp b/crm/pengine/testcases/594.exp index 2cb636474a..402737c256 100644 --- a/crm/pengine/testcases/594.exp +++ b/crm/pengine/testcases/594.exp @@ -1,151 +1,151 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/662.exp b/crm/pengine/testcases/662.exp index f3d4295a90..72ab35a533 100644 --- a/crm/pengine/testcases/662.exp +++ b/crm/pengine/testcases/662.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/696.exp b/crm/pengine/testcases/696.exp index 845ad9ea3e..f4c9b6896f 100644 --- a/crm/pengine/testcases/696.exp +++ b/crm/pengine/testcases/696.exp @@ -1,158 +1,158 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/726.exp b/crm/pengine/testcases/726.exp index 6ac8b45125..50c2a21777 100644 --- a/crm/pengine/testcases/726.exp +++ b/crm/pengine/testcases/726.exp @@ -1,236 +1,236 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/735.exp b/crm/pengine/testcases/735.exp index 86e7b20521..a0350bd17e 100644 --- a/crm/pengine/testcases/735.exp +++ b/crm/pengine/testcases/735.exp @@ -1,138 +1,138 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/764.exp b/crm/pengine/testcases/764.exp index 921dfa1732..1dcd1ef431 100644 --- a/crm/pengine/testcases/764.exp +++ b/crm/pengine/testcases/764.exp @@ -1,66 +1,66 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/797.exp b/crm/pengine/testcases/797.exp index 548f5757ae..de82e7848f 100644 --- a/crm/pengine/testcases/797.exp +++ b/crm/pengine/testcases/797.exp @@ -1,227 +1,227 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/829.dot b/crm/pengine/testcases/829.dot index 338e1458ab..2b500edc15 100644 --- a/crm/pengine/testcases/829.dot +++ b/crm/pengine/testcases/829.dot @@ -1,73 +1,74 @@ digraph "g" { size = "30,30" "rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:1_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:3_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:0_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DcIPaddr_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:2_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing:child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "stonith c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed] "DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed] "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n08" [ style = dashed] "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed] "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed] "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed] "DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style = dashed] "DcIPaddr_stop_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = dashed] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "stonith c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed] "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed] "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n01" [ style = dashed] "DoFencing:child_DoFencing:2_stop_0 c001n01" -> "DoFencing:child_DoFencing:2_start_0 c001n01" [ style = dashed] "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n01" [ style = dashed] "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style = dashed] "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed] "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed] "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed] "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed] "DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style = dashed] "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed] "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed] "DoFencing:child_DoFencing:2_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed] "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed] +"DoFencing_running_0" -> "stonith c001n02" [ style = dashed] } diff --git a/crm/pengine/testcases/829.exp b/crm/pengine/testcases/829.exp index a0400da76d..f57e44847c 100644 --- a/crm/pengine/testcases/829.exp +++ b/crm/pengine/testcases/829.exp @@ -1,56 +1,56 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/994.exp b/crm/pengine/testcases/994.exp index 74aafb41bb..f6c16d16c5 100644 --- a/crm/pengine/testcases/994.exp +++ b/crm/pengine/testcases/994.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp index 058242578e..637c9fa465 100644 --- a/crm/pengine/testcases/attrs1.exp +++ b/crm/pengine/testcases/attrs1.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp index 058242578e..637c9fa465 100644 --- a/crm/pengine/testcases/attrs2.exp +++ b/crm/pengine/testcases/attrs2.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp index 058242578e..637c9fa465 100644 --- a/crm/pengine/testcases/attrs3.exp +++ b/crm/pengine/testcases/attrs3.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp index 3460db51a9..65dc05afef 100644 --- a/crm/pengine/testcases/attrs4.exp +++ b/crm/pengine/testcases/attrs4.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs5.exp b/crm/pengine/testcases/attrs5.exp index 22d44c6d31..1e6de2d008 100644 --- a/crm/pengine/testcases/attrs5.exp +++ b/crm/pengine/testcases/attrs5.exp @@ -1,60 +1,60 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs6.exp b/crm/pengine/testcases/attrs6.exp index 3460db51a9..65dc05afef 100644 --- a/crm/pengine/testcases/attrs6.exp +++ b/crm/pengine/testcases/attrs6.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/attrs7.exp b/crm/pengine/testcases/attrs7.exp index 058242578e..637c9fa465 100644 --- a/crm/pengine/testcases/attrs7.exp +++ b/crm/pengine/testcases/attrs7.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp index 5fb475d4ba..9ad3927925 100644 --- a/crm/pengine/testcases/bad1.exp +++ b/crm/pengine/testcases/bad1.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp index 4edd210fa3..ca694665ed 100644 --- a/crm/pengine/testcases/bad2.exp +++ b/crm/pengine/testcases/bad2.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp index 6608aa1c37..b5adffb419 100644 --- a/crm/pengine/testcases/bad3.exp +++ b/crm/pengine/testcases/bad3.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp index 61b606674c..5f303d2f4c 100644 --- a/crm/pengine/testcases/bad4.exp +++ b/crm/pengine/testcases/bad4.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp index 93431bf43a..6fca76e8f5 100644 --- a/crm/pengine/testcases/bad5.exp +++ b/crm/pengine/testcases/bad5.exp @@ -1,49 +1,49 @@ - + - + - + - + diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp index de616794c6..b4179ed858 100644 --- a/crm/pengine/testcases/bad6.exp +++ b/crm/pengine/testcases/bad6.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/comments.exp b/crm/pengine/testcases/comments.exp index 375e22bd02..dbeb7d0bd9 100644 --- a/crm/pengine/testcases/comments.exp +++ b/crm/pengine/testcases/comments.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/date-1.exp b/crm/pengine/testcases/date-1.exp index f142347186..068ae2944c 100644 --- a/crm/pengine/testcases/date-1.exp +++ b/crm/pengine/testcases/date-1.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp index 3355a4abad..1ff1d66620 100644 --- a/crm/pengine/testcases/group1.exp +++ b/crm/pengine/testcases/group1.exp @@ -1,174 +1,174 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group10.exp b/crm/pengine/testcases/group10.exp index 61a6ef26fd..4c45d7d7f6 100644 --- a/crm/pengine/testcases/group10.exp +++ b/crm/pengine/testcases/group10.exp @@ -1,179 +1,179 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp index 964ff8beac..90fcc40f3f 100644 --- a/crm/pengine/testcases/group2.exp +++ b/crm/pengine/testcases/group2.exp @@ -1,254 +1,254 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp index 2d3230a37f..40b69edef3 100644 --- a/crm/pengine/testcases/group3.exp +++ b/crm/pengine/testcases/group3.exp @@ -1,315 +1,315 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group4.exp b/crm/pengine/testcases/group4.exp index a28ea287d6..f0bc25c527 100644 --- a/crm/pengine/testcases/group4.exp +++ b/crm/pengine/testcases/group4.exp @@ -1,95 +1,95 @@ - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp index cf80ae1350..dbb7629adb 100644 --- a/crm/pengine/testcases/group5.exp +++ b/crm/pengine/testcases/group5.exp @@ -1,299 +1,299 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp index 192b3d8d3e..ab5898ded8 100644 --- a/crm/pengine/testcases/group6.exp +++ b/crm/pengine/testcases/group6.exp @@ -1,394 +1,394 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group7.exp b/crm/pengine/testcases/group7.exp index 6d421eae36..b2fffda947 100644 --- a/crm/pengine/testcases/group7.exp +++ b/crm/pengine/testcases/group7.exp @@ -1,448 +1,448 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group8.exp b/crm/pengine/testcases/group8.exp index fb2b6f0b66..517d918a2c 100644 --- a/crm/pengine/testcases/group8.exp +++ b/crm/pengine/testcases/group8.exp @@ -1,187 +1,187 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/group9.exp b/crm/pengine/testcases/group9.exp index 1da88fa2f9..7592de12d6 100644 --- a/crm/pengine/testcases/group9.exp +++ b/crm/pengine/testcases/group9.exp @@ -1,376 +1,376 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc0.exp b/crm/pengine/testcases/inc0.exp index 8ebc8b9f97..bc9e689851 100644 --- a/crm/pengine/testcases/inc0.exp +++ b/crm/pengine/testcases/inc0.exp @@ -1,87 +1,87 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp index e4a65977b9..a711dc5ab8 100644 --- a/crm/pengine/testcases/inc1.exp +++ b/crm/pengine/testcases/inc1.exp @@ -1,113 +1,113 @@ - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp index 4b37f835dc..fa6612c742 100644 --- a/crm/pengine/testcases/inc2.exp +++ b/crm/pengine/testcases/inc2.exp @@ -1,133 +1,133 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp index 7f1369c5ef..e4cc5327a3 100644 --- a/crm/pengine/testcases/inc3.exp +++ b/crm/pengine/testcases/inc3.exp @@ -1,254 +1,254 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc4.exp b/crm/pengine/testcases/inc4.exp index de257c281a..bfb62ad324 100644 --- a/crm/pengine/testcases/inc4.exp +++ b/crm/pengine/testcases/inc4.exp @@ -1,384 +1,384 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc5.exp b/crm/pengine/testcases/inc5.exp index fb4905bdb5..b03e261de4 100644 --- a/crm/pengine/testcases/inc5.exp +++ b/crm/pengine/testcases/inc5.exp @@ -1,319 +1,319 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc6.exp b/crm/pengine/testcases/inc6.exp index 386733e3f5..5ff0a27762 100644 --- a/crm/pengine/testcases/inc6.exp +++ b/crm/pengine/testcases/inc6.exp @@ -1,494 +1,494 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc7.exp b/crm/pengine/testcases/inc7.exp index 164e1da9a3..e5c61e5cc9 100644 --- a/crm/pengine/testcases/inc7.exp +++ b/crm/pengine/testcases/inc7.exp @@ -1,216 +1,216 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/inc8.exp b/crm/pengine/testcases/inc8.exp index 75f849661e..0807e03fa6 100644 --- a/crm/pengine/testcases/inc8.exp +++ b/crm/pengine/testcases/inc8.exp @@ -1,64 +1,64 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/inc9.exp b/crm/pengine/testcases/inc9.exp index 1dd6cd4c22..f5c0584c15 100644 --- a/crm/pengine/testcases/inc9.exp +++ b/crm/pengine/testcases/inc9.exp @@ -1,39 +1,39 @@ - + - + - + diff --git a/crm/pengine/testcases/interleave-0.exp b/crm/pengine/testcases/interleave-0.exp index e00f09cad1..23596626af 100644 --- a/crm/pengine/testcases/interleave-0.exp +++ b/crm/pengine/testcases/interleave-0.exp @@ -1,255 +1,255 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/interleave-1.exp b/crm/pengine/testcases/interleave-1.exp index e00f09cad1..23596626af 100644 --- a/crm/pengine/testcases/interleave-1.exp +++ b/crm/pengine/testcases/interleave-1.exp @@ -1,255 +1,255 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/interleave-2.exp b/crm/pengine/testcases/interleave-2.exp index ceae07dd59..3eeeeb68c3 100644 --- a/crm/pengine/testcases/interleave-2.exp +++ b/crm/pengine/testcases/interleave-2.exp @@ -1,255 +1,255 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/interleave-3.exp b/crm/pengine/testcases/interleave-3.exp index ceae07dd59..3eeeeb68c3 100644 --- a/crm/pengine/testcases/interleave-3.exp +++ b/crm/pengine/testcases/interleave-3.exp @@ -1,255 +1,255 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/managed-2.exp b/crm/pengine/testcases/managed-2.exp index 267b41ff02..9bcce979c6 100644 --- a/crm/pengine/testcases/managed-2.exp +++ b/crm/pengine/testcases/managed-2.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-0.exp b/crm/pengine/testcases/master-0.exp index ae5ae2ef44..15bf758f53 100644 --- a/crm/pengine/testcases/master-0.exp +++ b/crm/pengine/testcases/master-0.exp @@ -1,87 +1,87 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-1.exp b/crm/pengine/testcases/master-1.exp index e8998c3763..f5b969ef87 100644 --- a/crm/pengine/testcases/master-1.exp +++ b/crm/pengine/testcases/master-1.exp @@ -1,140 +1,140 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-2.exp b/crm/pengine/testcases/master-2.exp index 6723015cf1..072fb59548 100644 --- a/crm/pengine/testcases/master-2.exp +++ b/crm/pengine/testcases/master-2.exp @@ -1,430 +1,430 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-3.exp b/crm/pengine/testcases/master-3.exp index 3925333717..715ca1f3d4 100644 --- a/crm/pengine/testcases/master-3.exp +++ b/crm/pengine/testcases/master-3.exp @@ -1,124 +1,124 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-4.exp b/crm/pengine/testcases/master-4.exp index 7cc20694be..f320106d77 100644 --- a/crm/pengine/testcases/master-4.exp +++ b/crm/pengine/testcases/master-4.exp @@ -1,61 +1,61 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/mon-rsc-1.exp b/crm/pengine/testcases/mon-rsc-1.exp index fc68f8dc41..a85ff4fd86 100644 --- a/crm/pengine/testcases/mon-rsc-1.exp +++ b/crm/pengine/testcases/mon-rsc-1.exp @@ -1,86 +1,86 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/mon-rsc-2.exp b/crm/pengine/testcases/mon-rsc-2.exp index 88d5b2e389..45570c00c1 100644 --- a/crm/pengine/testcases/mon-rsc-2.exp +++ b/crm/pengine/testcases/mon-rsc-2.exp @@ -1,85 +1,85 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/mon-rsc-3.exp b/crm/pengine/testcases/mon-rsc-3.exp index 4c50f73b11..0aee965dd1 100644 --- a/crm/pengine/testcases/mon-rsc-3.exp +++ b/crm/pengine/testcases/mon-rsc-3.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/mon-rsc-4.exp b/crm/pengine/testcases/mon-rsc-4.exp index 7e30bcc314..ab613fb1e7 100644 --- a/crm/pengine/testcases/mon-rsc-4.exp +++ b/crm/pengine/testcases/mon-rsc-4.exp @@ -1,85 +1,85 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/multi1.exp b/crm/pengine/testcases/multi1.exp index a3e36abf45..3c233d2c2e 100644 --- a/crm/pengine/testcases/multi1.exp +++ b/crm/pengine/testcases/multi1.exp @@ -1,68 +1,68 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/notify-0.exp b/crm/pengine/testcases/notify-0.exp index 476e4dd595..f0ed53a54f 100644 --- a/crm/pengine/testcases/notify-0.exp +++ b/crm/pengine/testcases/notify-0.exp @@ -1,124 +1,124 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/notify-1.exp b/crm/pengine/testcases/notify-1.exp index 3e591125d1..51e3ddffca 100644 --- a/crm/pengine/testcases/notify-1.exp +++ b/crm/pengine/testcases/notify-1.exp @@ -1,283 +1,283 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/notify-2.exp b/crm/pengine/testcases/notify-2.exp index 3e591125d1..51e3ddffca 100644 --- a/crm/pengine/testcases/notify-2.exp +++ b/crm/pengine/testcases/notify-2.exp @@ -1,283 +1,283 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/notify-3.exp b/crm/pengine/testcases/notify-3.exp index 89f071905c..90fd9bcad4 100644 --- a/crm/pengine/testcases/notify-3.exp +++ b/crm/pengine/testcases/notify-3.exp @@ -1,472 +1,472 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order1.exp b/crm/pengine/testcases/order1.exp index 314b1e9e4d..6c36551b94 100644 --- a/crm/pengine/testcases/order1.exp +++ b/crm/pengine/testcases/order1.exp @@ -1,153 +1,153 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order2.exp b/crm/pengine/testcases/order2.exp index e2128b999a..eacb38179e 100644 --- a/crm/pengine/testcases/order2.exp +++ b/crm/pengine/testcases/order2.exp @@ -1,193 +1,193 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order3.exp b/crm/pengine/testcases/order3.exp index 44b603315e..8568e88c2c 100644 --- a/crm/pengine/testcases/order3.exp +++ b/crm/pengine/testcases/order3.exp @@ -1,204 +1,204 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order4.exp b/crm/pengine/testcases/order4.exp index c6a2b06177..aa41ad6e3f 100644 --- a/crm/pengine/testcases/order4.exp +++ b/crm/pengine/testcases/order4.exp @@ -1,153 +1,153 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order5.exp b/crm/pengine/testcases/order5.exp index e1a6c19a9a..1065c97d44 100644 --- a/crm/pengine/testcases/order5.exp +++ b/crm/pengine/testcases/order5.exp @@ -1,232 +1,232 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/order6.exp b/crm/pengine/testcases/order6.exp index c255d11e56..9a8a4e82e5 100644 --- a/crm/pengine/testcases/order6.exp +++ b/crm/pengine/testcases/order6.exp @@ -1,264 +1,264 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/orphan-0.exp b/crm/pengine/testcases/orphan-0.exp index c1048252e9..c3d7331099 100644 --- a/crm/pengine/testcases/orphan-0.exp +++ b/crm/pengine/testcases/orphan-0.exp @@ -1,213 +1,213 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/orphan-1.exp b/crm/pengine/testcases/orphan-1.exp index a1939b0b13..e0fb2bc353 100644 --- a/crm/pengine/testcases/orphan-1.exp +++ b/crm/pengine/testcases/orphan-1.exp @@ -1,240 +1,240 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/params-0.exp b/crm/pengine/testcases/params-0.exp index 8e25f9a5b0..aacba6ad1f 100644 --- a/crm/pengine/testcases/params-0.exp +++ b/crm/pengine/testcases/params-0.exp @@ -1,240 +1,240 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/params-1.exp b/crm/pengine/testcases/params-1.exp index 9d36875e24..71641d43d3 100644 --- a/crm/pengine/testcases/params-1.exp +++ b/crm/pengine/testcases/params-1.exp @@ -1,305 +1,305 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/params-2.exp b/crm/pengine/testcases/params-2.exp index 0453032d7c..3c83adc2f6 100644 --- a/crm/pengine/testcases/params-2.exp +++ b/crm/pengine/testcases/params-2.exp @@ -1,256 +1,256 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-1.exp b/crm/pengine/testcases/quorum-1.exp index c8bb4cc1ec..a1ac771bf1 100644 --- a/crm/pengine/testcases/quorum-1.exp +++ b/crm/pengine/testcases/quorum-1.exp @@ -1,122 +1,122 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-2.exp b/crm/pengine/testcases/quorum-2.exp index 15f62fbaba..58a81751b5 100644 --- a/crm/pengine/testcases/quorum-2.exp +++ b/crm/pengine/testcases/quorum-2.exp @@ -1,109 +1,109 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-3.exp b/crm/pengine/testcases/quorum-3.exp index c5c1c01150..4867a6d1f8 100644 --- a/crm/pengine/testcases/quorum-3.exp +++ b/crm/pengine/testcases/quorum-3.exp @@ -1,102 +1,102 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-4.exp b/crm/pengine/testcases/quorum-4.exp index a1507348fa..c9abee12df 100644 --- a/crm/pengine/testcases/quorum-4.exp +++ b/crm/pengine/testcases/quorum-4.exp @@ -1,62 +1,62 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-5.exp b/crm/pengine/testcases/quorum-5.exp index 38c8088095..6442ec44f2 100644 --- a/crm/pengine/testcases/quorum-5.exp +++ b/crm/pengine/testcases/quorum-5.exp @@ -1,127 +1,127 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/quorum-6.exp b/crm/pengine/testcases/quorum-6.exp index 4ad3cc8624..a3531b866d 100644 --- a/crm/pengine/testcases/quorum-6.exp +++ b/crm/pengine/testcases/quorum-6.exp @@ -1,89 +1,89 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-1.exp b/crm/pengine/testcases/rec-node-1.exp index 74db814740..19cc5a34d6 100644 --- a/crm/pengine/testcases/rec-node-1.exp +++ b/crm/pengine/testcases/rec-node-1.exp @@ -1,74 +1,74 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-10.exp b/crm/pengine/testcases/rec-node-10.exp index 24fa6f1e51..7c560c9536 100644 --- a/crm/pengine/testcases/rec-node-10.exp +++ b/crm/pengine/testcases/rec-node-10.exp @@ -1,48 +1,48 @@ - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-11.exp b/crm/pengine/testcases/rec-node-11.exp index 10499c98d6..bae6ba2471 100644 --- a/crm/pengine/testcases/rec-node-11.exp +++ b/crm/pengine/testcases/rec-node-11.exp @@ -1,166 +1,166 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-12.dot b/crm/pengine/testcases/rec-node-12.dot new file mode 100644 index 0000000000..4911f9b161 --- /dev/null +++ b/crm/pengine/testcases/rec-node-12.dot @@ -0,0 +1,91 @@ +digraph "g" { + size = "30,30" +"probe_complete" [ style=bold color="green" fontcolor="orange" ] +"probe_complete c001n08" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:0_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"probe_complete c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:0_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"probe_complete c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:0_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:0_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:1_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:2_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] +"DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] +"DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] +"DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] +"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"stonith c001n02" [ style=bold color="green" fontcolor="black" ] +"probe_complete c001n08" -> "probe_complete" [ style = bold] +"probe_complete c001n03" -> "probe_complete" [ style = bold] +"probe_complete c001n01" -> "probe_complete" [ style = bold] +"DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"rsc_c001n08_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"DoFencing:child_DoFencing:0_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold] +"DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"rsc_c001n03_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"DoFencing:child_DoFencing:0_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] +"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"rsc_c001n01_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"DoFencing:child_DoFencing:0_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold] +"probe_complete" -> "DcIPaddr_start_0 c001n08" [ style = bold] +"DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = bold] +"probe_complete" -> "rsc_c001n08_start_0 c001n08" [ style = bold] +"rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = bold] +"probe_complete" -> "rsc_c001n02_start_0 c001n03" [ style = bold] +"rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] +"probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = bold] +"rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = bold] +"probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = bold] +"rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = bold] +"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n08" [ style = bold] +"DoFencing:child_DoFencing:0_start_0 c001n08" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n08" [ style = bold] +"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = bold] +"DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = bold] +"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n01" [ style = bold] +"DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style = bold] +"probe_complete" -> "DoFencing_start_0" [ style = bold] +"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed] +"DoFencing:child_DoFencing:0_start_0 c001n08" -> "DoFencing_running_0" [ style = bold] +"DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = bold] +"DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style = bold] +"DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] +"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed] +"DoFencing_running_0" -> "stonith c001n02" [ style = bold] +} diff --git a/crm/pengine/testcases/rec-node-12.exp b/crm/pengine/testcases/rec-node-12.exp new file mode 100644 index 0000000000..71d37a460d --- /dev/null +++ b/crm/pengine/testcases/rec-node-12.exp @@ -0,0 +1,517 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/rec-node-12.xml b/crm/pengine/testcases/rec-node-12.xml new file mode 100644 index 0000000000..56b3f4b1a9 --- /dev/null +++ b/crm/pengine/testcases/rec-node-12.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crm/pengine/testcases/rec-node-2.exp b/crm/pengine/testcases/rec-node-2.exp index 1bebb39de3..62b560b468 100644 --- a/crm/pengine/testcases/rec-node-2.exp +++ b/crm/pengine/testcases/rec-node-2.exp @@ -1,242 +1,242 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-3.exp b/crm/pengine/testcases/rec-node-3.exp index 74db814740..19cc5a34d6 100644 --- a/crm/pengine/testcases/rec-node-3.exp +++ b/crm/pengine/testcases/rec-node-3.exp @@ -1,74 +1,74 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-4.exp b/crm/pengine/testcases/rec-node-4.exp index 93e66769a7..502f9f5833 100644 --- a/crm/pengine/testcases/rec-node-4.exp +++ b/crm/pengine/testcases/rec-node-4.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-5.exp b/crm/pengine/testcases/rec-node-5.exp index 74db814740..19cc5a34d6 100644 --- a/crm/pengine/testcases/rec-node-5.exp +++ b/crm/pengine/testcases/rec-node-5.exp @@ -1,74 +1,74 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-6.exp b/crm/pengine/testcases/rec-node-6.exp index 93e66769a7..502f9f5833 100644 --- a/crm/pengine/testcases/rec-node-6.exp +++ b/crm/pengine/testcases/rec-node-6.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-7.exp b/crm/pengine/testcases/rec-node-7.exp index 93e66769a7..502f9f5833 100644 --- a/crm/pengine/testcases/rec-node-7.exp +++ b/crm/pengine/testcases/rec-node-7.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-8.exp b/crm/pengine/testcases/rec-node-8.exp index b516a6e701..3d8d42207a 100644 --- a/crm/pengine/testcases/rec-node-8.exp +++ b/crm/pengine/testcases/rec-node-8.exp @@ -1,60 +1,60 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-node-9.exp b/crm/pengine/testcases/rec-node-9.exp index ea8eb9932c..0a93d974ce 100644 --- a/crm/pengine/testcases/rec-node-9.exp +++ b/crm/pengine/testcases/rec-node-9.exp @@ -1,48 +1,48 @@ - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-0.exp b/crm/pengine/testcases/rec-rsc-0.exp index ab09a79b6f..c04a29169a 100644 --- a/crm/pengine/testcases/rec-rsc-0.exp +++ b/crm/pengine/testcases/rec-rsc-0.exp @@ -1,52 +1,52 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-1.exp b/crm/pengine/testcases/rec-rsc-1.exp index f249ddef3b..80c9640d36 100644 --- a/crm/pengine/testcases/rec-rsc-1.exp +++ b/crm/pengine/testcases/rec-rsc-1.exp @@ -1,72 +1,72 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-2.exp b/crm/pengine/testcases/rec-rsc-2.exp index 9e213ff28f..5f13a1cf45 100644 --- a/crm/pengine/testcases/rec-rsc-2.exp +++ b/crm/pengine/testcases/rec-rsc-2.exp @@ -1,72 +1,72 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-3.exp b/crm/pengine/testcases/rec-rsc-3.exp index 3a0e9d99c9..72632619ad 100644 --- a/crm/pengine/testcases/rec-rsc-3.exp +++ b/crm/pengine/testcases/rec-rsc-3.exp @@ -1,60 +1,60 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-4.exp b/crm/pengine/testcases/rec-rsc-4.exp index 12ce502761..397828c6d2 100644 --- a/crm/pengine/testcases/rec-rsc-4.exp +++ b/crm/pengine/testcases/rec-rsc-4.exp @@ -1,47 +1,47 @@ - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-5.exp b/crm/pengine/testcases/rec-rsc-5.exp index 615f4670d6..d56798f706 100644 --- a/crm/pengine/testcases/rec-rsc-5.exp +++ b/crm/pengine/testcases/rec-rsc-5.exp @@ -1,112 +1,112 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-6.exp b/crm/pengine/testcases/rec-rsc-6.exp index 31dff92bf1..51d6de8e7a 100644 --- a/crm/pengine/testcases/rec-rsc-6.exp +++ b/crm/pengine/testcases/rec-rsc-6.exp @@ -1,68 +1,68 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-7.exp b/crm/pengine/testcases/rec-rsc-7.exp index b81894610c..9f70285962 100644 --- a/crm/pengine/testcases/rec-rsc-7.exp +++ b/crm/pengine/testcases/rec-rsc-7.exp @@ -1,52 +1,52 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/rec-rsc-8.exp b/crm/pengine/testcases/rec-rsc-8.exp index 77cb1b435c..d5e32321d0 100644 --- a/crm/pengine/testcases/rec-rsc-8.exp +++ b/crm/pengine/testcases/rec-rsc-8.exp @@ -1,34 +1,34 @@ - + - + - + diff --git a/crm/pengine/testcases/rsc_dep1.exp b/crm/pengine/testcases/rsc_dep1.exp index 4edd210fa3..ca694665ed 100644 --- a/crm/pengine/testcases/rsc_dep1.exp +++ b/crm/pengine/testcases/rsc_dep1.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep10.exp b/crm/pengine/testcases/rsc_dep10.exp index 303693f183..3c68143d8d 100644 --- a/crm/pengine/testcases/rsc_dep10.exp +++ b/crm/pengine/testcases/rsc_dep10.exp @@ -1,84 +1,84 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep2.exp b/crm/pengine/testcases/rsc_dep2.exp index 031d173b77..955df17245 100644 --- a/crm/pengine/testcases/rsc_dep2.exp +++ b/crm/pengine/testcases/rsc_dep2.exp @@ -1,134 +1,134 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep3.exp b/crm/pengine/testcases/rsc_dep3.exp index dd01b57e3f..af1aba4755 100644 --- a/crm/pengine/testcases/rsc_dep3.exp +++ b/crm/pengine/testcases/rsc_dep3.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep4.exp b/crm/pengine/testcases/rsc_dep4.exp index 549867a415..f1949ae21c 100644 --- a/crm/pengine/testcases/rsc_dep4.exp +++ b/crm/pengine/testcases/rsc_dep4.exp @@ -1,159 +1,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep5.exp b/crm/pengine/testcases/rsc_dep5.exp index 281f4ed455..6c0ebed685 100644 --- a/crm/pengine/testcases/rsc_dep5.exp +++ b/crm/pengine/testcases/rsc_dep5.exp @@ -1,134 +1,134 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep7.exp b/crm/pengine/testcases/rsc_dep7.exp index b4e74172c4..7524a91a06 100644 --- a/crm/pengine/testcases/rsc_dep7.exp +++ b/crm/pengine/testcases/rsc_dep7.exp @@ -1,147 +1,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/rsc_dep8.exp b/crm/pengine/testcases/rsc_dep8.exp index 031d173b77..955df17245 100644 --- a/crm/pengine/testcases/rsc_dep8.exp +++ b/crm/pengine/testcases/rsc_dep8.exp @@ -1,134 +1,134 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp index 3d2c3900b4..9ad46a90a4 100644 --- a/crm/pengine/testcases/simple11.exp +++ b/crm/pengine/testcases/simple11.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp index ee4416d36d..cb37fcb220 100644 --- a/crm/pengine/testcases/simple12.exp +++ b/crm/pengine/testcases/simple12.exp @@ -1,110 +1,110 @@ - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp index 7f39412696..e7d34092d2 100644 --- a/crm/pengine/testcases/simple2.exp +++ b/crm/pengine/testcases/simple2.exp @@ -1,73 +1,73 @@ - + - + - + - + - + - + diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp index 1685927676..49f42a120f 100644 --- a/crm/pengine/testcases/simple3.exp +++ b/crm/pengine/testcases/simple3.exp @@ -1,32 +1,32 @@ - + - + - + diff --git a/crm/pengine/testcases/simple4.exp b/crm/pengine/testcases/simple4.exp index 297c9f2945..f4cd88ea6d 100644 --- a/crm/pengine/testcases/simple4.exp +++ b/crm/pengine/testcases/simple4.exp @@ -1,32 +1,32 @@ - + - + - + diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp index fd0f290ffb..5f3e4d9365 100644 --- a/crm/pengine/testcases/simple6.exp +++ b/crm/pengine/testcases/simple6.exp @@ -1,58 +1,58 @@ - + - + - + - + - + diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp index d3d39c3325..470a20060c 100644 --- a/crm/pengine/testcases/simple7.exp +++ b/crm/pengine/testcases/simple7.exp @@ -1,44 +1,44 @@ - + - + - + - + diff --git a/crm/pengine/testcases/simple8.exp b/crm/pengine/testcases/simple8.exp index 76a6ce4852..f89453e75f 100644 --- a/crm/pengine/testcases/simple8.exp +++ b/crm/pengine/testcases/simple8.exp @@ -1,83 +1,83 @@ - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/target-1.exp b/crm/pengine/testcases/target-1.exp index 28132a2a63..753aad8dc4 100644 --- a/crm/pengine/testcases/target-1.exp +++ b/crm/pengine/testcases/target-1.exp @@ -1,34 +1,34 @@ - + - + - +