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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: heartbeat by sunjd from
([email protected])
3. Linux-HA CVS: lib by sunjd from ([email protected])
4. Linux-HA CVS: lib by alan from ([email protected])
5. Linux-HA CVS: include by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 7 Feb 2006 02:13:15 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
exit directly only when cib exits abnormally
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- mgmt_crm.c 5 Feb 2006 03:03:23 -0000 1.12
+++ mgmt_crm.c 7 Feb 2006 09:13:14 -0000 1.13
@@ -38,6 +38,7 @@
extern resource_t *group_find_child(resource_t *rsc, const char *id);
cib_t* cib_conn = NULL;
+int in_shutdown = FALSE;
int init_crm(void);
void final_crm(void);
@@ -183,9 +184,11 @@
{
int ret = cib_ok;
int i, max_try = 5;
-
+
mgmt_log(LOG_INFO,"init_crm");
cib_conn = cib_new();
+ in_shutdown = FALSE;
+
for (i = 0; i < max_try ; i++) {
ret = cib_conn->cmds->signon(cib_conn, client_name,
cib_command);
if (ret == cib_ok) {
@@ -249,8 +252,10 @@
final_crm(void)
{
if(cib_conn != NULL) {
+ in_shutdown = TRUE;
cib_conn->cmds->signoff(cib_conn);
cib_conn = NULL;
+
}
}
@@ -266,10 +271,14 @@
void
on_cib_connection_destroy(gpointer user_data)
{
- mgmt_log(LOG_ERR,"Connection to the CIB terminated... exiting");
fire_event(EVT_DISCONNECTED);
cib_conn = NULL;
- exit(LSB_EXIT_OK);
+ if (!in_shutdown) {
+ mgmt_log(LOG_ERR,"Connection to the CIB terminated... exiting");
+ /*cib exits abnormally, mgmtd exits too and
+ wait heartbeat restart us in order*/
+ exit(LSB_EXIT_OK);
+ }
return;
}
------------------------------
Message: 2
Date: Tue, 7 Feb 2006 03:06:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
make some versions of gcc not complain: used uninitialized
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -3 -r1.493 -r1.494
--- heartbeat.c 6 Feb 2006 14:00:43 -0000 1.493
+++ heartbeat.c 7 Feb 2006 10:06:22 -0000 1.494
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.493 2006/02/06 14:00:43 alan Exp $ */
+/* $Id: heartbeat.c,v 1.494 2006/02/07 10:06:22 sunjd Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -1222,7 +1222,7 @@
static gboolean
read_child_dispatch(IPC_Channel* source, gpointer user_data)
{
- struct ha_msg* msg;
+ struct ha_msg* msg = NULL;
struct hb_media** mp = user_data;
int media_idx = mp - &sysmedia[0];
@@ -6090,6 +6090,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.494 2006/02/07 10:06:22 sunjd
+ * make some versions of gcc not complain: used uninitialized
+ *
* Revision 1.493 2006/02/06 14:00:43 alan
* Changed heartbeat's child processes to run one notch lower than it in
realtime
* priority.
------------------------------
Message: 3
Date: Tue, 7 Feb 2006 03:06:45 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
GSource.c
Log Message:
make some versions of gcc not complain: used uninitialized
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- GSource.c 6 Feb 2006 13:53:28 -0000 1.71
+++ GSource.c 7 Feb 2006 10:06:45 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.71 2006/02/06 13:53:28 alan Exp $ */
+/* $Id: GSource.c,v 1.72 2006/02/07 10:06:45 sunjd Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -627,6 +627,10 @@
#else
{
longclock_t resume_start;
+
+ /* Just make the compiler not complain */
+ memset(&resume_start, 0, sizeof(resume_start));
+
if (ANYDEBUG) {
resume_start = time_longclock();
}
------------------------------
Message: 4
Date: Tue, 7 Feb 2006 08:44:34 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
GSource.c
Log Message:
minor fix to an initalization, and also fixed a (dumb) bug in GSource trigger
timing code.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- GSource.c 7 Feb 2006 10:06:45 -0000 1.72
+++ GSource.c 7 Feb 2006 15:44:33 -0000 1.73
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.72 2006/02/07 10:06:45 sunjd Exp $ */
+/* $Id: GSource.c,v 1.73 2006/02/07 15:44:33 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -626,11 +626,8 @@
}
#else
{
- longclock_t resume_start;
+ longclock_t resume_start = zero_longclock;
- /* Just make the compiler not complain */
- memset(&resume_start, 0, sizeof(resume_start));
-
if (ANYDEBUG) {
resume_start = time_longclock();
}
@@ -650,8 +647,7 @@
}
}
}
-
-
+
#endif
if(chp->dispatch && chp->ch->ops->is_message_pending(chp->ch)) {
@@ -1367,7 +1363,6 @@
CHECK_DISPATCH_DELAY(trig_src);
trig_src->manual_trigger = FALSE;
- trig_src->detecttime = zero_longclock;
if(trig_src->dispatch) {
if(!(trig_src->dispatch(trig_src->udata))){
@@ -1377,6 +1372,7 @@
}
CHECK_DISPATCH_TIME(trig_src);
}
+ trig_src->detecttime = zero_longclock;
return TRUE;
}
------------------------------
Message: 5
Date: Tue, 7 Feb 2006 10:18:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
hb_api_core.h heartbeat.h
Log Message:
Added a brand new mechanism for creating child processes to do things for us
to keep us from taking a realtime hit for certain operations.
Initially, this mechanism is being used to write out the host cache data
and also the deleted node cache data - which causes us a realtime hit
when we need to write it out.
This happens on startup and when nodes join or are deleted at runtime.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/hb_api_core.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- hb_api_core.h 6 Feb 2006 04:57:33 -0000 1.17
+++ hb_api_core.h 7 Feb 2006 17:18:24 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Id: hb_api_core.h,v 1.17 2006/02/06 04:57:33 alan Exp $ */
+/* $Id: hb_api_core.h,v 1.18 2006/02/07 17:18:24 alan Exp $ */
/*
* hb_api_core_h: Internal definitions and functions for the heartbeat API
*
@@ -37,7 +37,7 @@
#include <ha_msg.h>
/* Dispatch priorities for various kinds of events */
-#define PRI_SENDSTATUS (G_PRIORITY_HIGH)
+#define PRI_SENDSTATUS (G_PRIORITY_HIGH-5)
#define PRI_SENDPKT (PRI_SENDSTATUS+1)
#define PRI_READPKT (PRI_SENDPKT+1)
#define PRI_FIFOMSG (PRI_READPKT+1)
@@ -49,7 +49,8 @@
#define PRI_APIREGISTER (G_PRIORITY_LOW)
#define PRI_RANDOM (PRI_APIREGISTER+1)
#define PRI_AUDITCLIENT (PRI_RANDOM+1)
-#define PRI_DUMPSTATS (G_PRIORITY_LOW+20)
+#define PRI_WRITECACHE (PRI_AUDITCLIENT+1)
+#define PRI_DUMPSTATS (PRI_WRITECACHE+20)
void process_registerevent(IPC_Channel* chan, gpointer user_data);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/heartbeat.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- heartbeat.h 1 Feb 2006 14:59:10 -0000 1.81
+++ heartbeat.h 7 Feb 2006 17:18:24 -0000 1.82
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.h,v 1.81 2006/02/01 14:59:10 alan Exp $ */
+/* $Id: heartbeat.h,v 1.82 2006/02/07 17:18:24 alan Exp $ */
/*
* heartbeat.h: core definitions for the Linux-HA heartbeat program
*
@@ -402,6 +402,7 @@
guint uuid_hash(gconstpointer key);
int write_cache_file(struct sys_config * cfg);
int read_cache_file(struct sys_config * cfg);
+int write_delnode_file(struct sys_config * cfg);
void add_nametable(const char* nodename, struct node_info* value);
void add_uuidtable(cl_uuid_t*, struct node_info* value);
const char * uuid2nodename(cl_uuid_t* uuid);
------------------------------
_______________________________________________
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 31
********************************************
