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])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 7 Jan 2006 13:56:42 -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:
pengine.c
Log Message:
Make sure the correct data is logged.
Groups and clones both modify the XML blob giving a false impression of the
input that was supplied.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- pengine.c 1 Nov 2005 14:52:38 -0000 1.98
+++ pengine.c 7 Jan 2006 20:56:41 -0000 1.99
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.98 2005/11/01 14:52:38 andrew Exp $ */
+/* $Id: pengine.c,v 1.99 2006/01/07 20:56:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -66,11 +66,9 @@
} else if(strcmp(op, CRM_OP_PECALC) == 0) {
pe_working_set_t data_set;
crm_data_t *generation = create_xml_node(NULL, XML_TAG_CIB);
+ crm_data_t *log_input = copy_xml(xml_data);
crm_data_t *status = get_object_root(
- XML_CIB_TAG_STATUS, xml_data);
- crm_data_t *log_input = status;
- log_input = xml_data;
-
+ XML_CIB_TAG_STATUS, log_input);
copy_in_properties(generation, xml_data);
crm_log_xml_info(generation, "[generation]");
@@ -144,7 +142,7 @@
}
free_xml(generation);
-
+ free_xml(log_input);
} else if(strcmp(op, CRM_OP_QUIT) == 0) {
crm_warn("Received quit message, terminating");
------------------------------
Message: 2
Date: Sat, 7 Jan 2006 13:58:00 -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:
native.c
Log Message:
Put the "unmanaged" indicator on the same line as the resource
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- native.c 22 Dec 2005 21:05:28 -0000 1.105
+++ native.c 7 Jan 2006 20:57:59 -0000 1.106
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.105 2005/12/22 21:05:28 andrew Exp $ */
+/* $Id: native.c,v 1.106 2006/01/07 20:57:59 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -879,12 +879,13 @@
desc?": ":"", desc?desc:"");
} else {
- status_print("%s%s (%s%s%s:%s):\t%s",
+ status_print("%s%s (%s%s%s:%s):\t%s%s",
pre_text?pre_text:"", rsc->id,
prov?prov:"", prov?"::":"",
crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS),
crm_element_value(rsc->xml, XML_ATTR_TYPE),
- (rsc->variant!=pe_native)?"":node==NULL?"NOT
ACTIVE":node->details->uname);
+ (rsc->variant!=pe_native)?"":node==NULL?"NOT
ACTIVE":node->details->uname,
+ rsc->is_managed?"":" (unmanaged) ");
#if CURSES_ENABLED
if(options & pe_print_ncurses) {
move(-1, 0);
@@ -895,10 +896,6 @@
if(options & pe_print_html) {
status_print(" </font> ");
}
-
- if(rsc->is_managed == FALSE) {
- status_print(" (unmanaged) ");
- }
if((options & pe_print_rsconly) == 0) {
@@ -1258,7 +1255,7 @@
local_color->details->candidate_nodes = intersection;
}
- crm_debug("Colored resource %s with color %d",
+ crm_debug_2("Colored resource %s with color %d",
rsc->id, local_color->id);
print_resource(LOG_DEBUG_3, "Colored Resource", rsc, TRUE);
------------------------------
Message: 3
Date: Sat, 7 Jan 2006 14:00: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:
group.c incarnation.c pengine.c pengine.h unpack.c
Log Message:
Now that we activly enforce tag+id uniqueness there is no need to prepend
the parent's name to child resources... add the short_resource_names
option to inhibit this behaviour (defaults to false as it requires all
resources to be inactive before being enabled).
Some logging tweaks too.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- group.c 19 Dec 2005 16:54:44 -0000 1.49
+++ group.c 7 Jan 2006 21:00:24 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.49 2005/12/19 16:54:44 andrew Exp $ */
+/* $Id: group.c,v 1.50 2006/01/07 21:00:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -99,7 +99,9 @@
xml_obj, xml_native_rsc, XML_CIB_TAG_RESOURCE,
resource_t *new_rsc = NULL;
- set_id(xml_native_rsc, group_data->self->id, -1);
+ 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;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- incarnation.c 25 Dec 2005 12:38:57 -0000 1.69
+++ incarnation.c 7 Jan 2006 21:00:24 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.69 2005/12/25 12:38:57 andrew Exp $ */
+/* $Id: incarnation.c,v 1.70 2006/01/07 21:00:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -77,14 +77,18 @@
CRM_DEV_ASSERT(clone_data->xml_obj_child != NULL);
child_copy = copy_xml(clone_data->xml_obj_child);
- set_id(child_copy, rsc->id, sub_id);
+ if(data_set->short_rsc_names) {
+ set_id(child_copy, NULL, sub_id);
+ } else {
+ set_id(child_copy, rsc->id, sub_id);
+ }
if(common_unpack(child_copy, &child_rsc,
clone_data->self->parameters, data_set)) {
char *inc_num = crm_itoa(sub_id);
char *inc_max = crm_itoa(clone_data->clone_max);
- crm_debug("Setting clone attributes for: %s", child_rsc->id);
+ crm_debug_3("Setting clone attributes for: %s", child_rsc->id);
clone_data->child_list = g_list_append(
clone_data->child_list, child_rsc);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- pengine.c 7 Jan 2006 20:56:41 -0000 1.99
+++ pengine.c 7 Jan 2006 21:00:24 -0000 1.100
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.99 2006/01/07 20:56:41 andrew Exp $ */
+/* $Id: pengine.c,v 1.100 2006/01/07 21:00:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -327,6 +327,7 @@
data_set->remove_after_stop = FALSE;
data_set->stop_action_orphans = TRUE;
data_set->stop_rsc_orphans = FALSE;
+ data_set->short_rsc_names = FALSE;
data_set->config_hash = NULL;
data_set->nodes = NULL;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- pengine.h 2 Nov 2005 17:37:28 -0000 1.102
+++ pengine.h 7 Jan 2006 21:00:24 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: pengine.h,v 1.102 2005/11/02 17:37:28 andrew Exp $ */
+/* $Id: pengine.h,v 1.103 2006/01/07 21:00:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -98,6 +98,7 @@
gboolean remove_after_stop;
gboolean stop_rsc_orphans;
gboolean stop_action_orphans;
+ gboolean short_rsc_names;
int default_resource_stickiness;
no_quorum_policy_t no_quorum_policy;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- unpack.c 19 Dec 2005 16:54:44 -0000 1.149
+++ unpack.c 7 Jan 2006 21:00:24 -0000 1.150
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.149 2005/12/19 16:54:44 andrew Exp $ */
+/* $Id: unpack.c,v 1.150 2006/01/07 21:00:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -109,6 +109,7 @@
param_value(config_hash, config, "stop_orphan_actions");
param_value(config_hash, config, "remove_after_stop");
param_value(config_hash, config, "is_managed_default");
+ param_value(config_hash, config, "short_resource_names");
#endif
get_cluster_pref("transition_idle_timeout");
if(value != NULL) {
@@ -144,6 +145,13 @@
" - resources can run anywhere by default");
}
+ get_cluster_pref("short_resource_names");
+ if(value != NULL) {
+ cl_str_to_boolean(value, &data_set->short_rsc_names);
+ }
+ crm_info("Using short resource names: %s",
+ data_set->short_rsc_names?"true":"false");
+
get_cluster_pref("no_quorum_policy");
if(safe_str_eq(value, "ignore")) {
data_set->no_quorum_policy = no_quorum_ignore;
@@ -185,7 +193,7 @@
if(value != NULL) {
cl_str_to_boolean(value, &data_set->remove_after_stop);
}
- crm_info("Orphan resource actions are %s",
+ crm_info("Stopped resources are removed from the status section: %s",
data_set->remove_after_stop?"true":"false");
get_cluster_pref("is_managed_default");
@@ -230,7 +238,7 @@
const char *uname = NULL;
const char *type = NULL;
- crm_debug("Begining unpack... %s",
+ crm_debug_2("Begining unpack... %s",
xml_nodes?crm_element_name(xml_nodes):"<none>");
xml_child_iter_filter(
xml_nodes, xml_obj, XML_CIB_TAG_NODE,
@@ -322,7 +330,7 @@
gboolean
unpack_resources(crm_data_t * xml_resources, pe_working_set_t *data_set)
{
- crm_debug("Begining unpack... %s",
+ crm_debug_2("Begining unpack... %s",
xml_resources?crm_element_name(xml_resources):"<none>");
xml_child_iter(
xml_resources, xml_obj,
@@ -353,7 +361,7 @@
unpack_constraints(crm_data_t * xml_constraints, pe_working_set_t *data_set)
{
crm_data_t *lifetime = NULL;
- crm_debug("Begining unpack... %s",
+ crm_debug_2("Begining unpack... %s",
xml_constraints?crm_element_name(xml_constraints):"<none>");
xml_child_iter(
xml_constraints, xml_obj,
@@ -1210,7 +1218,7 @@
rsc->role = RSC_ROLE_STOPPED;
if(safe_str_eq(task, CRMD_ACTION_STATUS)) {
/* probe or stop action*/
- crm_debug("%s: resource %s is stopped", id, rsc->id);
+ crm_debug_2("%s: resource %s is stopped", id, rsc->id);
return TRUE;
}
@@ -1305,8 +1313,9 @@
* that it can safely leave it optional
*/
if(rsc->role < RSC_ROLE_STARTED) {
- crm_debug("%s active on %s",
- rsc->id, node->details->uname);
+ crm_debug_2("%s active on %s",
+ rsc->id,
+ node->details->uname);
rsc->role = RSC_ROLE_STARTED;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 3
*******************************************
