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: cts by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 20 Feb 2006 05:45:19 -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:
control.c
Log Message:
Make it easy to observe the effect of zero'ing out the hostcache
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- control.c 20 Feb 2006 12:22:24 -0000 1.115
+++ control.c 20 Feb 2006 12:45:18 -0000 1.116
@@ -711,7 +711,7 @@
ha_node_uuid = get_uuid(fsa_cluster_conn, ha_node);
if(ha_node_uuid == NULL) {
- crm_warn("Node %s: no uuid found", ha_node);
+ crm_err("Node %s: no uuid found", ha_node);
continue;
}
------------------------------
Message: 2
Date: Mon, 20 Feb 2006 05:48:54 -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:
join_dc.c
Log Message:
Use the 'type' used by heartbeat (The PE supports it now)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- join_dc.c 19 Feb 2006 09:03:16 -0000 1.80
+++ join_dc.c 20 Feb 2006 12:48:54 -0000 1.81
@@ -530,7 +530,7 @@
join_state = (const char *)value;
/* make sure the node exists in the config section */
- create_node_entry(join_to, join_to, CRMD_JOINSTATE_MEMBER);
+ create_node_entry(join_to, join_to, NORMALNODE);
/* send the ack/nack to the node */
acknak = create_request(
------------------------------
Message: 3
Date: Mon, 20 Feb 2006 06:03:54 -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:
Now that we sign off correctly we dont need this hack
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- callbacks.c 19 Feb 2006 20:00:36 -0000 1.112
+++ callbacks.c 20 Feb 2006 13:03:54 -0000 1.113
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.112 2006/02/19 20:00:36 andrew Exp $ */
+/* $Id: callbacks.c,v 1.113 2006/02/20 13:03:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1332,33 +1332,10 @@
if(keep_connection == FALSE
&& cib_shutdown_flag
&& g_hash_table_size(client_list) == 0) {
- IPC_Channel *ipc = NULL;
- IPC_Queue *send_q = NULL;
- crm_info("All clients disconnected... flushing updates");
-
- /* wait for HA messages to be sent */
- while(hb_conn != NULL) {
- ipc = hb_conn->llc_ops->ipcchan(hb_conn);
- if(ipc == NULL || ipc->ch_status != IPC_CONNECT) {
- break;
- }
-
- send_q = ipc->send_queue;
- if(send_q == NULL || send_q->current_qlen == 0) {
- break;
- }
-
- crm_err("Waiting on %d queued messages to be sent",
- (int)send_q->current_qlen);
-
- ipc->ops->waitout(ipc);
-
- /* BUG: give heartbeat time to send our messages out */
- sleep(2);
- }
+ crm_info("All clients disconnected...");
- crm_info("Updates flushed... exiting");
if(hb_conn != NULL) {
+ crm_info("Disconnecting heartbeat");
hb_conn->llc_ops->signoff(hb_conn, FALSE);
} else {
crm_err("No heartbeat connection");
------------------------------
Message: 4
Date: Mon, 20 Feb 2006 06:05:18 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTS.py.in
Log Message:
One option when the hostcache stuff is working
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- CTS.py.in 10 Feb 2006 04:07:41 -0000 1.49
+++ CTS.py.in 20 Feb 2006 13:05:18 -0000 1.50
@@ -428,6 +428,12 @@
watch.setwatch()
self.install_config(node)
+
+# Clear out the host cache to prevent the PE from shooting nodes
+# during StartOnebyOne
+# self.rsh.remote_python_call(
+# node, "os", "system", "rm -f @HA_VARLIBDIR@/heartbeat/hostcache")
+
if self.rsh(node, self["StartCmd"]) != 0:
self.log ("Warn: Start command failed on node %s" %(node))
return None
------------------------------
Message: 5
Date: Mon, 20 Feb 2006 08:07:26 -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:
control.c
Log Message:
The defaults dont need to be that long
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- control.c 20 Feb 2006 12:45:18 -0000 1.116
+++ control.c 20 Feb 2006 15:07:25 -0000 1.117
@@ -568,9 +568,9 @@
/* defaults */
election_trigger->period_ms = crm_get_msec("1min");
election_timeout->period_ms = crm_get_msec("2min");
- integration_timer->period_ms = crm_get_msec("5min");
- finalization_timer->period_ms = crm_get_msec("10min");
- shutdown_escalation_timer->period_ms = crm_get_msec("15min");
+ integration_timer->period_ms = crm_get_msec("3min");
+ finalization_timer->period_ms = crm_get_msec("3min");
+ shutdown_escalation_timer->period_ms = crm_get_msec("5min");
return I_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 27, Issue 85
********************************************
