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: resources by xunsun from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 12 Jan 2006 09:13:06 -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/crmd
Modified Files:
utils.c
Log Message:
Backwards compatibility
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- utils.c 10 Jan 2006 13:46:42 -0000 1.82
+++ utils.c 12 Jan 2006 16:13:05 -0000 1.83
@@ -1282,6 +1282,9 @@
if(clear_shutdown) {
crm_xml_add(node_state, XML_CIB_ATTR_SHUTDOWN, "0");
+#if CRM_DEPRECATED_SINCE_2_0_3
+ crm_xml_add(node_state, "clear_shutdown", "true");
+#endif
/* crm_xml_add(node_state, */
/* XML_CIB_ATTR_REPLACE, XML_TAG_TRANSIENT_NODEATTRS);
*/
}
------------------------------
Message: 2
Date: Thu, 12 Jan 2006 09:14:50 -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/cib
Modified Files:
callbacks.c
Log Message:
Remove temporary logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- callbacks.c 12 Jan 2006 15:01:48 -0000 1.91
+++ callbacks.c 12 Jan 2006 16:14:50 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.91 2006/01/12 15:01:48 andrew Exp $ */
+/* $Id: callbacks.c,v 1.92 2006/01/12 16:14:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1187,9 +1187,6 @@
hb_cluster->llc_ops->rcvmsg(hb_cluster, 0);
}
- if(hb_cluster->llc_ops->msgready(hb_cluster)) {
- crm_debug("Returning to mainloop");
- }
crm_debug_4("%d HA messages dispatched", lpc);
if (channel && (channel->ch_status != IPC_CONNECT)) {
------------------------------
Message: 3
Date: Thu, 12 Jan 2006 09:35:38 -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/test
Modified Files:
helper.sh.in
Log Message:
The log changed, thus the pattern must also
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/helper.sh.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- helper.sh.in 22 Nov 2005 02:43:21 -0000 1.74
+++ helper.sh.in 12 Jan 2006 16:35:38 -0000 1.75
@@ -172,7 +172,7 @@
fi
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 20 \
- -s "${srch_node}crmd(.*) info:(.*)FSA Hostname: ${ha_node}" \
+ -s "${srch_node}crmd(.*) info:(.*)Hostname: ${ha_node}" \
-s "${srch_node}crmd(.*)State transition S_STARTING \-> S_PENDING"
cts_assert "CRMd startup on ${ha_node} failed."
}
------------------------------
Message: 4
Date: Thu, 12 Jan 2006 09:41:13 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by xunsun from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : xunsun
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Filesystem.in
Log Message:
remove an extra line, and better indention
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Filesystem.in 10 Jan 2006 17:32:35 -0000 1.12
+++ Filesystem.in 12 Jan 2006 16:41:12 -0000 1.13
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.12 2006/01/10 17:32:35 alan Exp $
+# $Id: Filesystem.in,v 1.13 2006/01/12 16:41:12 xunsun Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -96,7 +96,7 @@
cat <<-EOT;
usage: $0 {start|stop|status|monitor|validate-all|meta-data}
- $Id: Filesystem.in,v 1.12 2006/01/10 17:32:35 alan Exp $
+ $Id: Filesystem.in,v 1.13 2006/01/12 16:41:12 xunsun Exp $
EOT
}
@@ -329,12 +329,11 @@
greppat="^$DEVICE $MOUNTPOINT "
else
greppat=" $MOUNTPOINT "
- rc=$?
fi
if
grep -q -e "${greppat}" /proc/mounts >/dev/null 2>&1
then
- rc=$OCF_SUCCESS
+ rc=$OCF_SUCCESS
msg="$MOUNTPOINT is mounted (running)"
else
rc=$OCF_NOT_RUNNING
------------------------------
Message: 5
Date: Thu, 12 Jan 2006 10:50:46 -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/crmd
Modified Files:
callbacks.c
Log Message:
Reliably detect if the LRM connection is still active.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- callbacks.c 11 Jan 2006 20:00:32 -0000 1.97
+++ callbacks.c 12 Jan 2006 17:50:46 -0000 1.98
@@ -246,11 +246,14 @@
gboolean
lrm_dispatch(IPC_Channel *src_not_used, gpointer user_data)
{
- int num_msgs = 0;
+ /* ?? src == lrm_channel ?? */
ll_lrm_t *lrm = (ll_lrm_t*)user_data;
+ IPC_Channel *lrm_channel = lrm->lrm_ops->ipcchan(lrm);
+
crm_debug_3("received callback");
- num_msgs = lrm->lrm_ops->rcvmsg(lrm, FALSE);
- if(num_msgs < 1) {
+ lrm->lrm_ops->rcvmsg(lrm, FALSE);
+
+ if(lrm_channel->ops->get_chan_status(lrm_channel) != IPC_CONNECT) {
if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
crm_err("LRM Connection failed");
register_fsa_input(C_FSA_INTERNAL, I_ERROR, NULL);
------------------------------
_______________________________________________
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 26
********************************************
