Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: resources by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: heartbeat by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by sunjd from (linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: include by sunjd from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 8 Jun 2006 13:16:16 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
.cvsignore
Log Message:
Adding SysInfo and VIPArip
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- .cvsignore 23 Apr 2006 09:47:53 -0000 1.6
+++ .cvsignore 8 Jun 2006 19:16:15 -0000 1.7
@@ -33,3 +33,5 @@
ClusterMon
Xen
pingd
+SysInfo
+VIPArip
------------------------------
Message: 2
Date: Thu, 8 Jun 2006 13:17:02 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
.cvsignore
Log Message:
Adding SysInfo and VIPArip
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- .cvsignore 24 May 2006 17:03:01 -0000 1.12
+++ .cvsignore 8 Jun 2006 19:17:01 -0000 1.13
@@ -16,3 +16,5 @@
hb_addnode
hb_delnode
ha_propagate
+hb_setsite
+hb_setweight
------------------------------
Message: 3
Date: Thu, 8 Jun 2006 23:29:53 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
cl_msg.c
Log Message:
add a msg updating function for string hashtable
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- cl_msg.c 17 May 2006 23:22:33 -0000 1.105
+++ cl_msg.c 9 Jun 2006 05:29:53 -0000 1.106
@@ -1,4 +1,4 @@
-/* $Id: cl_msg.c,v 1.105 2006/05/17 23:22:33 gshi Exp $ */
+/* $Id: cl_msg.c,v 1.106 2006/06/09 05:29:53 sunjd Exp $ */
/*
* Heartbeat messaging object.
*
@@ -885,17 +885,33 @@
hash_msg = str_table_to_msg(hash_table);
if( HA_OK != ha_msg_addstruct(msg, name, hash_msg)) {
ha_msg_del(hash_msg);
- cl_log(LOG_ERR, "ha_msg_add in ha_msg_add_str_table failed");
+ cl_log(LOG_ERR
+ , "ha_msg_addstruct in ha_msg_add_str_table failed");
return HA_FAIL;
}
ha_msg_del(hash_msg);
return HA_OK;
}
+int
+ha_msg_mod_str_table(struct ha_msg * msg, const char * name,
+ GHashTable* hash_table)
+{
+ struct ha_msg* hash_msg;
+ if (NULL == msg || NULL == name || NULL == hash_table) {
+ return HA_FAIL;
+ }
-
-
-
+ hash_msg = str_table_to_msg(hash_table);
+ if( HA_OK != cl_msg_modstruct(msg, name, hash_msg)) {
+ ha_msg_del(hash_msg);
+ cl_log(LOG_ERR
+ , "ha_msg_modstruct in ha_msg_mod_str_table failed");
+ return HA_FAIL;
+ }
+ ha_msg_del(hash_msg);
+ return HA_OK;
+}
int
cl_msg_list_add_string(struct ha_msg* msg, const char* name, const char* value)
@@ -2479,6 +2495,9 @@
#endif
/*
* $Log: cl_msg.c,v $
+ * Revision 1.106 2006/06/09 05:29:53 sunjd
+ * add a msg updating function for string hashtable
+ *
* Revision 1.105 2006/05/17 23:22:33 gshi
* a compressed field can still be coded as a string, e.g in serial
*
------------------------------
Message: 4
Date: Thu, 8 Jun 2006 23:30:38 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: include by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
ha_msg.h
Log Message:
add a msg updating function for string hashtable
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/ha_msg.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ha_msg.h 28 May 2006 00:48:31 -0000 1.82
+++ ha_msg.h 9 Jun 2006 05:30:37 -0000 1.83
@@ -1,4 +1,4 @@
-/* $Id: ha_msg.h,v 1.82 2006/05/28 00:48:31 zhenh Exp $ */
+/* $Id: ha_msg.h,v 1.83 2006/06/09 05:30:37 sunjd Exp $ */
/*
* Intracluster message object (struct ha_msg)
*
@@ -438,6 +438,8 @@
GHashTable* ha_msg_value_str_table(struct ha_msg * msg, const char * name);
int ha_msg_add_str_table(struct ha_msg * msg, const char * name,
GHashTable* hash_table);
+int ha_msg_mod_str_table(struct ha_msg * msg, const char * name,
+ GHashTable* hash_table);
/*internal use for list type*/
size_t string_list_pack_length(const GList* list);
------------------------------
Message: 5
Date: Thu, 8 Jun 2006 23:36:55 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
bug1301: donn't update rsc->params while update op->params
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -3 -r1.222 -r1.223
--- lrmd.c 15 May 2006 09:06:21 -0000 1.222
+++ lrmd.c 9 Jun 2006 05:36:55 -0000 1.223
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.222 2006/05/15 09:06:21 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.223 2006/06/09 05:36:55 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3129,7 +3129,8 @@
params = merge_str_tables(rsc->params,op_params);
free_str_table(op_params);
free_str_table(rsc->params);
- rsc->params = params;
+ ha_msg_mod_str_table(op->msg, F_LRM_PARAM, op_params);
+
op->t_perform = time_longclock();
t_stay_in_list = longclockto_ms(op->t_perform - op->t_addtolist);
if ( t_stay_in_list > WARNINGTIME_IN_LIST)
@@ -3804,6 +3805,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.223 2006/06/09 05:36:55 sunjd
+ * bug1301: donn't update rsc->params while update op->params
+ *
* Revision 1.222 2006/05/15 09:06:21 sunjd
* prevent null object to be added
*
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 29
********************************************
