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: lib by alan from ([email protected])
2. Linux-HA CVS: heartbeat by lars from
([email protected])
3. Linux-HA CVS: include by alan from
([email protected])
4. Linux-HA CVS: heartbeat by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 1 Feb 2006 06:02:00 -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:
realtime.c
Log Message:
Improved the code to keep malloc from giving memory back to the system.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/realtime.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- realtime.c 1 Feb 2006 05:35:24 -0000 1.32
+++ realtime.c 1 Feb 2006 13:01:59 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Id: realtime.c,v 1.32 2006/02/01 05:35:24 alan Exp $ */
+/* $Id: realtime.c,v 1.33 2006/02/01 13:01:59 alan Exp $ */
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -98,7 +98,7 @@
#endif
# ifdef M_TRIM_THRESHOLD
/* Keep malloc from giving memory back to the system */
- mallopt(M_TRIM_THRESHOLD, 1024*1024);
+ mallopt(M_TRIM_THRESHOLD, 4*kbytes);
#endif
#endif
chunks=malloc(chunkbytes);
------------------------------
Message: 2
Date: Wed, 1 Feb 2006 06:59:17 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
These syncs are superfluous; "sync" does not guarantee inter-program IO
integrity at all (which is maintained by the buffer cache of the OS), is
asynchronous (so even if it did the former, it wouldn't guarantee that
it had reached that state after the sync call returned) and has
undesireable side-effects on the other workload of the system running
BSC.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- BasicSanityCheck.in 24 Jan 2006 16:10:14 -0000 1.92
+++ BasicSanityCheck.in 1 Feb 2006 13:59:16 -0000 1.93
@@ -123,7 +123,6 @@
return 0
fi
if
- sync
grep "$IDENTSTRING" $1 >/dev/null 2>&1
then
return 0
@@ -950,7 +949,6 @@
fi
if
- sync
egrep 'CRIT|ERROR' $LOGFILE
then
echo "OOPS! Looks like we had some errors come up."
------------------------------
Message: 3
Date: Wed, 1 Feb 2006 07:59:10 -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.h heartbeat.h
Log Message:
Added some code to allow memory pre-reserve for heartbeat a configuration
problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/hb_api.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- hb_api.h 16 Jan 2006 09:16:32 -0000 1.43
+++ hb_api.h 1 Feb 2006 14:59:09 -0000 1.44
@@ -1,4 +1,4 @@
-/* $Id: hb_api.h,v 1.43 2006/01/16 09:16:32 andrew Exp $ */
+/* $Id: hb_api.h,v 1.44 2006/02/01 14:59:09 alan Exp $ */
/*
* Client-side Low-level clustering API for heartbeat.
*
@@ -429,6 +429,7 @@
#define KEY_AUTOJOIN "autojoin"
#define KEY_UUIDFROM "uuidfrom"
#define KEY_ENV "env"
+#define KEY_MEMRESERVE "memreserve"
#define KEY_MAX_REXMIT_DELAY "max_rexmit_delay"
#define KEY_LOG_CONFIG_CHANGES "record_config_changes"
#define KEY_LOG_PENGINE_INPUTS "record_pengine_inputs"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/heartbeat.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- heartbeat.h 10 Nov 2005 01:16:42 -0000 1.80
+++ heartbeat.h 1 Feb 2006 14:59:10 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.h,v 1.80 2005/11/10 01:16:42 gshi Exp $ */
+/* $Id: heartbeat.h,v 1.81 2006/02/01 14:59:10 alan Exp $ */
/*
* heartbeat.h: core definitions for the Linux-HA heartbeat program
*
@@ -253,9 +253,9 @@
#define NORMALNODE_I 0
#define PINGNODE_I 1
-#define NORMALNODE "normal"
-#define PINGNODE "ping"
-#define UNKNOWNNODE "unknown"
+#define NORMALNODE "normal"
+#define PINGNODE "ping"
+#define UNKNOWNNODE "unknown"
struct node_info {
int nodetype;
@@ -300,12 +300,13 @@
long initial_deadtime_ms; /* Ticks before saying dead 1st
time*/
long warntime_ms; /* Ticks before issuing warning
*/
int hopfudge; /* hops beyond nodecount
allowed */
- int log_facility; /* syslog facility, if any */
+ int log_facility; /* syslog facility, if any */
char facilityname[PATH_MAX]; /* syslog facility name (if
any) */
char logfile[PATH_MAX]; /* path to log file, if any */
int use_logfile; /* Flag to use the log
file*/
char dbgfile[PATH_MAX]; /* path to debug file, if any */
- int use_dbgfile; /* Flag to use the
debug file*/
+ int use_dbgfile; /* Flag to use the debug file*/
+ int memreserve; /* number of kbytes to
preallocate in heartbeat */
int rereadauth; /* 1 if we need to reread auth
file */
seqno_t generation; /* Heartbeat generation # */
cl_uuid_t uuid; /* uuid for this node*/
------------------------------
Message: 4
Date: Wed, 1 Feb 2006 07:59:11 -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:
config.c heartbeat.c
Log Message:
Added some code to allow memory pre-reserve for heartbeat a configuration
problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -3 -r1.191 -r1.192
--- config.c 16 Jan 2006 09:16:32 -0000 1.191
+++ config.c 1 Feb 2006 14:59:10 -0000 1.192
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.191 2006/01/16 09:16:32 andrew Exp $ */
+/* $Id: config.c,v 1.192 2006/02/01 14:59:10 alan Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -107,6 +107,7 @@
static int set_autojoin(const char*);
static int set_uuidfrom(const char*);
static int ha_config_check_boolean(const char *);
+static int set_memreserve(const char *);
#ifdef ALLOWPOLLCHOICE
static int set_normalpoll(const char *);
#endif
@@ -167,6 +168,7 @@
,{KEY_LOG_CONFIG_CHANGES, ha_config_check_boolean, TRUE,"on", "record changes
to the cib (valid only with: "KEY_REL2" on)"}
,{KEY_LOG_PENGINE_INPUTS, ha_config_check_boolean, TRUE,"on", "record the
input used by the policy engine (valid only with: "KEY_REL2" on)"}
,{KEY_CONFIG_WRITES_ENABLED, ha_config_check_boolean, TRUE,"on", "write
configuration changes to disk (valid only with: "KEY_REL2" on)"}
+,{KEY_MEMRESERVE, set_memreserve, TRUE, "6500", "number of kbytes to
preallocate in heartbeat"}
};
@@ -2481,6 +2483,17 @@
cl_log(LOG_ERR, "Invalid %s directive [%s]", KEY_UUIDFROM, value);
return HA_FAIL;
}
+/* Set the memory reserve amount for heartbeat (in kbytes) */
+static int
+set_memreserve(const char * value)
+{
+ config->memreserve = atoi(value);
+
+ if (config->memreserve > 0) {
+ return(HA_OK);
+ }
+ return(HA_FAIL);
+}
static int
ha_config_check_boolean(const char *value)
@@ -2504,6 +2517,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.192 2006/02/01 14:59:10 alan
+ * Added some code to allow memory pre-reserve for heartbeat a configuration
problem.
+ *
* Revision 1.191 2006/01/16 09:16:32 andrew
* Three new ha.cf options:
* - record_config_changes (on/off)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -3 -r1.485 -r1.486
--- heartbeat.c 1 Feb 2006 06:27:28 -0000 1.485
+++ heartbeat.c 1 Feb 2006 14:59:10 -0000 1.486
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.485 2006/02/01 06:27:28 alan Exp $ */
+/* $Id: heartbeat.c,v 1.486 2006/02/01 14:59:10 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -1339,7 +1339,7 @@
, cl_cpu_limit_ms_interval()
, hb_update_cpu_limit, NULL, NULL);
}
- cl_make_realtime(-1, hb_realtime_prio, 32, 4096);
+ cl_make_realtime(-1, hb_realtime_prio, 32, config->memreserve);
set_proc_title("%s: master control process", cmdname);
@@ -6099,6 +6099,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.486 2006/02/01 14:59:10 alan
+ * Added some code to allow memory pre-reserve for heartbeat a configuration
problem.
+ *
* Revision 1.485 2006/02/01 06:27:28 alan
* Grabbed an even bigger chunk of memory when starting up heartbeat.
*
------------------------------
_______________________________________________
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 1
*******************************************
