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: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 18 Mar 2006 10:23:50 -0700 (MST)
From: [email protected]
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/transition
Modified Files:
actions.c graph.c unpack.c utils.c
Log Message:
Replace calls to CRM_DEV_ASSERT with CRM_CHECK which requires a recovery
action if the condition fails.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/actions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- actions.c 14 Feb 2006 11:32:12 -0000 1.1
+++ actions.c 18 Mar 2006 17:23:49 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.1 2006/02/14 11:32:12 andrew Exp $ */
+/* $Id: actions.c,v 1.2 2006/03/18 17:23:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -59,8 +59,8 @@
crm_data_t *update = NULL;
crm_data_t *node_state = create_xml_node(NULL, XML_CIB_TAG_STATE);
- CRM_DEV_ASSERT(op->node_name != NULL);
- CRM_DEV_ASSERT(op->node_uuid != NULL);
+ CRM_CHECK(op->node_name != NULL);
+ CRM_CHECK(op->node_uuid != NULL);
crm_xml_add(node_state, XML_ATTR_UUID, uuid);
crm_xml_add(node_state, XML_ATTR_UNAME, target);
@@ -106,9 +106,9 @@
target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
- CRM_DEV_ASSERT(id != NULL);
- CRM_DEV_ASSERT(uuid != NULL);
- CRM_DEV_ASSERT(target != NULL);
+ CRM_CHECK(id != NULL);
+ CRM_CHECK(uuid != NULL);
+ CRM_CHECK(target != NULL);
if(crm_assert_failed) {
/* error */
te_log_action(LOG_ERR, "Corrupted command (id=%s): no node",
@@ -166,7 +166,7 @@
task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
on_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
- CRM_DEV_ASSERT(on_node != NULL && strlen(on_node) != 0);
+ CRM_CHECK(on_node != NULL && strlen(on_node) != 0);
if(crm_assert_failed) {
/* error */
te_log_action(LOG_ERR, "Corrupted command (id=%s) %s: no node",
@@ -223,7 +223,7 @@
action->invoked = FALSE;
on_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
- CRM_DEV_ASSERT(on_node != NULL && strlen(on_node) != 0);
+ CRM_CHECK(on_node != NULL && strlen(on_node) != 0);
if(crm_assert_failed) {
/* error */
te_log_action(LOG_ERR, "Corrupted command(id=%s) %s: no node",
@@ -384,8 +384,8 @@
const char *on_node = NULL;
const char *task_uuid = NULL;
- CRM_DEV_ASSERT(action != NULL); if(crm_assert_failed) { return; }
- CRM_DEV_ASSERT(action->xml != NULL); if(crm_assert_failed) { return; }
+ CRM_CHECK(action != NULL); if(crm_assert_failed) { return; }
+ CRM_CHECK(action->xml != NULL); if(crm_assert_failed) { return; }
rsc_op = action->xml;
task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- graph.c 17 Mar 2006 00:42:16 -0000 1.7
+++ graph.c 18 Mar 2006 17:23:49 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.7 2006/03/17 00:42:16 andrew Exp $ */
+/* $Id: graph.c,v 1.8 2006/03/18 17:23:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -34,8 +34,8 @@
update_synapse_ready(synapse_t *synapse, int action_id)
{
gboolean updates = FALSE;
- CRM_DEV_ASSERT(synapse->executed == FALSE);
- CRM_DEV_ASSERT(synapse->confirmed == FALSE);
+ CRM_CHECK(synapse->executed == FALSE, return FALSE);
+ CRM_CHECK(synapse->confirmed == FALSE, return FALSE);
synapse->ready = TRUE;
slist_iter(
@@ -66,8 +66,8 @@
gboolean updates = FALSE;
gboolean is_confirmed = TRUE;
- CRM_DEV_ASSERT(synapse->executed);
- CRM_DEV_ASSERT(synapse->confirmed == FALSE);
+ CRM_CHECK(synapse->executed, return FALSE);
+ CRM_CHECK(synapse->confirmed == FALSE, return TRUE);
is_confirmed = TRUE;
slist_iter(
@@ -132,8 +132,8 @@
static gboolean
should_fire_synapse(synapse_t *synapse)
{
- CRM_DEV_ASSERT(synapse->executed == FALSE);
- CRM_DEV_ASSERT(synapse->confirmed == FALSE);
+ CRM_CHECK(synapse->executed == FALSE, return FALSE);
+ CRM_CHECK(synapse->confirmed == FALSE, return FALSE);
crm_debug_3("Checking pre-reqs for %d", synapse->id);
/* lookup prereqs */
@@ -160,16 +160,10 @@
const char *id = NULL;
int tmp_time = 2 * action->timeout;
- CRM_DEV_ASSERT(action->executed == FALSE);
- if(crm_assert_failed) {
- return FALSE;
- }
+ CRM_CHECK(action->executed == FALSE, return FALSE);
id = ID(action->xml);
- CRM_DEV_ASSERT(id != NULL);
- if(crm_assert_failed) {
- return FALSE;
- }
+ CRM_CHECK(id != NULL, return FALSE);
if(tmp_time > graph->transition_timeout) {
crm_debug("Action %d: Increasing IDLE timer to %d",
@@ -190,7 +184,7 @@
} else if(action->type == action_type_crm) {
const char *task = NULL;
task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
- CRM_DEV_ASSERT(task != NULL);
+ CRM_CHECK(task != NULL, return FALSE);
if(safe_str_eq(task, CRM_OP_FENCE)) {
te_log_action(LOG_INFO, "Executing STONITH-event: %d",
@@ -211,9 +205,9 @@
static gboolean
fire_synapse(crm_graph_t *graph, synapse_t *synapse)
{
- CRM_DEV_ASSERT(synapse != NULL);
- CRM_DEV_ASSERT(synapse->ready);
- CRM_DEV_ASSERT(synapse->confirmed == FALSE);
+ CRM_CHECK(synapse != NULL, return FALSE);
+ CRM_CHECK(synapse->ready, return FALSE);
+ CRM_CHECK(synapse->confirmed == FALSE, return TRUE);
crm_debug("Synapse %d fired", synapse->id);
synapse->executed = TRUE;
@@ -225,7 +219,6 @@
/* Invoke the action and start the timer */
passed = initiate_action(graph, action);
- CRM_DEV_ASSERT(passed == TRUE);
if(passed == FALSE) {
crm_err("Failed initiating <%s id=%d> in synapse %d",
crm_element_name(action->xml),
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/unpack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- unpack.c 20 Feb 2006 16:25:50 -0000 1.4
+++ unpack.c 18 Mar 2006 17:23:49 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.4 2006/02/20 16:25:50 andrew Exp $ */
+/* $Id: unpack.c,v 1.5 2006/03/18 17:23:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -95,7 +95,7 @@
{
const char *value = NULL;
synapse_t *new_synapse = NULL;
- CRM_DEV_ASSERT(xml_synapse != NULL);
+ CRM_CHECK(xml_synapse != NULL, return NULL);
crm_debug_3("looking in synapse %s", ID(xml_synapse));
crm_malloc0(new_synapse, sizeof(synapse_t));
@@ -107,7 +107,7 @@
}
new_graph->num_synapses++;
- CRM_DEV_ASSERT(new_synapse->id >= 0);
+ CRM_CHECK(new_synapse->id >= 0, return NULL);
crm_debug_3("look for actions in synapse %s",
crm_element_value(xml_synapse, XML_ATTR_ID));
@@ -189,8 +189,8 @@
if(xml_graph != NULL) {
t_id = crm_element_value(xml_graph, "transition_id");
time = crm_element_value(xml_graph, "global_timeout");
- CRM_DEV_ASSERT(t_id != NULL);
- CRM_DEV_ASSERT(time != NULL);
+ CRM_CHECK(t_id != NULL, return NULL);
+ CRM_CHECK(time != NULL, return NULL);
new_graph->transition_timeout = crm_get_msec(time);
new_graph->id = crm_parse_int(t_id, "-1");
}
@@ -215,7 +215,7 @@
destroy_action(crm_action_t *action)
{
if(action->timer) {
- CRM_DEV_ASSERT(action->timer->source_id == 0);
+ CRM_CHECK(action->timer->source_id == 0, ;);
/* Gmain_timeout_remove(action->timer->source_id); */
}
g_hash_table_destroy(action->params);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- utils.c 20 Feb 2006 16:25:50 -0000 1.5
+++ utils.c 18 Mar 2006 17:23:49 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.5 2006/02/20 16:25:50 andrew Exp $ */
+/* $Id: utils.c,v 1.6 2006/03/18 17:23:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -58,11 +58,11 @@
crm_info("Setting custom graph functions");
graph_fns = fns;
- CRM_DEV_ASSERT(graph_fns != NULL);
- CRM_DEV_ASSERT(graph_fns->rsc != NULL);
- CRM_DEV_ASSERT(graph_fns->crmd != NULL);
- CRM_DEV_ASSERT(graph_fns->pseudo != NULL);
- CRM_DEV_ASSERT(graph_fns->stonith != NULL);
+ CRM_ASSERT(graph_fns != NULL);
+ CRM_ASSERT(graph_fns->rsc != NULL);
+ CRM_ASSERT(graph_fns->crmd != NULL);
+ CRM_ASSERT(graph_fns->pseudo != NULL);
+ CRM_ASSERT(graph_fns->stonith != NULL);
}
const char *
------------------------------
Message: 2
Date: Sat, 18 Mar 2006 10:23:51 -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 master.c native.c
ptest.c rules.c unpack.c utils.c
Log Message:
Replace calls to CRM_DEV_ASSERT with CRM_CHECK which requires a recovery
action if the condition fails.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- complex.c 9 Mar 2006 21:36:38 -0000 1.73
+++ complex.c 18 Mar 2006 17:23:48 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.73 2006/03/09 21:36:38 andrew Exp $ */
+/* $Id: complex.c,v 1.74 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -499,20 +499,14 @@
void
add_rsc_param(resource_t *rsc, const char *name, const char *value)
{
- CRM_DEV_ASSERT(rsc != NULL);
- if(crm_assert_failed) {
- return;
- }
+ 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_DEV_ASSERT(hash != NULL);
- if(crm_assert_failed) {
- return;
- }
+ CRM_CHECK(hash != NULL, return);
crm_debug_3("adding: name=%s value=%s", crm_str(name), crm_str(value));
if(name == NULL || value == NULL) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- graph.c 9 Mar 2006 10:07:53 -0000 1.76
+++ graph.c 18 Mar 2006 17:23:48 -0000 1.77
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.76 2006/03/09 10:07:53 andrew Exp $ */
+/* $Id: graph.c,v 1.77 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -133,10 +133,7 @@
} else if(other->type == pe_ordering_restart) {
} else if(other->type == pe_ordering_postnotify) {
- CRM_DEV_ASSERT(action->rsc == other->action->rsc);
- if(crm_assert_failed) {
- continue;
- }
+ CRM_CHECK(action->rsc == other->action->rsc, continue);
} else {
crm_debug_3("\t Ignoring: ordering %s",
@@ -384,14 +381,7 @@
action->node->details->uname);
crm_xml_add(action_xml, XML_LRM_ATTR_TARGET_UUID,
- action->node->details->id);
-
- CRM_DEV_ASSERT(NULL != crm_element_value(
- action_xml, XML_LRM_ATTR_TARGET));
-
- CRM_DEV_ASSERT(NULL != crm_element_value(
- action_xml, XML_LRM_ATTR_TARGET_UUID));
-
+ action->node->details->id);
}
if(action->failure_is_fatal == FALSE) {
@@ -554,7 +544,7 @@
continue;
}
- CRM_DEV_ASSERT(last_action < wrapper->action->id);
+ CRM_CHECK(last_action < wrapper->action->id, ;);
last_action = wrapper->action->id;
input = create_xml_node(in, "trigger");
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- group.c 24 Feb 2006 11:31:13 -0000 1.53
+++ group.c 18 Mar 2006 17:23:48 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.53 2006/02/24 11:31:13 andrew Exp $ */
+/* $Id: group.c,v 1.54 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -171,7 +171,7 @@
slist_iter(
child_rsc, resource_t, group_data->child_list, lpc,
group_color = child_rsc->fns->color(child_rsc, data_set);
- CRM_DEV_ASSERT(group_color != NULL);
+ CRM_CHECK(group_color != NULL, continue);
native_assign_color(rsc, group_color);
);
@@ -337,10 +337,7 @@
crm_debug_4("Processing constraints from %s", rsc_lh->id);
get_group_variant_data(group_data, rsc_lh);
- CRM_DEV_ASSERT(group_data->self != NULL);
- if(crm_assert_failed) {
- return;
- }
+ CRM_CHECK(group_data->self != NULL, return);
if(group_data->colocated) {
group_data->first_child->fns->rsc_colocation_lh(
@@ -366,11 +363,8 @@
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc_rh);
- CRM_DEV_ASSERT(group_data->self != NULL);
- if(crm_assert_failed) {
- return;
- }
- CRM_DEV_ASSERT(rsc_lh->variant == pe_native);
+ 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);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- incarnation.c 14 Feb 2006 12:01:45 -0000 1.73
+++ incarnation.c 18 Mar 2006 17:23:48 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.73 2006/02/14 12:01:45 andrew Exp $ */
+/* $Id: incarnation.c,v 1.74 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -75,7 +75,7 @@
clone_variant_data_t *clone_data = NULL;
get_clone_variant_data(clone_data, rsc);
- CRM_DEV_ASSERT(clone_data->xml_obj_child != NULL);
+ 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);
@@ -160,8 +160,7 @@
xml_obj, XML_CIB_TAG_RESOURCE, TRUE);
}
- CRM_DEV_ASSERT(clone_data->xml_obj_child != NULL);
- if(crm_assert_failed) { return; }
+ CRM_CHECK(clone_data->xml_obj_child != NULL, return);
if(common_unpack(xml_self, &self, NULL, data_set)) {
clone_data->self = self;
@@ -241,7 +240,7 @@
} else if(resource2->provisional) {
return -1;
}
- CRM_DEV_ASSERT(FALSE);
+ CRM_CHECK(FALSE, return 0);
return 0;
}
@@ -345,7 +344,7 @@
slist_iter(child, resource_t, clone_data->child_list, lpc2,
node_t *current = NULL;
if(child->provisional == FALSE) {
- CRM_DEV_ASSERT(child->color != NULL);
+ CRM_CHECK(child->color != NULL, continue);
current =
child->color->details->chosen_node;
} else if(child->running_on != NULL) {
current = child->running_on->data;
@@ -879,7 +878,7 @@
resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
{
clone_variant_data_t *clone_data = NULL;
- CRM_DEV_ASSERT(rsc_lh->variant == pe_native);
+ CRM_CHECK(rsc_lh->variant == pe_native, return);
crm_debug_3("Processing RH of constraint %s", constraint->id);
@@ -1031,18 +1030,12 @@
slist_iter(entry, notify_entry_t, list, lpc,
rsc_id = entry->rsc->id;
- CRM_DEV_ASSERT(rsc_id != NULL);
- if(crm_assert_failed) {
- rsc_id = "__none__";
- }
+ CRM_CHECK(rsc_id != NULL, rsc_id = "__none__");
uname = NULL;
if(entry->node) {
uname = entry->node->details->uname;
}
- CRM_DEV_ASSERT(uname != NULL);
- if(crm_assert_failed) {
- uname = "__none__";
- }
+ CRM_CHECK(uname != NULL, uname = "__none__");
/* filter dups */
if(safe_str_eq(rsc_id, last_rsc_id)) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- master.c 8 Mar 2006 15:47:50 -0000 1.9
+++ master.c 18 Mar 2006 17:23:48 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.9 2006/03/08 15:47:50 andrew Exp $ */
+/* $Id: master.c,v 1.10 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -266,7 +266,7 @@
child_rsc, resource_t, clone_data->child_list, lpc,
crm_debug_2("Assigning priority for %s", child_rsc->id);
- CRM_DEV_ASSERT(child_rsc->color != NULL);
+ CRM_CHECK(child_rsc->color != NULL, continue);
chosen = child_rsc->color->details->chosen_node;
switch(child_rsc->next_role) {
@@ -279,7 +279,7 @@
child_rsc->priority = -1;
- CRM_DEV_ASSERT(chosen != NULL);
+ CRM_CHECK(chosen != NULL, break);
len = 8 + strlen(child_rsc->id);
crm_malloc0(attr_name, len);
@@ -306,7 +306,7 @@
child_rsc->priority = -INFINITY;
break;
default:
- CRM_DEV_ASSERT(FALSE/* unhandled */);
+ CRM_CHECK(FALSE/* unhandled */, ;);
}
);
@@ -318,7 +318,7 @@
slist_iter(
child_rsc, resource_t, clone_data->child_list, lpc,
- CRM_DEV_ASSERT(child_rsc->color != NULL);
+ CRM_CHECK(child_rsc->color != NULL, continue);
chosen = child_rsc->color->details->chosen_node;
switch(child_rsc->next_role) {
@@ -375,7 +375,7 @@
}
break;
default:
- CRM_DEV_ASSERT(FALSE/* unhandled */);
+ CRM_CHECK(FALSE/* unhandled */, ;);
}
);
crm_info("Promoted %d (of %d) slaves to master", promoted, master_max);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- native.c 9 Mar 2006 21:36:38 -0000 1.113
+++ native.c 18 Mar 2006 17:23:48 -0000 1.114
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.113 2006/03/09 21:36:38 andrew Exp $ */
+/* $Id: native.c,v 1.114 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -96,11 +96,11 @@
void
native_add_running(resource_t *rsc, node_t *node, pe_working_set_t *data_set)
{
- CRM_DEV_ASSERT(node != NULL); if(crm_assert_failed) { return; }
+ CRM_CHECK(node != NULL, return);
slist_iter(
a_node, node_t, rsc->running_on, lpc,
- CRM_DEV_ASSERT(a_node != NULL);
+ CRM_CHECK(a_node != NULL, return);
if(safe_str_eq(a_node->details->id, node->details->id)) {
return;
}
@@ -206,10 +206,7 @@
char *value_copy = NULL;
const char *value = NULL;
- CRM_DEV_ASSERT(rsc != NULL);
- if(crm_assert_failed) {
- return NULL;
- }
+ CRM_CHECK(rsc != NULL, return NULL);
crm_debug_2("Looking up %s in %s", name, rsc->id);
@@ -862,8 +859,7 @@
crm_debug_2("RHS of constraint %s is NULL", constraint->id);
return;
}
- print_resource(LOG_DEBUG_3, "before update", rsc,TRUE);
-
+ print_resource(LOG_DEBUG_3, "before update: ", rsc, TRUE);
or_list = node_list_or(
rsc->allowed_nodes, constraint->node_list_rh, FALSE);
@@ -872,9 +868,10 @@
slist_iter(node_rh, node_t, constraint->node_list_rh, lpc,
native_update_node_weight(rsc, constraint, node_rh,
- rsc->allowed_nodes));
+ rsc->allowed_nodes)
+ );
- print_resource(LOG_DEBUG_3, "after update", rsc, TRUE);
+ print_resource(LOG_DEBUG_3, "after update: ", rsc, TRUE);
}
@@ -1115,21 +1112,21 @@
}
if(update_lh && rsc_rh != rsc_lh) {
- CRM_DEV_ASSERT(rsc_lh->color != rsc_rh->color);
+ 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_DEV_ASSERT(rsc_rh->color != NULL);
+ CRM_CHECK(rsc_rh->color != NULL, return);
native_assign_color(rsc_lh, rsc_rh->color);
}
if(update_rh && rsc_rh != rsc_lh) {
- CRM_DEV_ASSERT(rsc_lh->color != rsc_rh->color);
+ CRM_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_DEV_ASSERT(rsc_lh->color != NULL);
+ CRM_CHECK(rsc_lh->color != NULL, return);
native_assign_color(rsc_rh, rsc_lh->color);
}
@@ -1319,11 +1316,7 @@
rsc->provisional = FALSE;
- CRM_DEV_ASSERT(local_color != NULL);
- if (crm_assert_failed) {
- pe_err("local color was NULL");
- return;
- }
+ CRM_CHECK(local_color != NULL, return);
local_color->details->allocated_resources =
g_list_append(local_color->details->allocated_resources,rsc);
@@ -1356,7 +1349,7 @@
node_t *cons_node, GListPtr nodes)
{
node_t *node_rh = NULL;
- CRM_DEV_ASSERT(cons_node != NULL);
+ CRM_CHECK(cons_node != NULL, return);
node_rh = pe_find_node_id(
rsc->allowed_nodes, cons_node->details->id);
@@ -1371,11 +1364,11 @@
node_rh = pe_find_node_id(
rsc->allowed_nodes, cons_node->details->id);
- CRM_DEV_ASSERT(node_rh != NULL);
+ CRM_CHECK(node_rh != NULL, return);
return;
}
- CRM_DEV_ASSERT(node_rh != NULL);
+ CRM_CHECK(node_rh != NULL, return);
if(node_rh == NULL) {
pe_err("Node not found - cant update");
@@ -1510,7 +1503,7 @@
void
filter_nodes(resource_t *rsc)
{
- print_resource(LOG_DEBUG_3, "Filtering nodes for", rsc, FALSE);
+ print_resource(LOG_DEBUG_3, "Filtering nodes for: ", rsc, FALSE);
slist_iter(
node, node_t, rsc->allowed_nodes, lpc,
if(node == NULL) {
@@ -1667,7 +1660,7 @@
/* start / promote */
if(rsc->next_role != RSC_ROLE_STOPPED) {
- CRM_DEV_ASSERT(next_node != NULL);
+ 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);
@@ -1702,7 +1695,7 @@
return;
}
- CRM_DEV_ASSERT(node != NULL);
+ CRM_CHECK(node != NULL, return);
value = g_hash_table_lookup(op->extra, "notify_type");
task = g_hash_table_lookup(op->extra, "notify_operation");
@@ -1934,7 +1927,7 @@
{
crm_debug_2("Executing: %s", rsc->id);
- CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_MASTER);
+ 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;
@@ -1945,7 +1938,7 @@
{
crm_debug_2("Executing: %s", rsc->id);
- CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_SLAVE);
+ CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE);
slist_iter(
current, node_t, rsc->running_on, lpc,
crm_notice("%s\tDeomote %s", next->details->uname, rsc->id);
@@ -1958,7 +1951,7 @@
RoleError(resource_t *rsc, node_t *next, pe_working_set_t *data_set)
{
crm_debug("Executing: %s", rsc->id);
- CRM_DEV_ASSERT(FALSE);
+ CRM_CHECK(FALSE, return FALSE);
return FALSE;
}
@@ -1979,10 +1972,7 @@
action_t *probe = NULL;
node_t *running = NULL;
- CRM_DEV_ASSERT(node != NULL);
- if(crm_assert_failed) {
- return FALSE;
- }
+ CRM_CHECK(node != NULL, return FALSE);
running = pe_find_node_id(rsc->known_on, node->details->id);
if(running != NULL) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/ptest.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ptest.c 17 Feb 2006 13:22:19 -0000 1.72
+++ ptest.c 18 Mar 2006 17:23:48 -0000 1.73
@@ -1,4 +1,4 @@
-/* $Id: ptest.c,v 1.72 2006/02/17 13:22:19 andrew Exp $ */
+/* $Id: ptest.c,v 1.73 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -239,7 +239,7 @@
#ifdef MCHECK
mtrace();
#endif
- CRM_DEV_ASSERT(cib_object != NULL);
+ CRM_CHECK(cib_object != NULL, return 4);
crm_notice("Required feature set: %s", feature_set(cib_object));
do_id_check(cib_object, NULL);
@@ -286,7 +286,7 @@
} else {
dot_write("\"%s\" [ font_color=purple
style=filled fillcolor=%s ]",
action_name, "red");
- CRM_DEV_ASSERT(action->runnable == FALSE);
+ CRM_CHECK(action->runnable == FALSE, ;);
}
} else {
@@ -342,8 +342,8 @@
destroy_graph(transition);
crm_mem_stats(NULL);
- CRM_DEV_ASSERT(crm_mem_stats(NULL) == FALSE);
- CRM_DEV_ASSERT(graph_rc == transition_complete);
+ CRM_CHECK(crm_mem_stats(NULL) == FALSE, crm_err("Memory leak
detected"));
+ CRM_CHECK(graph_rc == transition_complete, crm_err("An invalid
transition was produced"));
crm_free(cib_object);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/rules.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- rules.c 19 Dec 2005 16:54:44 -0000 1.21
+++ rules.c 18 Mar 2006 17:23:48 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: rules.c,v 1.21 2005/12/19 16:54:44 andrew Exp $ */
+/* $Id: rules.c,v 1.22 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -122,7 +122,7 @@
break;
default:
- CRM_DEV_ASSERT(FALSE /* bad type */);
+ CRM_CHECK(FALSE /* bad type */, return FALSE);
accept = FALSE;
}
@@ -331,8 +331,8 @@
value = crm_element_value(cron_spec, xml_field); \
if(value != NULL) { \
decodeNVpair(value, '-', &value_low, &value_high); \
- CRM_DEV_ASSERT(value_low != NULL); \
- value_low_i = crm_parse_int(value_low, "0");
\
+ CRM_CHECK(value_low != NULL, return FALSE); \
+ value_low_i = crm_parse_int(value_low, "0"); \
value_high_i = crm_parse_int(value_high, "-1"); \
if(value_low_i > time_field) { \
return FALSE; \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- unpack.c 17 Mar 2006 00:43:29 -0000 1.165
+++ unpack.c 18 Mar 2006 17:23:48 -0000 1.166
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.165 2006/03/17 00:43:29 andrew Exp $ */
+/* $Id: unpack.c,v 1.166 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -663,7 +663,7 @@
gboolean complete = FALSE;
int len = 0;
- CRM_DEV_ASSERT(last_rsc_id != NULL);
+ CRM_CHECK(last_rsc_id != NULL, return);
if(last_rsc_id != NULL) {
len = strlen(last_rsc_id);
}
@@ -791,7 +791,7 @@
print_resource(LOG_DEBUG_3, "Added orphan", rsc, FALSE);
- CRM_DEV_ASSERT(rsc != NULL);
+ CRM_CHECK(rsc != NULL, return NULL);
slist_iter(
any_node, node_t, data_set->nodes, lpc,
rsc2node_new(
@@ -997,10 +997,7 @@
gboolean
unpack_lrm_resources(node_t *node, crm_data_t * lrm_rsc_list, pe_working_set_t
*data_set)
{
- CRM_DEV_ASSERT(node != NULL);
- if(crm_assert_failed) {
- return FALSE;
- }
+ CRM_CHECK(node != NULL, return FALSE);
crm_debug_3("Unpacking resources on %s", node->details->uname);
@@ -1050,7 +1047,7 @@
sort_return(0);
}
- CRM_DEV_ASSERT(a_task_id != NULL && b_task_id != NULL);
+ CRM_CHECK(a_task_id != NULL && b_task_id != NULL, sort_return(0));
a_call_id = crm_parse_int(a_task_id, NULL);
b_call_id = crm_parse_int(b_task_id, NULL);
@@ -1075,11 +1072,11 @@
ID(a), a_call_id, ID(b), b_call_id);
/* now process pending ops */
- CRM_DEV_ASSERT(a_key != NULL && b_key != NULL);
- CRM_DEV_ASSERT(decode_transition_magic(
- a_key,&a_uuid,&a_id,&a_status, &a_rc));
- CRM_DEV_ASSERT(decode_transition_magic(
- b_key,&b_uuid,&b_id,&b_status, &b_rc));
+ CRM_CHECK(a_key != NULL && b_key != NULL, sort_return(0));
+ CRM_CHECK(decode_transition_magic(
+ a_key,&a_uuid,&a_id,&a_status, &a_rc),
sort_return(0));
+ CRM_CHECK(decode_transition_magic(
+ b_key,&b_uuid,&b_id,&b_status, &b_rc),
sort_return(0));
/* try and determin the relative age of the operation...
* some pending operations (ie. a start) may have been supuerceeded
@@ -1097,8 +1094,8 @@
* because we query the LRM directly
*/
- CRM_DEV_ASSERT(a_call_id == -1 || b_call_id == -1);
- CRM_DEV_ASSERT(a_call_id >= 0 || b_call_id >= 0);
+ CRM_CHECK(a_call_id == -1 || b_call_id == -1, sort_return(0));
+ CRM_CHECK(a_call_id >= 0 || b_call_id >= 0, sort_return(0));
if(b_call_id == -1) {
crm_debug_2("%s (%d) < %s (%d) : transition + call id",
@@ -1126,8 +1123,7 @@
/* we should never end up here */
crm_err("%s (%d:%d:%s) ?? %s (%d:%d:%s) : default",
ID(a), a_call_id, a_id, a_uuid, ID(b), b_call_id, b_id, b_uuid);
- CRM_DEV_ASSERT(FALSE);
- sort_return(0);
+ CRM_CHECK(FALSE, sort_return(0));
}
gboolean
@@ -1152,31 +1148,23 @@
crm_data_t *params = find_xml_node(xml_op, XML_TAG_PARAMS, FALSE);
- CRM_DEV_ASSERT(rsc != NULL); if(crm_assert_failed) { return FALSE; }
- CRM_DEV_ASSERT(node != NULL); if(crm_assert_failed) { return FALSE; }
- CRM_DEV_ASSERT(xml_op != NULL); if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(rsc != NULL, return FALSE);
+ CRM_CHECK(node != NULL, return FALSE);
+ CRM_CHECK(xml_op != NULL, return FALSE);
id = ID(xml_op);
task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
task_id = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
task_status = crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS);
- CRM_DEV_ASSERT(id != NULL);
- if(crm_assert_failed) { return FALSE; }
-
- CRM_DEV_ASSERT(task != NULL);
- if(crm_assert_failed) { return FALSE; }
-
- CRM_DEV_ASSERT(task_status != NULL);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(id != NULL, return FALSE);
+ CRM_CHECK(task != NULL, return FALSE);
+ CRM_CHECK(task_status != NULL, return FALSE);
task_status_i = crm_parse_int(task_status, NULL);
- CRM_DEV_ASSERT(task_status_i <= LRM_OP_ERROR);
- if(crm_assert_failed) {return FALSE;}
-
- CRM_DEV_ASSERT(task_status_i >= LRM_OP_PENDING);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(task_status_i <= LRM_OP_ERROR, return FALSE);
+ CRM_CHECK(task_status_i >= LRM_OP_PENDING, return FALSE);
if(safe_str_eq(task, CRMD_ACTION_NOTIFY)) {
/* safe to ignore these */
@@ -1313,22 +1301,15 @@
task_id_i = crm_parse_int(task_id, "-1");
- CRM_DEV_ASSERT(task_id != NULL);
- if(crm_assert_failed) { return FALSE; }
-
- CRM_DEV_ASSERT(task_id_i >= 0);
- if(crm_assert_failed) {
- crm_err("%s: status=%d, task=%s", id, task_status_i,
task_id);
- return FALSE;
- }
+ CRM_CHECK(task_id != NULL, return FALSE);
+ CRM_CHECK(task_id_i >= 0, return FALSE);
if(task_id_i == *max_call_id) {
crm_debug_2("Already processed this call");
return TRUE;
}
- CRM_DEV_ASSERT(task_id_i > *max_call_id);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(task_id_i > *max_call_id, return FALSE);
}
if(*max_call_id < task_id_i) {
@@ -1346,11 +1327,9 @@
}
actual_rc = crm_element_value(xml_op, XML_LRM_ATTR_RC);
- CRM_DEV_ASSERT(actual_rc != NULL);
- if(actual_rc != NULL) {
- actual_rc_i = crm_parse_int(actual_rc, NULL);
- }
-
+ CRM_CHECK(actual_rc != NULL, return FALSE);
+
+ actual_rc_i = crm_parse_int(actual_rc, NULL);
if(target_rc != NULL && task_status_i != LRM_OP_PENDING) {
crm_debug_2("Exit code from %s: %s vs. %s",
task, target_rc, actual_rc);
@@ -1766,8 +1745,8 @@
if(action_rh == NULL) {
action_rh = action;
}
- CRM_DEV_ASSERT(action != NULL);
- CRM_DEV_ASSERT(action_rh != NULL);
+ CRM_CHECK(action != NULL, return FALSE);
+ CRM_CHECK(action_rh != NULL, return FALSE);
if(safe_str_eq(type, "before")) {
id_lh = crm_element_value(xml_obj, XML_CONS_ATTR_TO);
@@ -1782,8 +1761,8 @@
}
}
- CRM_DEV_ASSERT(action != NULL);
- CRM_DEV_ASSERT(action_rh != NULL);
+ CRM_CHECK(action != NULL, return FALSE);
+ CRM_CHECK(action_rh != NULL, return FALSE);
rsc_lh = pe_find_resource(data_set->resources, id_rh);
rsc_rh = pe_find_resource(data_set->resources, id_lh);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- utils.c 16 Feb 2006 16:01:33 -0000 1.125
+++ utils.c 18 Mar 2006 17:23:48 -0000 1.126
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.125 2006/02/16 16:01:33 andrew Exp $ */
+/* $Id: utils.c,v 1.126 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -292,17 +292,10 @@
{
node_t *new_node = NULL;
- CRM_DEV_ASSERT(this_node != NULL);
- if(this_node == NULL) {
- pe_err("Failed copy of <null> node.");
- return NULL;
- }
+ CRM_CHECK(this_node != NULL, return NULL);
crm_malloc0(new_node, sizeof(node_t));
- CRM_DEV_ASSERT(new_node != NULL);
- if(new_node == NULL) {
- return NULL;
- }
+ CRM_CHECK(new_node != NULL, return NULL);
crm_debug_5("Copying %p (%s) to %p",
this_node, this_node->details->uname, new_node);
@@ -363,10 +356,8 @@
crm_action_debug_3(print_color("Created color", new_color, TRUE));
- CRM_DEV_ASSERT(data_set != NULL);
- if(crm_assert_failed == FALSE) {
- data_set->colors = g_list_append(data_set->colors, new_color);
- }
+ CRM_CHECK(data_set != NULL, return NULL);
+ data_set->colors = g_list_append(data_set->colors, new_color);
return new_color;
}
@@ -504,8 +495,8 @@
color1 = resource1->color;
color2 = resource2->color;
- CRM_DEV_ASSERT(color1 != NULL);
- CRM_DEV_ASSERT(color2 != NULL);
+ CRM_CHECK(color1 != NULL, return 0);
+ CRM_CHECK(color2 != NULL, return 0);
node1 = color1->details->chosen_node;
node2 = color2->details->chosen_node;
@@ -663,11 +654,8 @@
{
action_t *action = NULL;
GListPtr possible_matches = NULL;
- CRM_DEV_ASSERT(key != NULL);
- if(crm_assert_failed) { return NULL; }
-
- CRM_DEV_ASSERT(task != NULL);
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(key != NULL, return NULL);
+ CRM_CHECK(task != NULL, return NULL);
if(save_action && rsc != NULL) {
possible_matches = find_actions(rsc->actions, key, on_node);
@@ -858,7 +846,7 @@
"start_delay",
};
- CRM_DEV_ASSERT(action->rsc != NULL);
+ CRM_CHECK(action->rsc != NULL, return);
if(xml_obj != NULL) {
value = crm_element_value(xml_obj, "prereq");
@@ -1213,8 +1201,8 @@
const char *
role2text(enum rsc_role_e role)
{
- CRM_DEV_ASSERT(role >= RSC_ROLE_UNKNOWN);
- CRM_DEV_ASSERT(role < RSC_ROLE_MAX);
+ CRM_CHECK(role >= RSC_ROLE_UNKNOWN, return RSC_ROLE_UNKNOWN_S);
+ CRM_CHECK(role < RSC_ROLE_MAX, return RSC_ROLE_UNKNOWN_S);
switch(role) {
case RSC_ROLE_UNKNOWN:
return RSC_ROLE_UNKNOWN_S;
@@ -1395,9 +1383,9 @@
long options = pe_print_log;
if(rsc == NULL) {
- crm_debug_4("%s%s: <NULL>",
- pre_text==NULL?"":pre_text,
- pre_text==NULL?"":": ");
+ crm_log_maybe(log_level-1, "%s%s: <NULL>",
+ pre_text==NULL?"":pre_text,
+ pre_text==NULL?"":": ");
return;
}
if(details) {
@@ -1643,7 +1631,7 @@
find_actions(GListPtr input, const char *key, node_t *on_node)
{
GListPtr result = NULL;
- CRM_DEV_ASSERT(key != NULL);
+ CRM_CHECK(key != NULL, return NULL);
slist_iter(
action, action_t, input, lpc,
@@ -1678,7 +1666,7 @@
find_actions_exact(GListPtr input, const char *key, node_t *on_node)
{
GListPtr result = NULL;
- CRM_DEV_ASSERT(key != NULL);
+ CRM_CHECK(key != NULL, return NULL);
slist_iter(
action, action_t, input, lpc,
@@ -1837,7 +1825,7 @@
copy->weight = node_weight;
new_con->node_list_rh = g_list_append(NULL, copy);
} else {
- CRM_DEV_ASSERT(node_weight == 0);
+ CRM_CHECK(node_weight == 0, return NULL);
}
data_set->placement_constraints = g_list_append(
------------------------------
_______________________________________________
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 41
********************************************
