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: replace by davidlee 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: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 7 Apr 2006 09:02:40 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: replace by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : replace
Dir : linux-ha/replace
Modified Files:
alphasort.c
Log Message:
fix compilation warning on some platforms about undeclared 'strcmp()'
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/replace/alphasort.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- alphasort.c 17 Feb 2004 22:12:01 -0000 1.6
+++ alphasort.c 7 Apr 2006 15:02:39 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: alphasort.c,v 1.6 2004/02/17 22:12:01 lars Exp $ */
+/* $Id: alphasort.c,v 1.7 2006/04/07 15:02:39 davidlee Exp $ */
/*
*
* alphasort - replacement for alphasort functions.
@@ -35,6 +35,10 @@
#include <unistd.h> /* XXX for _POSIX_VERSION ifdefs */
+#if HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#if !defined sgi && !defined _POSIX_VERSION
#include <sys/dir.h>
#endif
------------------------------
Message: 2
Date: Fri, 7 Apr 2006 09:38:14 -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:
cib.c control.c
Log Message:
Temporary fix for 1183, the nodes section will currently not be populated
after an erase op.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- cib.c 3 Apr 2006 16:46:26 -0000 1.49
+++ cib.c 7 Apr 2006 15:38:13 -0000 1.50
@@ -112,13 +112,21 @@
}
}
-extern void populate_cib_nodes(ll_cluster_t *hb_cluster);
+extern void populate_cib_nodes(
+ ll_cluster_t *hb_cluster, gboolean with_client_status);
static void
do_cib_replaced(const char *event, HA_Message *msg)
{
crm_debug("Updating the CIB after a replace");
- populate_cib_nodes(fsa_cluster_conn);
+#ifdef BUG
+ /* enabling this seems to cause delays (in the order of 3 minutes)
+ * in messages being received by the node that runs this
+ *
+ * no idea why :(
+ */
+ populate_cib_nodes(fsa_cluster_conn, FALSE);
+#endif
do_update_cib_nodes(AM_I_DC, __FUNCTION__);
if(AM_I_DC) {
/* start the join process again so we get everyone's LRM status
*/
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- control.c 3 Apr 2006 16:46:26 -0000 1.121
+++ control.c 7 Apr 2006 15:38:13 -0000 1.122
@@ -42,7 +42,7 @@
gboolean crm_shutdown(int nsig, gpointer unused);
gboolean register_with_ha(ll_cluster_t *hb_cluster, const char *client_name);
-void populate_cib_nodes(ll_cluster_t *hb_cluster);
+void populate_cib_nodes(ll_cluster_t *hb_cluster, gboolean with_client_status);
GHashTable *ipc_clients = NULL;
@@ -569,11 +569,11 @@
crm_debug_2("Querying the CIB... call %d", call_id);
/* defaults */
- election_trigger->period_ms = crm_get_msec("1min");
+ election_trigger->period_ms = crm_get_msec("30s");
election_timeout->period_ms = crm_get_msec("2min");
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");
+ shutdown_escalation_timer->period_ms = crm_get_msec("10min");
return I_NULL;
}
@@ -618,17 +618,20 @@
}
void
-populate_cib_nodes(ll_cluster_t *hb_cluster)
+populate_cib_nodes(ll_cluster_t *hb_cluster, gboolean with_client_status)
{
int call_id = 0;
const char *ha_node = NULL;
crm_data_t *cib_node_list = NULL;
/* Async get client status information in the cluster */
- 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);
-
+ crm_debug_2("Invoked");
+ if(with_client_status) {
+ 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);
+ }
+
crm_info("Requesting the list of configured nodes");
fsa_cluster_conn->llc_ops->init_nodewalk(fsa_cluster_conn);
@@ -675,6 +678,7 @@
add_cib_op_callback(call_id, FALSE, NULL, default_cib_update_callback);
free_xml(cib_node_list);
+ crm_debug_2("Complete");
}
gboolean
@@ -743,7 +747,7 @@
fsa_our_uuid = crm_strdup(fsa_our_uuid);
crm_info("UUID: %s", fsa_our_uuid);
- populate_cib_nodes(hb_cluster);
+ populate_cib_nodes(hb_cluster, TRUE);
return TRUE;
------------------------------
Message: 3
Date: Fri, 7 Apr 2006 09:41:36 -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:
Switch to using msgfromIPC_noauth() which uses HA_Message's and also
masks interupts for us
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- callbacks.c 5 Apr 2006 13:23:35 -0000 1.113
+++ callbacks.c 7 Apr 2006 15:41:36 -0000 1.114
@@ -205,8 +205,7 @@
crmd_ipc_msg_callback(IPC_Channel *client, gpointer user_data)
{
int lpc = 0;
- int rc = IPC_OK;
- IPC_Message *msg = NULL;
+ HA_Message *msg = NULL;
ha_msg_input_t *new_input = NULL;
crmd_client_t *curr_client = (crmd_client_t*)user_data;
gboolean stay_connected = TRUE;
@@ -218,23 +217,17 @@
if(client->ops->is_message_pending(client) == 0) {
break;
}
-
- rc = client->ops->recv(client, &msg);
- if (rc != IPC_OK) {
- crm_warn("Receive failure from %s: %d",
- curr_client->table_key, rc);
- stay_connected = FALSE;
- break;
-
- } else if (msg == NULL) {
+
+ msg = msgfromIPC_noauth(client);
+ if (msg == NULL) {
crm_err("%s: no message this time",
curr_client->table_key);
continue;
}
lpc++;
- new_input = new_ipc_msg_input(msg);
- msg->msg_done(msg);
+ new_input = new_ha_msg_input(msg);
+ crm_msg_del(msg);
crm_debug_2("Processing msg from %s", curr_client->table_key);
crm_log_message_adv(LOG_DEBUG_2, "CRMd[inbound]",
new_input->msg);
------------------------------
Message: 4
Date: Fri, 7 Apr 2006 09:41:36 -0600 (MDT)
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:
Switch to using msgfromIPC_noauth() which uses HA_Message's and also
masks interupts for us
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ipc.c 18 Mar 2006 17:23:48 -0000 1.21
+++ ipc.c 7 Apr 2006 15:41:36 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.21 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: ipc.c,v 1.22 2006/04/07 15:41:36 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -155,7 +155,7 @@
"IPC Channel to %d is no longer
connected",
(int)ipc_client->farside_pid);
- } else if(server == FALSE) {
+ } else if(ipc_client->conntype == IPC_CLIENT) {
CRM_CHECK(ipc_client->send_queue->current_qlen <
ipc_client->send_queue->max_qlen, ;);
}
}
@@ -323,8 +323,7 @@
subsystem_msg_dispatch(IPC_Channel *sender, void *user_data)
{
int lpc = 0;
- int rc = IPC_OK;
- IPC_Message *msg = NULL;
+ HA_Message *msg = NULL;
ha_msg_input_t *new_input = NULL;
gboolean all_is_well = TRUE;
const char *sys_to;
@@ -336,21 +335,18 @@
break;
}
- rc = sender->ops->recv(sender, &msg);
- if (rc != IPC_OK) {
- crm_err("Receive failure from %d: %d",
- sender->farside_pid, rc);
- return !all_is_well;
-
- } else if (msg == NULL) {
+ msg = msgfromIPC_noauth(sender);
+ if (msg == NULL) {
crm_err("No message from %d this time",
sender->farside_pid);
continue;
}
lpc++;
- new_input = new_ipc_msg_input(msg);
- msg->msg_done(msg);
+ new_input = new_ha_msg_input(msg);
+ crm_msg_del(msg);
+ msg = NULL;
+
crm_log_message(LOG_MSG, new_input->msg);
sys_to = cl_get_string(new_input->msg, F_CRM_SYS_TO);
@@ -405,18 +401,13 @@
}
delete_ha_msg_input(new_input);
- msg = NULL;
+ new_input = NULL;
if(sender->ch_status == IPC_CONNECT) {
break;
}
}
- /* clean up after a break */
- if(msg != NULL) {
- msg->msg_done(msg);
- }
-
crm_debug_2("Processed %d messages", lpc);
if (sender->ch_status != IPC_CONNECT) {
crm_err("The server %d has left us: Shutting down...NOW",
------------------------------
_______________________________________________
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 38
********************************************
