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])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 22 Apr 2006 04:26:17 -0600 (MDT)
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/crmd
Modified Files:
fsa.c
Log Message:
Perform this action earlier
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- fsa.c 19 Apr 2006 12:15:59 -0000 1.143
+++ fsa.c 22 Apr 2006 10:26:16 -0000 1.144
@@ -455,6 +455,8 @@
do_fsa_action(fsa_data, A_ELECTION_VOTE,
do_election_vote);
} else if(is_set(fsa_actions, A_ELECTION_COUNT)) {
do_fsa_action(fsa_data, A_ELECTION_COUNT,
do_election_count_vote);
+ } else if(is_set(fsa_actions, A_LRM_EVENT)) {
+ do_fsa_action(fsa_data, A_LRM_EVENT,
do_lrm_event);
/*
* High priority actions
@@ -508,8 +510,6 @@
do_fsa_action(fsa_data, A_DC_JOIN_FINALIZE,
do_dc_join_finalize);
} else if(is_set(fsa_actions, A_LRM_INVOKE)) {
do_fsa_action(fsa_data, A_LRM_INVOKE,
do_lrm_invoke);
- } else if(is_set(fsa_actions, A_LRM_EVENT)) {
- do_fsa_action(fsa_data, A_LRM_EVENT,
do_lrm_event);
} else if(is_set(fsa_actions, A_PE_INVOKE)) {
do_fsa_action(fsa_data, A_PE_INVOKE,
do_pe_invoke);
} else if(is_set(fsa_actions, A_TE_INVOKE)) {
------------------------------
Message: 2
Date: Sat, 22 Apr 2006 04:27:13 -0600 (MDT)
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/crmd
Modified Files:
lrm.c
Log Message:
Logging
Convert some asserts to CRM_CHECK()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- lrm.c 21 Apr 2006 07:08:04 -0000 1.188
+++ lrm.c 22 Apr 2006 10:27:13 -0000 1.189
@@ -546,9 +546,9 @@
slist_iter(
op, lrm_op_t, op_list, llpc,
- crm_debug("Processing op %s (%d) for %s (status=%d, rc=%d)",
- op->op_type, op->call_id, the_rsc->id,
- op->op_status, op->rc);
+ crm_debug("Processing op %s_%d (%d) for %s (status=%d, rc=%d)",
+ op->op_type, op->interval, op->call_id, the_rsc->id,
+ op->op_status, op->rc);
CRM_ASSERT(max_call_id <= op->call_id);
if(safe_str_eq(op->op_type, CRMD_ACTION_STOP)) {
@@ -1451,17 +1451,12 @@
gboolean is_probe = FALSE;
int log_rsc_err = LOG_WARNING;
- if(msg_data->fsa_cause != C_LRM_OP_CALLBACK) {
- register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL);
- return I_NULL;
- }
+ CRM_CHECK(msg_data->fsa_cause == C_LRM_OP_CALLBACK, return I_NULL);
op = fsa_typed_data(fsa_dt_lrm);
- CRM_DEV_ASSERT(op != NULL);
- CRM_DEV_ASSERT(op != NULL && op->rsc_id != NULL);
-
- if(crm_assert_failed) { return I_NULL; }
+ CRM_CHECK(op != NULL, return I_NULL);
+ CRM_CHECK(op->rsc_id != NULL, return I_NULL);
probe_s = g_hash_table_lookup(op->params, XML_ATTR_LRM_PROBE);
is_probe = crm_is_true(probe_s);
------------------------------
Message: 3
Date: Sat, 22 Apr 2006 04:28:08 -0600 (MDT)
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:
stages.c
Log Message:
Its only a warning if the nodes both "need" the resource with a score of
INFINITY
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- stages.c 21 Apr 2006 09:18:26 -0000 1.91
+++ stages.c 22 Apr 2006 10:28:08 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.91 2006/04/21 09:18:26 andrew Exp $ */
+/* $Id: stages.c,v 1.92 2006/04/22 10:28:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -551,12 +551,15 @@
);
if(multiple > 1) {
- int log_level = LOG_WARNING;
+ int log_level = LOG_INFO;
char *score = score2char(chosen->weight);
+ if(chosen->weight >= INFINITY) {
+ log_level = LOG_WARNING;
+ }
- crm_warn("%d nodes with equal score (%s) for running the"
- " listed resources (chose %s):",
- multiple, score, chosen->details->uname);
+ crm_log_maybe(log_level, "%d nodes with equal score (%s) for"
+ " running the listed resources (chose %s):",
+ multiple, score, chosen->details->uname);
slist_iter(rsc, resource_t,
color->details->allocated_resources, lpc,
rsc->fns->print(
------------------------------
Message: 4
Date: Sat, 22 Apr 2006 04:30:03 -0600 (MDT)
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:
unpack.c
Log Message:
This is a better way to ignore things that happened before a stop
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- unpack.c 18 Apr 2006 11:15:37 -0000 1.184
+++ unpack.c 22 Apr 2006 10:30:03 -0000 1.185
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.184 2006/04/18 11:15:37 andrew Exp $ */
+/* $Id: unpack.c,v 1.185 2006/04/22 10:30:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -939,14 +939,34 @@
);
if(op_list != NULL) {
+ const char *task = NULL;
+ gboolean skip_mode = TRUE;
saved_role = rsc->role;
on_fail = action_fail_ignore;
rsc->role = RSC_ROLE_STOPPED;
sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
-
+
slist_iter(
rsc_op, crm_data_t, sorted_op_list, lpc,
+ task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
+ if(safe_str_eq(task, CRMD_ACTION_STOP)) {
+ skip_mode = FALSE;
+ crm_info("Skipped everything prior to: %s",
+ ID(rsc_op));
+ }
+ if(skip_mode == FALSE) {
+ unpack_rsc_op(rsc, node, rsc_op,
+ &max_call_id, &on_fail, data_set);
+ }
+ );
+
+ slist_iter(
+ rsc_op, crm_data_t, sorted_op_list, lpc,
+
+ if(skip_mode == FALSE) {
+ break;
+ }
unpack_rsc_op(rsc, node, rsc_op,
&max_call_id, &on_fail, data_set);
);
@@ -1270,7 +1290,7 @@
is_probe = TRUE;
} else if(interval > 0 && rsc->role < RSC_ROLE_STARTED) {
- crm_debug_2("Ignoring pre-start recurring action");
+ crm_debug_2("Skipping recurring action %s for stopped
resource", id);
return FALSE;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 114
*********************************************
