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: include by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 19 Feb 2006 02:01:45 -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:
Clear the shutdown attribute when the crmd process goes offline
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- callbacks.c 16 Feb 2006 08:12:18 -0000 1.105
+++ callbacks.c 19 Feb 2006 09:01:44 -0000 1.106
@@ -346,7 +346,7 @@
if(safe_str_eq(status, JOINSTATUS)){
status = ONLINESTATUS;
-/* clear_shutdown = TRUE; */
+ clear_shutdown = TRUE;
} else if(safe_str_eq(status, LEAVESTATUS)){
status = OFFLINESTATUS;
------------------------------
Message: 2
Date: Sun, 19 Feb 2006 02:03:16 -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:
ccm.c cib.c crmd_fsa.h join_dc.c
Log Message:
Logging of where node status updates originate
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/ccm.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- ccm.c 17 Feb 2006 14:44:03 -0000 1.100
+++ ccm.c 19 Feb 2006 09:03:16 -0000 1.101
@@ -1,4 +1,4 @@
-/* $Id: ccm.c,v 1.100 2006/02/17 14:44:03 andrew Exp $ */
+/* $Id: ccm.c,v 1.101 2006/02/19 09:03:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -474,7 +474,7 @@
if(cur_state != S_STOPPING) {
crm_debug_3("Updating the CIB from CCM cache");
- do_update_cib_nodes(FALSE);
+ do_update_cib_nodes(FALSE, __FUNCTION__);
}
/* Membership changed, remind everyone we're here.
@@ -585,8 +585,9 @@
struct update_data_s
{
- crm_data_t *updates;
const char *state;
+ const char *caller;
+ crm_data_t *updates;
gboolean overwrite_join;
};
@@ -608,7 +609,7 @@
void
-do_update_cib_nodes(gboolean overwrite)
+do_update_cib_nodes(gboolean overwrite, const char *caller)
{
int call_id = 0;
int call_options = cib_scope_local|cib_quorum_override;
@@ -625,7 +626,8 @@
}
fragment = create_xml_node(NULL, XML_CIB_TAG_STATUS);
-
+
+ update_data.caller = caller;
update_data.updates = fragment;
update_data.state = XML_BOOLEAN_YES;
update_data.overwrite_join = overwrite;
@@ -686,7 +688,7 @@
}
tmp1 = create_node_state(node_uname, NULL, data->state, peer_online,
- join, NULL, FALSE, __FUNCTION__);
+ join, NULL, FALSE, data->caller);
add_node_copy(data->updates, tmp1);
free_xml(tmp1);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- cib.c 17 Feb 2006 14:44:03 -0000 1.47
+++ cib.c 19 Feb 2006 09:03:16 -0000 1.48
@@ -116,7 +116,7 @@
do_cib_replaced(const char *event, HA_Message *msg)
{
crm_debug("Updating the CIB after a replace");
- do_update_cib_nodes(AM_I_DC);
+ do_update_cib_nodes(AM_I_DC, __FUNCTION__);
fsa_cluster_conn->llc_ops->client_status(
fsa_cluster_conn, NULL, CRM_SYSTEM_CRMD, -1);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/crmd_fsa.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- crmd_fsa.h 17 Feb 2006 14:44:03 -0000 1.48
+++ crmd_fsa.h 19 Feb 2006 09:03:16 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: crmd_fsa.h,v 1.48 2006/02/17 14:44:03 andrew Exp $ */
+/* $Id: crmd_fsa.h,v 1.49 2006/02/19 09:03:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -144,7 +144,7 @@
extern GHashTable *crmd_peer_state;
/* these two should be moved elsewhere... */
-extern void do_update_cib_nodes(gboolean overwrite);
+extern void do_update_cib_nodes(gboolean overwrite, const char *caller);
extern gboolean do_dc_heartbeat(gpointer data);
gboolean add_cib_op_callback(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- join_dc.c 18 Feb 2006 12:39:54 -0000 1.79
+++ join_dc.c 19 Feb 2006 09:03:16 -0000 1.80
@@ -145,7 +145,7 @@
*/
current_join_id++;
initialize_join(TRUE);
- do_update_cib_nodes(TRUE);
+ do_update_cib_nodes(TRUE, __FUNCTION__);
g_hash_table_foreach(
fsa_membership_copy->members, join_make_offer, NULL);
------------------------------
Message: 3
Date: Sun, 19 Feb 2006 02:03:58 -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:
election.c
Log Message:
We already have this info, no need to ask every time we win an election
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/election.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- election.c 16 Feb 2006 09:33:27 -0000 1.104
+++ election.c 19 Feb 2006 09:03:57 -0000 1.105
@@ -411,11 +411,6 @@
free_xml(cib);
free_xml(fragment);
-
- crm_debug_3("Requesting an initial dump of CRMD client_status");
- fsa_cluster_conn->llc_ops->client_status(
- fsa_cluster_conn, NULL, CRM_SYSTEM_CRMD, -1);
-
return I_NULL;
}
------------------------------
Message: 4
Date: Sun, 19 Feb 2006 02:07:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
transition.h
Log Message:
Differentiate between a graph pass where we performed an action and one
where we are still just waiting for somethign to complete
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/transition.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- transition.h 18 Feb 2006 12:43:02 -0000 1.3
+++ transition.h 19 Feb 2006 09:07:39 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: transition.h,v 1.3 2006/02/18 12:43:02 andrew Exp $ */
+/* $Id: transition.h,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -118,6 +118,7 @@
enum transition_status {
transition_active,
+ transition_pending, /* active but no actions performed this time */
transition_complete,
transition_stopped,
transition_terminated,
------------------------------
_______________________________________________
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 79
********************************************
