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: lrm by alan from ([email protected])
2. Linux-HA CVS: heartbeat by andrew from
([email protected])
3. Linux-HA CVS: heartbeat by alan from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 Feb 2006 23:50:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Removed destroy_pipe_ra_* functions.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -3 -r1.215 -r1.216
--- lrmd.c 10 Feb 2006 06:31:46 -0000 1.215
+++ lrmd.c 10 Feb 2006 06:50:23 -0000 1.216
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.215 2006/02/10 06:31:46 alan Exp $ */
+/* $Id: lrmd.c,v 1.216 2006/02/10 06:50:23 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -242,8 +242,10 @@
static gboolean on_op_timeout_expired(gpointer data);
static gboolean on_repeat_op_readytorun(gpointer data);
static void on_remove_client(gpointer user_data);
+#if 0
static void destroy_pipe_ra_stderr(gpointer user_data);
static void destroy_pipe_ra_stdout(gpointer user_data);
+#endif
/* message handlers */
static int on_msg_register(lrmd_client_t* client, struct ha_msg* msg);
@@ -3088,10 +3090,10 @@
op->ra_stdout_gsource = G_main_add_fd(G_PRIORITY_HIGH
, stdout_fd[0], FALSE, handle_pipe_ra_stdout
- , op, destroy_pipe_ra_stdout);
+ , op, NULL);
op->ra_stderr_gsource = G_main_add_fd(G_PRIORITY_HIGH
, stderr_fd[0], FALSE, handle_pipe_ra_stderr
- , op, destroy_pipe_ra_stderr);
+ , op, NULL);
op->exec_pid = pid;
@@ -3352,6 +3354,7 @@
return rsc;
}
+#if 0
static void
destroy_pipe_ra_stdout(gpointer user_data)
{
@@ -3393,6 +3396,7 @@
}
}
+#endif
static gboolean
handle_pipe_ra_stdout(int fd, gpointer user_data)
{
@@ -3410,6 +3414,7 @@
, __FUNCTION__, __LINE__
, (unsigned long)op);
return FALSE;
+
}
if (fd < 0) {
@@ -3693,6 +3698,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.216 2006/02/10 06:50:23 alan
+ * Removed destroy_pipe_ra_* functions.
+ *
* Revision 1.215 2006/02/10 06:31:46 alan
* Put in an is_allocated() check in the code for the destructor...
*
------------------------------
Message: 2
Date: Fri, 10 Feb 2006 01:17:58 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
hb_api.c
Log Message:
size_t isn't an int on all platforms. cast it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_api.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- hb_api.c 9 Feb 2006 19:04:04 -0000 1.151
+++ hb_api.c 10 Feb 2006 08:17:57 -0000 1.152
@@ -1,4 +1,4 @@
-/* $Id: hb_api.c,v 1.151 2006/02/09 19:04:04 alan Exp $ */
+/* $Id: hb_api.c,v 1.152 2006/02/10 08:17:57 andrew Exp $ */
/*
* hb_api: Server-side heartbeat API code
*
@@ -1573,7 +1573,7 @@
cl_log(LOG_ERR
, "%s client %d disconnected, with %d messages pending"
, __FUNCTION__, client->pid
- , client->chan->recv_queue->current_qlen);
+ , (int)client->chan->recv_queue->current_qlen);
}
G_main_del_IPC_Channel(client->gsource);
------------------------------
Message: 3
Date: Fri, 10 Feb 2006 06:19:55 -0700 (MST)
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:
hb_api.c
Log Message:
Put in a patch to process IPC messages hanging around
when we want to disconnect the client already...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_api.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -3 -r1.152 -r1.153
--- hb_api.c 10 Feb 2006 08:17:57 -0000 1.152
+++ hb_api.c 10 Feb 2006 13:19:54 -0000 1.153
@@ -1,4 +1,4 @@
-/* $Id: hb_api.c,v 1.152 2006/02/10 08:17:57 andrew Exp $ */
+/* $Id: hb_api.c,v 1.153 2006/02/10 13:19:54 alan Exp $ */
/*
* hb_api: Server-side heartbeat API code
*
@@ -1569,11 +1569,9 @@
}
client->removereason = reason;
- if (client->chan->recv_queue->current_qlen > 0) {
- cl_log(LOG_ERR
- , "%s client %d disconnected, with %d messages pending"
- , __FUNCTION__, client->pid
- , (int)client->chan->recv_queue->current_qlen);
+ while (client->chan->recv_queue->current_qlen > 0
+ && (!reason || strcmp(reason, API_SIGNOFF) != 0)) {
+ ProcessAnAPIRequest(client);
}
G_main_del_IPC_Channel(client->gsource);
@@ -1995,13 +1993,15 @@
if ((msg = msgfromIPC(client->chan, 0)) == NULL) {
/* EOF? */
- if (client->chan->ch_status == IPC_DISCONNECT) {
+ if (!IPC_ISRCONN(client->chan)) {
if (ANYDEBUG) {
cl_log(LOG_DEBUG
, "EOF from client pid %ld"
, (long)client->pid);
}
- client->removereason = "EOF";
+ if (!client->removereason) {
+ client->removereason = "EOF";
+ }
goto getout;
}
------------------------------
Message: 4
Date: Fri, 10 Feb 2006 08:01:32 -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:
SLAVE_ALL doesnt modify the CIB
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- callbacks.c 10 Feb 2006 05:18:21 -0000 1.106
+++ callbacks.c 10 Feb 2006 15:01:31 -0000 1.107
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.106 2006/02/10 05:18:21 andrew Exp $ */
+/* $Id: callbacks.c,v 1.107 2006/02/10 15:01:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -198,7 +198,7 @@
{CIB_OP_UPDATE, TRUE, TRUE, TRUE, cib_prepare_data,
cib_cleanup_output, cib_process_change},
{CIB_OP_APPLY_DIFF,TRUE, TRUE, TRUE, cib_prepare_diff,
cib_cleanup_sync, cib_process_diff},
{CIB_OP_SLAVE, FALSE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
- {CIB_OP_SLAVEALL, TRUE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
+ {CIB_OP_SLAVEALL, FALSE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
{CIB_OP_SYNC_ONE, FALSE, TRUE, FALSE, cib_prepare_sync,
cib_cleanup_sync, cib_process_sync_one},
{CIB_OP_MASTER, FALSE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
{CIB_OP_ISMASTER, FALSE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
------------------------------
_______________________________________________
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 47
********************************************
