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: lib by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 11 Jan 2006 12:50:35 -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:
notify.c callbacks.c
Log Message:
Move the logging to where we have the diff
Use the correct diff logging function
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/notify.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- notify.c 11 Jan 2006 13:06:11 -0000 1.33
+++ notify.c 11 Jan 2006 19:50:34 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: notify.c,v 1.33 2006/01/11 13:06:11 andrew Exp $ */
+/* $Id: notify.c,v 1.34 2006/01/11 19:50:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -276,7 +276,6 @@
add_admin_epoch, add_epoch, add_updates);
}
- crm_log_message_adv(log_level+1, __FUNCTION__, diff);
do_cib_notify(options, op, update, result, diff, T_CIB_DIFF_NOTIFY);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- callbacks.c 11 Jan 2006 13:18:03 -0000 1.88
+++ callbacks.c 11 Jan 2006 19:50:34 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.88 2006/01/11 13:18:03 andrew Exp $ */
+/* $Id: callbacks.c,v 1.89 2006/01/11 19:50:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -893,6 +893,8 @@
cib_post_notify(call_options, op, input, rc, the_cib);
cib_diff_notify(call_options, op, input, rc, local_diff);
+ log_xml_diff(rc==cib_ok?LOG_DEBUG:LOG_INFO,
+ local_diff, "cib:diff");
} else if(result_cib != NULL) {
crm_err("%s call modified the CIB", op);
------------------------------
Message: 2
Date: Wed, 11 Jan 2006 12:53:02 -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:
lrm.c
Log Message:
Send the correct value for shutdown
(we had it reversed : only clearing it when were in fact trying to shut down)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- lrm.c 11 Jan 2006 13:06:11 -0000 1.159
+++ lrm.c 11 Jan 2006 19:53:02 -0000 1.160
@@ -635,6 +635,7 @@
crm_data_t*
do_lrm_query(gboolean is_replace)
{
+ gboolean shut_down = FALSE;
crm_data_t *xml_result= NULL;
crm_data_t *xml_state = NULL;
crm_data_t *xml_data = NULL;
@@ -643,12 +644,13 @@
if(is_set(fsa_input_register, R_SHUTDOWN)) {
exp_state = CRMD_STATE_INACTIVE;
+ shut_down = TRUE;
}
xml_state = create_node_state(
fsa_our_uname, ACTIVESTATUS, XML_BOOLEAN_TRUE,
ONLINESTATUS, CRMD_JOINSTATE_MEMBER, exp_state,
- is_set(fsa_input_register, R_SHUTDOWN), __FUNCTION__);
+ !shut_down, __FUNCTION__);
xml_data = create_xml_node(xml_state, XML_CIB_TAG_LRM);
rsc_list = create_xml_node(xml_data, XML_LRM_TAG_RESOURCES);
------------------------------
Message: 3
Date: Wed, 11 Jan 2006 12:54:05 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
ipc.c
Log Message:
Borrowed from the CIB - an easy way to determine who we were sending too.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ipc.c 11 Sep 2005 20:56:56 -0000 1.13
+++ ipc.c 11 Jan 2006 19:54:04 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.13 2005/09/11 20:56:56 andrew Exp $ */
+/* $Id: ipc.c,v 1.14 2006/01/11 19:54:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -120,20 +120,24 @@
all_is_good = FALSE;
} else if(ipc_client->ops->get_chan_status(ipc_client) != IPC_CONNECT) {
- ipc_log("IPC Channel is not connected");
+ ipc_log("IPC Channel to %d is not connected",
+ (int)ipc_client->farside_pid);
all_is_good = FALSE;
} else if(get_stringlen(msg) >= MAXMSG) {
- crm_err("Message is too large to send");
+ crm_err("Message is to %d too large to send",
+ (int)ipc_client->farside_pid);
all_is_good = FALSE;
}
if(all_is_good && msg2ipcchan(msg, ipc_client) != HA_OK) {
- ipc_log("Could not send IPC, message");
+ ipc_log("Could not send IPC message to %d",
+ (int)ipc_client->farside_pid);
all_is_good = FALSE;
if(ipc_client->ops->get_chan_status(ipc_client) != IPC_CONNECT)
{
- ipc_log("IPC Channel is no longer connected");
+ ipc_log("IPC Channel to %d is no longer connected",
+ (int)ipc_client->farside_pid);
} else if(server == FALSE) {
CRM_DEV_ASSERT(ipc_client->send_queue->current_qlen <
ipc_client->send_queue->max_qlen);
------------------------------
Message: 4
Date: Wed, 11 Jan 2006 13:00:33 -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 control.c callbacks.c
Log Message:
Sort out the code generating shutdown updates.
- remove code that wasnt used
- remove code that was redundant now that the real bug was fixed (join_dc.c)
- don't clear the shutdown flag when a peer crmd process exits.
this caused much trouble and is redundant now that the bug in join_client.c
is fixed and we clear the shutdown flag (if not needed) with the update
containing the LRM query.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- join_dc.c 11 Jan 2006 13:06:11 -0000 1.75
+++ join_dc.c 11 Jan 2006 20:00:32 -0000 1.76
@@ -45,8 +45,6 @@
gboolean process_join_ack_msg(
const char *join_from, crm_data_t *lrm_update, int join_id);
gboolean check_join_state(enum crmd_fsa_state cur_state, const char *source);
-void join_update_complete_callback(const HA_Message *msg, int call_id, int rc,
- crm_data_t *output, void *user_data);
void finalize_join(const char *caller);
@@ -373,13 +371,27 @@
return I_NULL;
}
+static void
+join_update_complete_callback(const HA_Message *msg, int call_id, int rc,
+ crm_data_t *output, void *user_data)
+{
+ fsa_data_t *msg_data = NULL;
+
+ if(rc == cib_ok) {
+ check_join_state(fsa_state, __FUNCTION__);
+
+ } else {
+ crm_err("Join update failed");
+ crm_log_message(LOG_DEBUG, msg);
+ register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+ }
+}
+
gboolean
process_join_ack_msg(const char *join_from, crm_data_t *lrm_update, int
join_id)
{
/* now update them to "member" */
int call_id = 0;
- crm_data_t *update = NULL;
- crm_data_t *fragment = NULL;
const char *join_state = NULL;
crm_debug_2("Processing ack from %s", join_from);
@@ -416,17 +428,6 @@
crm_info("4) Updating node state to %s for %s",
CRMD_JOINSTATE_MEMBER, join_from);
-#if 0
- ???dig into the fragment and clear shutdown??
- /* the slave will re-ask if it wants to be shutdown */
-
- crm_data_t *tmp1 = NULL;
- crm_info("Updating node_status entry");
- tmp1 = create_node_state(node_uname, NULL, NULL, NULL,
- NULL, NULL, TRUE, __FUNCTION__);
- update_local_cib(create_cib_fragment(tmp1, XML_CIB_TAG_STATUS));
- free_xml(tmp1);
-#endif
/* update CIB with the current LRM status from the node
* We dont need to notify the TE of these updates, a transition will
* be started in due time
@@ -437,9 +438,6 @@
add_cib_op_callback(call_id, TRUE,NULL, join_update_complete_callback);
- free_xml(fragment);
- free_xml(update);
-
return TRUE;
}
@@ -615,18 +613,3 @@
return FALSE;
}
-void
-join_update_complete_callback(const HA_Message *msg, int call_id, int rc,
- crm_data_t *output, void *user_data)
-{
- fsa_data_t *msg_data = NULL;
-
- if(rc == cib_ok) {
- check_join_state(fsa_state, __FUNCTION__);
-
- } else {
- crm_err("Join update failed");
- crm_log_message(LOG_DEBUG, msg);
- register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
- }
-}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- control.c 11 Jan 2006 13:01:13 -0000 1.105
+++ control.c 11 Jan 2006 20:00:32 -0000 1.106
@@ -442,16 +442,6 @@
crm_err("%d stop operations outstanding at exit",
g_hash_table_size(shutdown_ops));
}
-#if 0
- if(is_set(fsa_input_register, R_CIB_CONNECTED)) {
- crm_data_t *tmp1 = NULL;
- crm_info("Updating node_status entry");
- tmp1 = create_node_state(fsa_our_uname, NULL, NULL, NULL,
- NULL, NULL, TRUE, __FUNCTION__);
- update_local_cib(create_cib_fragment(tmp1, XML_CIB_TAG_STATUS));
- free_xml(tmp1);
- }
-#endif
return I_NULL;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- callbacks.c 11 Jan 2006 13:06:11 -0000 1.96
+++ callbacks.c 11 Jan 2006 20:00:32 -0000 1.97
@@ -327,7 +327,7 @@
} else if(safe_str_eq(status, LEAVESTATUS)){
status = OFFLINESTATUS;
join = CRMD_STATE_INACTIVE;
- clear_shutdown = TRUE;
+/* clear_shutdown = TRUE; */
}
set_bit_inplace(fsa_input_register, R_PEER_DATA);
------------------------------
_______________________________________________
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 21
********************************************
