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: lib by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 29 May 2006 07:18:40 -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:
messages.c
Log Message:
Use the standard CRM log level changing mechanism
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -3 -r1.152 -r1.153
--- messages.c 11 May 2006 09:36:17 -0000 1.152
+++ messages.c 29 May 2006 13:18:39 -0000 1.153
@@ -848,16 +848,12 @@
* local node
*/
} else if(strcasecmp(op, CRM_OP_DEBUG_UP) == 0) {
- int level = get_crm_log_level();
- set_crm_log_level(level+1);
- crm_info("Debug set to %d (was %d)",
- get_crm_log_level(), level);
+ alter_debug(DEBUG_INC);
+ crm_info("Debug set to %d", get_crm_log_level());
} else if(strcasecmp(op, CRM_OP_DEBUG_DOWN) == 0) {
- int level = get_crm_log_level();
- set_crm_log_level(level-1);
- crm_info("Debug set to %d (was %d)",
- get_crm_log_level(), level);
+ alter_debug(DEBUG_DEC);
+ crm_info("Debug set to %d", get_crm_log_level());
} else if(strcasecmp(op, CRM_OP_JOIN_OFFER) == 0) {
next_input = I_JOIN_OFFER;
------------------------------
Message: 2
Date: Mon, 29 May 2006 07:20:43 -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/tengine
Modified Files:
actions.c
Log Message:
No connection to stonithd is a hard error (exit).
Ignore failed stonith ops - log an error and wait for the callback instead
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- actions.c 25 May 2006 14:45:53 -0000 1.32
+++ actions.c 29 May 2006 13:20:43 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.32 2006/05/25 14:45:53 andrew Exp $ */
+/* $Id: actions.c,v 1.33 2006/05/29 13:20:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -151,14 +151,12 @@
st_op->private_data = crm_concat(id, key, ';');
crm_free(key);
- if(stonithd_input_IPC_channel() == NULL) {
- crm_err("Cannot fence %s: stonith not available", target);
- return FALSE;
+ CRM_ASSERT(stonithd_input_IPC_channel() != NULL,
+ crm_err("Cannot fence %s: stonith not available. Exiting",
target));
- } else if (ST_OK != stonithd_node_fence( st_op )) {
+ if (ST_OK != stonithd_node_fence( st_op )) {
crm_err("Cannot fence %s: stonithd_node_fence() call failed ",
target);
- return FALSE;
}
return TRUE;
}
------------------------------
Message: 3
Date: Mon, 29 May 2006 07:21:14 -0600 (MDT)
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/common
Modified Files:
utils.c
Log Message:
Logging under and overflow handling
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- utils.c 29 May 2006 11:53:53 -0000 1.55
+++ utils.c 29 May 2006 13:21:14 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.55 2006/05/29 11:53:53 andrew Exp $ */
+/* $Id: utils.c,v 1.56 2006/05/29 13:21:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -280,10 +280,10 @@
{
unsigned int old = crm_log_level;
- while(crm_log_level < level) {
+ while(crm_log_level < 100 && crm_log_level < level) {
alter_debug(DEBUG_INC);
}
- while(crm_log_level > level) {
+ while(crm_log_level > 0 && crm_log_level > level) {
alter_debug(DEBUG_DEC);
}
@@ -441,11 +441,15 @@
switch(nsig) {
case DEBUG_INC:
- crm_log_level++;
+ if (crm_log_level < 100) {
+ crm_log_level++;
+ }
break;
case DEBUG_DEC:
- crm_log_level--;
+ if (crm_log_level > 0) {
+ crm_log_level--;
+ }
break;
default:
------------------------------
Message: 4
Date: Mon, 29 May 2006 07:22:48 -0600 (MDT)
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:
graph.c
Log Message:
Mark the action and synapse as complete for actions that cant be executed
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- graph.c 25 May 2006 14:45:54 -0000 1.14
+++ graph.c 29 May 2006 13:22:48 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.14 2006/05/25 14:45:54 andrew Exp $ */
+/* $Id: graph.c,v 1.15 2006/05/29 13:22:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -222,6 +222,9 @@
crm_err("Failed initiating <%s id=%d> in synapse %d",
crm_element_name(action->xml),
action->id, synapse->id);
+ synapse->confirmed = TRUE;
+ action->confirmed = TRUE;
+ action->failed = TRUE;
return FALSE;
}
);
@@ -276,6 +279,7 @@
if(should_fire_synapse(synapse)) {
num_fired++;
CRM_CHECK(fire_synapse(graph, synapse),
+ stat_log_level = LOG_ERR;
graph->abort_priority = INFINITY;
num_incomplete++;
num_fired--);
------------------------------
Message: 5
Date: Mon, 29 May 2006 07:25: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/tengine
Modified Files:
actions.c
Log Message:
crm assert only takes an expression
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- actions.c 29 May 2006 13:20:43 -0000 1.33
+++ actions.c 29 May 2006 13:25:16 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.33 2006/05/29 13:20:43 andrew Exp $ */
+/* $Id: actions.c,v 1.34 2006/05/29 13:25:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -151,8 +151,7 @@
st_op->private_data = crm_concat(id, key, ';');
crm_free(key);
- CRM_ASSERT(stonithd_input_IPC_channel() != NULL,
- crm_err("Cannot fence %s: stonith not available. Exiting",
target));
+ CRM_ASSERT(stonithd_input_IPC_channel() != NULL);
if (ST_OK != stonithd_node_fence( st_op )) {
crm_err("Cannot fence %s: stonithd_node_fence() call failed ",
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 96
********************************************
