Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 8 Jun 2006 10:52:08 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Fix a memory leak in do_id_check
- normally i hate goto's but they seemed the best way :(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- xml.c 7 Jun 2006 12:50:02 -0000 1.91
+++ xml.c 8 Jun 2006 16:52:06 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.91 2006/06/07 12:50:02 andrew Exp $ */
+/* $Id: xml.c,v 1.92 2006/06/08 16:52:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2307,11 +2307,11 @@
if(tag_needs_id(tag_name) == FALSE) {
crm_debug_5("%s does not need an ID", tag_name);
- return modified;
+ goto finish_id_check;
} else if(tag_id != NULL && non_unique_allowed(tag_name)){
crm_debug_5("%s does not need top be unique", tag_name);
- return modified;
+ goto finish_id_check;
}
lookup_id = NULL;
@@ -2320,7 +2320,7 @@
lookup_value = g_hash_table_lookup(id_hash, lookup_id);
if(lookup_value == NULL) {
g_hash_table_insert(id_hash, lookup_id,
crm_strdup(tag_id));
- return modified;
+ goto finish_id_check;
}
modified |= (!silent_rename);
@@ -2349,7 +2349,8 @@
tag_name, tag_id);
}
crm_free(old_id);
-
+
+ finish_id_check:
if(created_hash) {
g_hash_table_destroy(id_hash);
}
------------------------------
Message: 2
Date: Thu, 8 Jun 2006 10:53:01 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
status.c
Log Message:
Cleanup the PE cleanup functions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/status.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- status.c 8 Jun 2006 13:39:10 -0000 1.3
+++ status.c 8 Jun 2006 16:53:01 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.3 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: status.c,v 1.4 2006/06/08 16:53:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -63,7 +63,6 @@
gboolean
cluster_status(pe_working_set_t *data_set)
{
-/* int lpc; */
crm_data_t * config = get_object_root(
XML_CIB_TAG_CRMCONFIG, data_set->input);
crm_data_t * cib_nodes = get_object_root(
@@ -90,7 +89,7 @@
data_set->input, XML_ATTR_DC_UUID);
}
- unpack_config(config, data_set);
+ unpack_config(config, data_set);
if(value != NULL) {
cl_str_to_boolean(value, &data_set->have_quorum);
@@ -102,10 +101,10 @@
" - fencing and resource management disabled");
}
- unpack_nodes(cib_nodes, data_set);
- unpack_resources(cib_resources, data_set);
- unpack_status(cib_status, data_set);
-
+ unpack_nodes(cib_nodes, data_set);
+ unpack_resources(cib_resources, data_set);
+ unpack_status(cib_status, data_set);
+
return TRUE;
}
@@ -192,6 +191,10 @@
free_ha_date(data_set->now);
free_xml(data_set->input);
data_set->stonith_action = NULL;
+
+ CRM_CHECK(data_set->colors == NULL, ;);
+ CRM_CHECK(data_set->ordering_constraints == NULL, ;);
+ CRM_CHECK(data_set->placement_constraints == NULL, ;);
}
------------------------------
Message: 3
Date: Thu, 8 Jun 2006 10:53:01 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
allocate.c
Log Message:
Cleanup the PE cleanup functions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/allocate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- allocate.c 8 Jun 2006 13:39:10 -0000 1.2
+++ allocate.c 8 Jun 2006 16:53:01 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: allocate.c,v 1.2 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: allocate.c,v 1.3 2006/06/08 16:53:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -932,15 +932,18 @@
return;
}
- crm_debug_3("deleting order cons");
- pe_free_ordering(data_set->ordering_constraints);
-
- crm_debug_3("deleting colors");
+ crm_debug_3("deleting order cons: %p", data_set->ordering_constraints);
+ pe_free_ordering(data_set->ordering_constraints);
+ data_set->ordering_constraints = NULL;
+
+ crm_debug_3("deleting colors: %p", data_set->colors);
pe_free_colors(data_set->colors);
-
- crm_debug_3("deleting node cons");
+ data_set->colors = NULL;
+
+ crm_debug_3("deleting node cons: %p", data_set->placement_constraints);
pe_free_rsc_to_node(data_set->placement_constraints);
-
+ data_set->placement_constraints = NULL;
+
cleanup_calculations(data_set);
}
------------------------------
Message: 4
Date: Thu, 8 Jun 2006 10:53:02 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/admin
Modified Files:
crm_verify.c
Log Message:
Cleanup the PE cleanup functions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- crm_verify.c 7 Jun 2006 12:46:57 -0000 1.12
+++ crm_verify.c 8 Jun 2006 16:53:01 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.12 2006/06/07 12:46:57 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.13 2006/06/08 16:53:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -51,6 +51,7 @@
const char *crm_system_name = NULL;
void usage(const char *cmd, int exit_status);
extern gboolean stage0(pe_working_set_t *data_set);
+void cleanup_alloc_calculations(pe_working_set_t *data_set);
int
main(int argc, char **argv)
@@ -211,7 +212,6 @@
xml_remove_prop(node_state, XML_CIB_TAG_LRM);
);
#endif
-
crm_notice("Required feature set: %s", feature_set(cib_object));
if(do_id_check(cib_object, NULL, FALSE, FALSE)) {
pe_config_err("ID Check failed");
@@ -220,13 +220,12 @@
if(validate_with_dtd(cib_object, HA_LIBDIR"/heartbeat/crm.dtd") ==
FALSE) {
pe_config_err("CIB did not pass DTD validation");
}
-
set_working_set_defaults(&data_set);
data_set.input = cib_object;
data_set.now = new_ha_date(TRUE);
stage0(&data_set);
- cleanup_calculations(&data_set);
+ cleanup_alloc_calculations(&data_set);
if(USE_LIVE_CIB) {
/* Calling msg2ipcchan() seems to initialize something
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 27
********************************************
