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: linux-ha by zhenh from
([email protected])
3. Linux-HA CVS: debian by zhenh from
([email protected])
4. Linux-HA CVS: fencing by sunjd from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 14 Apr 2006 00:49:58 -0600 (MDT)
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_hb.c
Log Message:
update the cache of parameter when first called instead of initialization. this
makes the init faster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_hb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- mgmt_hb.c 27 Mar 2006 09:31:54 -0000 1.6
+++ mgmt_hb.c 14 Apr 2006 06:49:57 -0000 1.7
@@ -96,15 +96,24 @@
char*
on_get_hb_config(char* argv[], int argc)
{
+ int i;
+ char* value = NULL;
+ if (hb_config == NULL) {
+ hb_config = cl_strdup(MSG_OK);
+ for (i = 0; i < sizeof(param_name)/sizeof(param_name[0]); i++) {
+ value = hb->llc_ops->get_parameter(hb, param_name[i]);
+ hb_config = mgmt_msg_append(hb_config,
value!=NULL?value:"");
+ if (value != NULL) {
+ cl_free(value);
+ }
+ }
+ }
return cl_strdup(hb_config);
}
int
init_heartbeat(void)
{
- int i;
- char* value = NULL;
-
hb = ll_cluster_new("heartbeat");
if (hb->llc_ops->signon(hb, client_name)!= HA_OK) {
mgmt_log(LOG_ERR, "Cannot sign on with heartbeat");
@@ -119,15 +128,7 @@
reg_msg(MSG_ALLNODES, on_get_allnodes);
reg_msg(MSG_HB_CONFIG, on_get_hb_config);
reg_msg(MSG_ECHO, on_echo);
-
- hb_config = cl_strdup(MSG_OK);
- for (i = 0; i < sizeof(param_name)/sizeof(param_name[0]); i++) {
- value = hb->llc_ops->get_parameter(hb, param_name[i]);
- hb_config = mgmt_msg_append(hb_config, value!=NULL?value:"");
- if (value != NULL) {
- cl_free(value);
- } }
-
+
return 0;
}
------------------------------
Message: 2
Date: Fri, 14 Apr 2006 02:06:12 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
the .mo file name changed, thanks to Dejan Muhamedagic
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- heartbeat.spec.in 9 Apr 2006 15:14:34 -0000 1.167
+++ heartbeat.spec.in 14 Apr 2006 08:06:11 -0000 1.168
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.167 2006/04/09 15:14:34 andrew Exp $
+# $Id: heartbeat.spec.in,v 1.168 2006/04/14 08:06:11 zhenh Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1195,7 +1195,7 @@
@libdir@/libhbmgmtcommon.*
@libdir@/libhbmgmttls.*
/etc/pam.d/hbmgmtd
- /usr/share/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+ /usr/share/locale/zh_CN/LC_MESSAGES/haclient.mo
%endif
###########################################################
------------------------------
Message: 3
Date: Fri, 14 Apr 2006 02:06:56 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
heartbeat-2.files
Log Message:
the .mo file name changed, thanks to Dejan Muhamedagic
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- heartbeat-2.files 8 Mar 2006 03:27:30 -0000 1.11
+++ heartbeat-2.files 14 Apr 2006 08:06:55 -0000 1.12
@@ -255,7 +255,7 @@
usr/share/doc/heartbeat-2/rsync.html
usr/share/doc/heartbeat-2/rsync.txt
usr/share/doc/heartbeat-2/startstop
-usr/share/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+usr/share/locale/zh_CN/LC_MESSAGES/haclient.mo
usr/share/man/man1/cl_status.1.gz
usr/share/man/man1/ha_logger.1.gz
usr/share/man/man1/hb_addnode.1.gz
------------------------------
Message: 4
Date: Fri, 14 Apr 2006 02:07:26 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
typo found by Dave
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- stonithd.c 10 Apr 2006 08:14:37 -0000 1.88
+++ stonithd.c 14 Apr 2006 08:07:26 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.88 2006/04/10 08:14:37 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.89 2006/04/14 08:07:26 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -202,7 +202,7 @@
static void stonithd_hb_msg_dispatch_destroy(gpointer user_data);
static int init_hb_msg_handler(void);
static gboolean reboot_block_timeout(gpointer data);
-static void timerid_destroy_nodify(gpointer user_data);
+static void timerid_destroy_notify(gpointer user_data);
static void free_timer(gpointer data);
/* Local IPC communication related.
@@ -240,7 +240,7 @@
static int send_stonithRAop_final_result(stonithRA_ops_t * ra_op,
gpointer data);
static int post_handle_raop(stonithRA_ops_t * ra_op);
-static void destory_key_of_op_htable(gpointer data);
+static void destroy_key_of_op_htable(gpointer data);
static stonith_ops_t * dup_stonith_ops_t(stonith_ops_t * st_op);
static stonithRA_ops_t * new_stonithRA_ops_t(struct ha_msg * request);
@@ -253,7 +253,7 @@
static stonith_rsc_t * get_local_stonithobj_can_stonith(const char * node_name,
const char * begin_rsc_id );
static int stonith_operate_locally(stonith_ops_t * st_op, stonith_rsc_t *
srsc);
-static void timeout_destroy_nodify(gpointer user_data);
+static void timeout_destroy_notify(gpointer user_data);
static gboolean stonithop_timeout(gpointer data);
static void my_hash_table_find( GHashTable * htable, gpointer * orig_key,
gpointer * value, gpointer user_data);
@@ -489,7 +489,7 @@
/* Initialize some global variables */
executing_queue = g_hash_table_new_full(g_int_hash, g_int_equal,
- destory_key_of_op_htable,
+ destroy_key_of_op_htable,
free_common_op_t);
/* The following line is only for CTS test with APITEST */
@@ -1062,7 +1062,7 @@
*tmp_callid = child_id;
op->timer_id = Gmain_timeout_add_full(G_PRIORITY_HIGH_IDLE
, st_op->timeout, stonithop_timeout
- , tmp_callid, timeout_destroy_nodify);
+ , tmp_callid, timeout_destroy_notify);
stonithd_log(LOG_DEBUG, "require_local_stonithop: inserted "
"optype=%d, child_id=%d", st_op->optype, child_id);
return ST_OK;
@@ -1193,7 +1193,7 @@
/* The timeout value equals 90 seconds now */
timer_id = Gmain_timeout_add_full(G_PRIORITY_HIGH_IDLE, 90*1000
, reboot_block_timeout, g_strdup(target)
- , timerid_destroy_nodify);
+ , timerid_destroy_notify);
g_hash_table_replace(reboot_blocked_table, g_strdup(target)
, g_memdup(&timer_id, sizeof(timer_id)));
@@ -1202,7 +1202,7 @@
}
static void
-timerid_destroy_nodify(gpointer data)
+timerid_destroy_notify(gpointer data)
{
gchar * target = (gchar *)data;
@@ -1793,7 +1793,7 @@
*tmp_callid = call_id;
op->timer_id = Gmain_timeout_add_full(G_PRIORITY_HIGH_IDLE
, st_op->timeout, stonithop_timeout
- , tmp_callid, timeout_destroy_nodify);
+ , tmp_callid, timeout_destroy_notify);
stonithd_log2(LOG_DEBUG, "initiate_local_stonithop: inserted "
"optype=%d, child_id=%d", st_op->optype, call_id);
return call_id;
@@ -1893,7 +1893,7 @@
*tmp_callid = st_op->call_id;
op->timer_id = Gmain_timeout_add_full(G_PRIORITY_HIGH_IDLE
, st_op->timeout, stonithop_timeout
- , tmp_callid, timeout_destroy_nodify);
+ , tmp_callid, timeout_destroy_notify);
stonithd_log(LOG_DEBUG, "initiate_remote_stonithop: inserted "
"optype=%d, key=%d", op->op_union.st_op->optype,
*tmp_callid);
@@ -2301,7 +2301,7 @@
}
static void
-timeout_destroy_nodify(gpointer user_data)
+timeout_destroy_notify(gpointer user_data)
{
int * call_id = (int *) user_data;
if (call_id != NULL) {
@@ -3335,7 +3335,7 @@
}
static void
-destory_key_of_op_htable(gpointer data)
+destroy_key_of_op_htable(gpointer data)
{
g_free((int*)data);
}
@@ -3420,6 +3420,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.89 2006/04/14 08:07:26 sunjd
+ * typo found by Dave
+ *
* Revision 1.88 2006/04/10 08:14:37 sunjd
* stonithd.c
*
------------------------------
_______________________________________________
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 86
********************************************
