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: lib by alan from ([email protected])
3. Linux-HA CVS: lib by alan from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 9 Jan 2006 14:20:21 -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:
utils.c
Log Message:
Better logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- utils.c 19 Dec 2005 16:54:44 -0000 1.121
+++ utils.c 9 Jan 2006 21:20:21 -0000 1.122
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.121 2005/12/19 16:54:44 andrew Exp $ */
+/* $Id: utils.c,v 1.122 2006/01/09 21:20:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -765,19 +765,26 @@
action->runnable = FALSE;
} else if(rsc->is_managed == FALSE) {
- crm_warn("Action %d %s is for %s (unmanaged)",
- action->id, task, rsc->id);
+ crm_warn("Action %s %s is for %s (unmanaged)",
+ action->uuid, task, rsc->id);
action->optional = TRUE;
/* action->runnable = FALSE; */
+#if 0
+ } else if(action->node->details->unclean) {
+ crm_warn("Action %s on %s is unrunnable (unclean)",
+ action->uuid,
action->node?action->node->details->uname:"<none>");
+
+ action->runnable = FALSE;
+#endif
} else if(action->node->details->online == FALSE) {
- crm_warn("Action %d %s for %s on %s is unrunnable",
- action->id, task, rsc->id,
-
action->node?action->node->details->uname:"<none>");
+ crm_warn("Action %s on %s is unrunnable (offline)",
+ action->uuid,
action->node?action->node->details->uname:"<none>");
action->runnable = FALSE;
} else if(action->needs == rsc_req_nothing) {
- crm_debug_2("Action doesnt require anything");
+ crm_debug_2("Action %s doesnt require anything",
+ action->uuid);
action->runnable = TRUE;
#if 0
/*
@@ -785,7 +792,7 @@
* - if we dont have quorum we cant stonith anyway
*/
} else if(action->needs == rsc_req_stonith) {
- crm_debug_2("Action requires only stonith");
+ crm_debug_2("Action %s requires only stonith",
action->uuid);
action->runnable = TRUE;
#endif
} else if(data_set->have_quorum == FALSE
@@ -803,8 +810,9 @@
action->task, rsc->id,
action->node->details->uname);
}
+
} else {
- crm_debug_2("Action is runnable");
+ crm_debug_2("Action %s is runnable", action->uuid);
action->runnable = TRUE;
}
------------------------------
Message: 2
Date: Mon, 9 Jan 2006 14:27:52 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/pils
Modified Files:
pils.c
Log Message:
Preserved errno through PILCallLog()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/pils/pils.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- pils.c 17 Feb 2005 05:49:24 -0000 1.47
+++ pils.c 9 Jan 2006 21:27:52 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: pils.c,v 1.47 2005/02/17 05:49:24 alan Exp $ */
+/* $Id: pils.c,v 1.48 2006/01/09 21:27:52 alan Exp $ */
/*
* Copyright (C) 2001 Alan Robertson <[EMAIL PROTECTED]>
* This software licensed under the GNU LGPL.
@@ -2141,10 +2141,12 @@
{
va_list args;
char * str;
+ int err = errno;
va_start (args, fmt);
str = g_strdup_vprintf(fmt, args);
va_end (args);
logfun(priority, "%s", str);
g_free(str);
+ errno = err;
}
------------------------------
Message: 3
Date: Mon, 9 Jan 2006 14:30:39 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/HBcomm
Modified Files:
bcast.c
Log Message:
Made sure errno gets preserved in bcast writes with errors...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/HBcomm/bcast.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- bcast.c 1 Nov 2005 21:51:11 -0000 1.46
+++ bcast.c 9 Jan 2006 21:30:38 -0000 1.47
@@ -1,4 +1,4 @@
-/* $Id: bcast.c,v 1.46 2005/11/01 21:51:11 gshi Exp $ */
+/* $Id: bcast.c,v 1.47 2006/01/09 21:30:38 alan Exp $ */
/*
* bcast.c: UDP/IP broadcast-based communication code for heartbeat.
*
@@ -374,14 +374,16 @@
struct ha_msg* m;
+ int err = errno;
PILCallLog(LOG, PIL_CRIT, "Unable to send bcast [%d]
packet(len=%d): %s",
- rc,len, strerror(errno));
+ rc,len, strerror(err));
m = wirefmt2msg(pkt, len,MSG_NEEDAUTH);
if (m){
cl_log_message(LOG_ERR, m);
ha_msg_del(m);
}
+ errno = err;
return(HA_FAIL);
}
@@ -759,6 +761,9 @@
/*
* $Log: bcast.c,v $
+ * Revision 1.47 2006/01/09 21:30:38 alan
+ * Made sure errno gets preserved in bcast writes with errors...
+ *
* Revision 1.46 2005/11/01 21:51:11 gshi
* log the message if bcast_write fails
*
------------------------------
Message: 4
Date: Tue, 10 Jan 2006 06:24:05 -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/admin
Modified Files:
cibadmin.c
Log Message:
Add a \n to the output message
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- cibadmin.c 16 Dec 2005 14:55:12 -0000 1.46
+++ cibadmin.c 10 Jan 2006 13:24:04 -0000 1.47
@@ -1,4 +1,4 @@
-/* $Id: cibadmin.c,v 1.46 2005/12/16 14:55:12 andrew Exp $ */
+/* $Id: cibadmin.c,v 1.47 2006/01/10 13:24:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -611,13 +611,13 @@
if(safe_str_eq(cib_action, CIB_OP_ISMASTER) && rc != cib_ok) {
crm_info("CIB on %s is _not_ the master instance",
host?host:"localhost");
- fprintf(stderr, "CIB on %s is _not_ the master instance",
+ fprintf(stderr, "CIB on %s is _not_ the master instance\n",
host?host:"localhost");
} else if(safe_str_eq(cib_action, CIB_OP_ISMASTER)) {
crm_info("CIB on %s _is_ the master instance",
host?host:"localhost");
- fprintf(stderr, "CIB on %s _is_ the master instance",
+ fprintf(stderr, "CIB on %s _is_ the master instance\n",
host?host:"localhost");
} else if(rc != 0) {
------------------------------
_______________________________________________
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 10
********************************************
