Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 26 Mar 2006 22:44:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
complex.c graph.c group.c incarnation.c native.c pe_utils.h
pengine.h unpack.c utils.c
Log Message:
Regardless of short_resource_names, which is only needed for the TE graph,
always present the short name to clients (including the GUI).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- complex.c 26 Mar 2006 16:04:50 -0000 1.75
+++ complex.c 27 Mar 2006 05:44:24 -0000 1.76
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.75 2006/03/26 16:04:50 andrew Exp $ */
+/* $Id: complex.c,v 1.76 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -213,7 +213,7 @@
}
(*rsc)->id = id;
- (*rsc)->name = 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));
@@ -412,6 +412,7 @@
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");
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- graph.c 18 Mar 2006 17:23:48 -0000 1.77
+++ graph.c 27 Mar 2006 05:44:24 -0000 1.78
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.77 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: graph.c,v 1.78 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -370,8 +370,8 @@
crm_free(action_id_s);
if(action->rsc != NULL) {
- crm_xml_add(
- action_xml, XML_LRM_ATTR_RSCID, action->rsc->name);
+ 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);
@@ -403,7 +403,8 @@
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);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- group.c 21 Mar 2006 17:56:35 -0000 1.55
+++ group.c 27 Mar 2006 05:44:24 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.55 2006/03/21 17:56:35 andrew Exp $ */
+/* $Id: group.c,v 1.56 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -102,32 +102,38 @@
xml_obj, xml_native_rsc, XML_CIB_TAG_RESOURCE,
resource_t *new_rsc = NULL;
- if(data_set->short_rsc_names == FALSE) {
- set_id(xml_native_rsc, group_data->self->id, -1);
- }
if(common_unpack(xml_native_rsc, &new_rsc,
- group_data->self->parameters, data_set)) {
- 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);
-
- } else {
+ 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) {
+ crm_err("Using %s for resource name", new_rsc->id);
+ 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);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- incarnation.c 21 Mar 2006 17:56:35 -0000 1.75
+++ incarnation.c 27 Mar 2006 05:44:24 -0000 1.76
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.75 2006/03/21 17:56:35 andrew Exp $ */
+/* $Id: incarnation.c,v 1.76 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -70,6 +70,8 @@
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;
@@ -77,38 +79,39 @@
CRM_CHECK(clone_data->xml_obj_child != NULL, return FALSE);
child_copy = copy_xml(clone_data->xml_obj_child);
- if(data_set->short_rsc_names) {
- set_id(child_copy, NULL, sub_id);
- } else {
- set_id(child_copy, rsc->id, sub_id);
- }
+ set_id(child_copy, NULL, sub_id);
if(common_unpack(child_copy, &child_rsc,
- clone_data->self->parameters, data_set)) {
- char *inc_num = crm_itoa(sub_id);
- char *inc_max = crm_itoa(clone_data->clone_max);
-
- crm_debug_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);
-
- } else {
+ 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;
}
@@ -541,7 +544,7 @@
/* create pre_notify */
notify_key = generate_notify_key(
- clone_data->self->id, "pre", action->task);
+ 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);
@@ -556,7 +559,7 @@
/* create pre_notify_complete */
notify_key = generate_notify_key(
- clone_data->self->id, "confirmed-pre", action->task);
+ 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);
@@ -587,7 +590,7 @@
/* create post_notify */
notify_key = generate_notify_key
- (clone_data->self->id, "post", action->task);
+ (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);
@@ -608,7 +611,7 @@
/* create post_notify_complete */
notify_key = generate_notify_key(
- clone_data->self->id, "confirmed-post", action->task);
+ 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);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- native.c 26 Mar 2006 16:00:48 -0000 1.117
+++ native.c 27 Mar 2006 05:44:24 -0000 1.118
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.117 2006/03/26 16:00:48 andrew Exp $ */
+/* $Id: native.c,v 1.118 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -420,7 +420,7 @@
}
- key = generate_op_key(rsc->id, name, interval_ms);
+ 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",
@@ -1626,7 +1626,7 @@
}
next_node = rsc->color->details->chosen_node;
- op_key = generate_op_key(rsc->id, op->task, 0);
+ 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)",
@@ -1704,7 +1704,7 @@
crm_debug_2("Creating actions for %s: %s (%s-%s)",
op->uuid, rsc->id, value, task);
- key = generate_notify_key(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);
@@ -1864,16 +1864,16 @@
if(rsc->failed) {
crm_debug_2("Resource %s not deleted from %s: failed",
- rsc->name, node->details->uname);
+ rsc->id, node->details->uname);
return FALSE;
} else if(node == NULL) {
- crm_debug_2("Resource %s not deleted: NULL node", rsc->name);
+ 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->name, node->details->uname);
+ rsc->id, node->details->uname);
return FALSE;
}
@@ -1881,7 +1881,7 @@
start = start_key(rsc);
crm_notice("Removing %s from %s",
- rsc->name, node->details->uname);
+ rsc->id, node->details->uname);
delete = delete_action(rsc, node);
@@ -1986,7 +1986,7 @@
}
target_rc = crm_itoa(EXECRA_NOT_RUNNING);
- key = generate_op_key(rsc->id, CRMD_ACTION_STATUS, 0);
+ key = generate_op_key(rsc->graph_name, CRMD_ACTION_STATUS, 0);
probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node,
FALSE, TRUE, data_set);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pe_utils.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- pe_utils.h 24 Oct 2005 07:48:00 -0000 1.39
+++ pe_utils.h 27 Mar 2006 05:44:24 -0000 1.40
@@ -1,4 +1,4 @@
-/* $Id: pe_utils.h,v 1.39 2005/10/24 07:48:00 andrew Exp $ */
+/* $Id: pe_utils.h,v 1.40 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -117,47 +117,47 @@
const char *id, resource_t *rsc, int weight, node_t *node,
pe_working_set_t *data_set);
-#define delete_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_DELETE, 0)
+#define delete_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_DELETE, 0)
#define delete_action(rsc, node) custom_action(
\
rsc, delete_key(rsc), CRMD_ACTION_DELETE, node, \
FALSE, TRUE, data_set);
-#define stopped_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_STOPPED, 0)
+#define stopped_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_STOPPED,
0)
#define stopped_action(rsc, node, optional) custom_action( \
rsc, stopped_key(rsc), CRMD_ACTION_STOPPED, node, \
optional, TRUE, data_set);
-#define stop_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_STOP, 0)
+#define stop_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_STOP, 0)
#define stop_action(rsc, node, optional) custom_action(
\
rsc, stop_key(rsc), CRMD_ACTION_STOP, node, \
optional, TRUE, data_set);
-#define start_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_START, 0)
+#define start_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_START, 0)
#define start_action(rsc, node, optional) custom_action( \
rsc, start_key(rsc), CRMD_ACTION_START, node, \
optional, TRUE, data_set)
-#define started_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_STARTED, 0)
+#define started_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_STARTED,
0)
#define started_action(rsc, node, optional) custom_action( \
rsc, started_key(rsc), CRMD_ACTION_STARTED, node, \
optional, TRUE, data_set)
-#define promote_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_PROMOTE, 0)
+#define promote_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_PROMOTE,
0)
#define promote_action(rsc, node, optional) custom_action( \
rsc, promote_key(rsc), CRMD_ACTION_PROMOTE, node, \
optional, TRUE, data_set)
-#define promoted_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_PROMOTED, 0)
+#define promoted_key(rsc) generate_op_key(rsc->graph_name,
CRMD_ACTION_PROMOTED, 0)
#define promoted_action(rsc, node, optional) custom_action( \
rsc, promoted_key(rsc), CRMD_ACTION_PROMOTED, node, \
optional, TRUE, data_set)
-#define demote_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_DEMOTE, 0)
+#define demote_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_DEMOTE, 0)
#define demote_action(rsc, node, optional) custom_action( \
rsc, demote_key(rsc), CRMD_ACTION_DEMOTE, node, \
optional, TRUE, data_set)
-#define demoted_key(rsc) generate_op_key(rsc->id, CRMD_ACTION_DEMOTED, 0)
+#define demoted_key(rsc) generate_op_key(rsc->graph_name, CRMD_ACTION_DEMOTED,
0)
#define demoted_action(rsc, node, optional) custom_action( \
rsc, demoted_key(rsc), CRMD_ACTION_DEMOTED, node, \
optional, TRUE, data_set)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- pengine.h 9 Mar 2006 21:36:38 -0000 1.107
+++ pengine.h 27 Mar 2006 05:44:24 -0000 1.108
@@ -1,4 +1,4 @@
-/* $Id: pengine.h,v 1.107 2006/03/09 21:36:38 andrew Exp $ */
+/* $Id: pengine.h,v 1.108 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -274,7 +274,7 @@
struct resource_s {
const char *id;
- const char *name;
+ char *graph_name;
crm_data_t *xml;
crm_data_t *ops_xml;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- unpack.c 26 Mar 2006 16:54:09 -0000 1.168
+++ unpack.c 27 Mar 2006 05:44:24 -0000 1.169
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.168 2006/03/26 16:54:09 andrew Exp $ */
+/* $Id: unpack.c,v 1.169 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -754,7 +754,7 @@
if(is_duped_clone && rsc != NULL) {
crm_info("Internally renamed %s on %s to %s",
rsc_id, node->details->uname, rsc->id);
- rsc->name = rsc_id;
+/* rsc->name = rsc_id; */
}
return rsc;
}
@@ -1840,8 +1840,8 @@
}
custom_action_order(
- rsc_lh, generate_op_key(rsc_lh->id, action, 0), NULL,
- rsc_rh, generate_op_key(rsc_rh->id, action_rh, 0), NULL,
+ rsc_lh, generate_op_key(rsc_lh->graph_name, action, 0), NULL,
+ rsc_rh, generate_op_key(rsc_rh->graph_name, action_rh, 0), NULL,
pe_ordering_optional, data_set);
if(rsc_rh->restart_type == pe_restart_restart
@@ -1866,8 +1866,8 @@
action_rh = invert_action(action_rh);
custom_action_order(
- rsc_rh, generate_op_key(rsc_rh->id, action_rh, 0), NULL,
- rsc_lh, generate_op_key(rsc_lh->id, action, 0), NULL,
+ rsc_rh, generate_op_key(rsc_rh->graph_name, action_rh, 0), NULL,
+ rsc_lh, generate_op_key(rsc_lh->graph_name, action, 0), NULL,
pe_ordering_optional, data_set);
if(rsc_lh->restart_type == pe_restart_restart
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- utils.c 18 Mar 2006 17:23:48 -0000 1.126
+++ utils.c 27 Mar 2006 05:44:24 -0000 1.127
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.126 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: utils.c,v 1.127 2006/03/27 05:44:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -392,9 +392,18 @@
crm_debug_4("Looking for %s in %d objects", id,
g_list_length(rsc_list));
for(lpc = 0; lpc < g_list_length(rsc_list); lpc++) {
rsc = g_list_nth_data(rsc_list, lpc);
- if(rsc != NULL && safe_str_eq(rsc->id, id)){
+ if(rsc == NULL) {
+ } else if(safe_str_eq(rsc->id, id)){
crm_debug_4("Found a match for %s", id);
return rsc;
+#if 0
+ } else if(data_set->short_rsc_names == FALSE
+ && safe_str_eq(rsc->graph_name, id)) {
+#else
+ } else if(safe_str_eq(rsc->graph_name, id)) {
+#endif
+ crm_debug_3("Found a match for %s", id);
+ return rsc;
}
}
for(lpc = 0; lpc < g_list_length(rsc_list); lpc++) {
@@ -1012,7 +1021,7 @@
name = crm_element_value(operation, "name");
interval = crm_element_value(operation, "interval");
- match_key =
generate_op_key(rsc->id,name,crm_get_msec(interval));
+ match_key =
generate_op_key(rsc->graph_name,name,crm_get_msec(interval));
crm_debug_2("Matching %s with %s", key, match_key);
if(safe_str_eq(key, match_key)) {
op = operation;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 64
********************************************
