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: heartbeat by alan from
([email protected])
2. Linux-HA CVS: heartbeat by alan from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: linux-ha by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 23 Apr 2006 21:23:49 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
config.c
Log Message:
Made mgmtd loaded by default with 'crm on'.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -3 -r1.196 -r1.197
--- config.c 11 Apr 2006 22:11:17 -0000 1.196
+++ config.c 24 Apr 2006 03:23:49 -0000 1.197
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.196 2006/04/11 22:11:17 lars Exp $ */
+/* $Id: config.c,v 1.197 2006/04/24 03:23:49 alan Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -2395,20 +2395,30 @@
const char * dname;
const char * dval;
} r2dirs[] =
- /* CCM already implicit */
- { {"apiauth", "stonithd uid=root"}
- /* LRM is not a heartbeat API client */
- , {"apiauth", "cib uid=" HA_CCMUSER}
- , {"apiauth", "crmd uid=" HA_CCMUSER}
+ /*
+ * To whom it may concern: Please keep the apiauth and respawn
+ * lines in the same order to make auditing the two against each
+ * other easier.
+ * Thank you.
+ */
+
+ { /* CCM apiauth already implicit elsewhere */
+ {"apiauth", "cib uid=" HA_CCMUSER}
+ /* LRMd is not a heartbeat API client */
+ , {"apiauth", "stonithd uid=root" }
, {"apiauth", "attrd uid=" HA_CCMUSER}
+ , {"apiauth", "crmd uid=" HA_CCMUSER}
+ , {"apiauth", "mgmtd uid=root" }
, {"apiauth", "pingd uid=" HA_CCMUSER}
, {"respawn", " "HA_CCMUSER " " HALIB "/ccm"}
, {"respawn", " "HA_CCMUSER " " HALIB "/cib"}
- , {"respawn", "root " HALIB "/stonithd"}
, {"respawn", "root " HALIB "/lrmd"}
+ , {"respawn", "root " HALIB "/stonithd"}
, {"respawn", " "HA_CCMUSER " " HALIB "/attrd"}
, {"respawn", " "HA_CCMUSER " " HALIB "/crmd"}
+ , {"respawn", "root " HALIB "/mgmtd -v"}
+ /* Don't 'respawn' pingd - it's a resource agent */
};
gboolean dorel2;
int rc;
@@ -2520,6 +2530,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.197 2006/04/24 03:23:49 alan
+ * Made mgmtd loaded by default with 'crm on'.
+ *
* Revision 1.196 2006/04/11 22:11:17 lars
* CID 5: If we return here, the deallocation codepath at the end of the
* function doesn't make sense, and we would leak memory.
------------------------------
Message: 2
Date: Sun, 23 Apr 2006 22:52:25 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
config.c
Log Message:
Disabled traditional compression because of realtime concerns.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- config.c 24 Apr 2006 03:23:49 -0000 1.197
+++ config.c 24 Apr 2006 04:52:24 -0000 1.198
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.197 2006/04/24 03:23:49 alan Exp $ */
+/* $Id: config.c,v 1.198 2006/04/24 04:52:24 alan Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -162,8 +162,8 @@
, {KEY_UUIDFROM, set_uuidfrom, TRUE, "file" , "set the source for uuid"}
,{KEY_COMPRESSION, set_compression, TRUE ,"zlib", "set compression module"}
,{KEY_COMPRESSION_THRESHOLD, set_compression_threshold, TRUE, "2", "set
compression threshold"}
-,{KEY_TRADITIONAL_COMPRESSION, set_traditional_compression, TRUE, "yes", "set
traditional_compression"}
-,{KEY_ENV, set_env, FALSE, NULL, "set environment variable"}
+,{KEY_TRADITIONAL_COMPRESSION, set_traditional_compression, TRUE, "no", "set
traditional_compression"}
+,{KEY_ENV, set_env, FALSE, NULL, "set environment variable for respawn
clients"}
,{KEY_MAX_REXMIT_DELAY, set_max_rexmit_delay, TRUE,"250", "set the maximum
rexmit delay time"}
,{KEY_LOG_CONFIG_CHANGES, ha_config_check_boolean, TRUE,"on", "record changes
to the cib (valid only with: "KEY_REL2" on)"}
,{KEY_LOG_PENGINE_INPUTS, ha_config_check_boolean, TRUE,"on", "record the
input used by the policy engine (valid only with: "KEY_REL2" on)"}
@@ -2530,6 +2530,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.198 2006/04/24 04:52:24 alan
+ * Disabled traditional compression because of realtime concerns.
+ *
* Revision 1.197 2006/04/24 03:23:49 alan
* Made mgmtd loaded by default with 'crm on'.
*
------------------------------
Message: 3
Date: Mon, 24 Apr 2006 00:50:07 -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:
callbacks.c
Log Message:
Check for NULL cluster connections and NULL IPC channels
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- callbacks.c 24 Apr 2006 00:04:05 -0000 1.120
+++ callbacks.c 24 Apr 2006 06:50:06 -0000 1.121
@@ -56,13 +56,16 @@
gboolean
crmd_ha_msg_dispatch(ll_cluster_t *cluster_conn, gpointer user_data)
{
+ IPC_Channel *channel = NULL;
gboolean stay_connected = TRUE;
- IPC_Channel *channel = cluster_conn->llc_ops->ipcchan(cluster_conn);
-
crm_debug_3("Invoked");
- if(cluster_conn != NULL && IPC_ISRCONN(channel)) {
+ if(cluster_conn != NULL) {
+ channel = cluster_conn->llc_ops->ipcchan(cluster_conn);
+ }
+
+ if(channel != NULL && IPC_ISRCONN(channel)) {
if(cluster_conn->llc_ops->msgready(cluster_conn) == 0) {
crm_debug_2("no message ready yet");
}
@@ -70,7 +73,7 @@
cluster_conn->llc_ops->rcvmsg(cluster_conn, 0);
}
- if (cluster_conn == NULL || channel->ch_status != IPC_CONNECT) {
+ if (channel == NULL || channel->ch_status != IPC_CONNECT) {
if(is_set(fsa_input_register, R_HA_DISCONNECTED) == FALSE) {
crm_crit("Lost connection to heartbeat service.");
} else {
------------------------------
Message: 4
Date: Mon, 24 Apr 2006 01:06:37 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Put in some missing warnings about compatibility issues...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- heartbeat.spec.in 24 Apr 2006 02:32:17 -0000 1.169
+++ heartbeat.spec.in 24 Apr 2006 07:06:35 -0000 1.170
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.169 2006/04/24 02:32:17 alan Exp $
+# $Id: heartbeat.spec.in,v 1.170 2006/04/24 07:06:35 alan Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -101,7 +101,11 @@
+ Added Chinese support to the GUI
+ Added a new (untested) daemon to replace and generalize ipfail
+ Significant improvements to CIM model, including modifying things
-
+ + Changed traditional_compression to default to NO. This new default
+ is not compatible in mixed clusters running version 2.0.0-2.0.2.
+ If you are upgrading such a cluster to >= 2.0.5, either turn on
+ traditional_compression in your 2.0.5 clusters, or shut down
+ the whole cluster and upgrade it all at once.
* Mon Feb 27 2006 Alan Robertson <[EMAIL PROTECTED]> (see doc/AUTHORS file)
+ Version 2.0.4 - Bug fix release - worth getting these updates
------------------------------
_______________________________________________
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 125
*********************************************