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 zhenh from
([email protected])
3. Linux-HA CVS: mgmt by andrew from
([email protected])
4. Linux-HA CVS: resources by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 12 Jun 2006 20:39:42 -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_crm.c
Log Message:
using existing id of attributes of crm_config if it exists
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- mgmt_crm.c 12 Jun 2006 09:23:13 -0000 1.51
+++ mgmt_crm.c 13 Jun 2006 02:39:41 -0000 1.52
@@ -586,11 +586,33 @@
on_update_crm_config(char* argv[], int argc)
{
int rc;
+ GList* cur;
+ crm_data_t* attr;
+ crm_data_t* attrs;
+ const char* id = NULL;
+ pe_working_set_t* data_set;
+ const char* path[] =
{"configuration","crm_config","cluster_property_set", "attributes"}
ARGC_CHECK(3);
+ data_set = get_data_set();
+ attrs = find_xml_node_nested(data_set->input, path, 4);
+
+ if (attrs != NULL) {
+ cur = find_xml_node_list(attrs, "nvpair");
+ while (cur != NULL) {
+ attr = (crm_data_t*)cur->data;
+ if(strncmp(ha_msg_value(attr,"name"),argv[1],
MAX_STRLEN)==0) {
+ id = ha_msg_value(attr,"id");
+ break;
+ }
+ cur = g_list_next(cur);
+ }
+ }
+
rc = update_attr(cib_conn, cib_sync_call, XML_CIB_TAG_CRMCONFIG, NULL
- , CIB_OPTIONS_FIRST, NULL, argv[1], argv[2]);
+ , CIB_OPTIONS_FIRST, id, argv[1], argv[2]);
+ free_data_set(data_set);
if (rc == cib_ok) {
return cl_strdup(MSG_OK);
}
------------------------------
Message: 2
Date: Mon, 12 Jun 2006 22:57:33 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
hb_uuid.c
Log Message:
update the uuid table when node changed it's uuid
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_uuid.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- hb_uuid.c 28 May 2006 00:52:29 -0000 1.25
+++ hb_uuid.c 13 Jun 2006 04:57:33 -0000 1.26
@@ -221,7 +221,13 @@
if (cl_uuid_is_null(&hip->uuid)){
cl_uuid_copy(&hip->uuid, uuid);
}else if (cl_uuid_compare(&hip->uuid, uuid) != 0){
- cl_log(LOG_ERR, "node %s changed its uuid", nodename);
+ char tmpstr[UU_UNPARSE_SIZEOF];
+ memset(tmpstr , 0, UU_UNPARSE_SIZEOF);
+ cl_uuid_unparse(uuid, tmpstr);
+ cl_log(LOG_INFO, "node %s changed its uuid to %s"
+ , nodename, tmpstr);
+
+ cl_uuid_copy(&hip->uuid, uuid);
nametable_display();
}
add_uuidtable(uuid, hip);
------------------------------
Message: 3
Date: Tue, 13 Jun 2006 00:47:39 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
The management daemon doesn't need to run a complete simulation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- mgmt_crm.c 13 Jun 2006 02:39:41 -0000 1.52
+++ mgmt_crm.c 13 Jun 2006 06:47:38 -0000 1.53
@@ -172,7 +172,8 @@
set_working_set_defaults(data_set);
data_set->input = get_cib_copy(cib_conn);
data_set->now = new_ha_date(TRUE);
- do_calculations(data_set, data_set->input, NULL);
+
+ cluster_status(data_set);
if (cib_cache_enable) {
cib_cached = data_set;
------------------------------
Message: 4
Date: Tue, 13 Jun 2006 00:50:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
pingd.in
Log Message:
Patch from Dejan
- better defaults
- improved use of "su"
- option passing
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/pingd.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pingd.in 10 Apr 2006 14:54:46 -0000 1.1
+++ pingd.in 13 Jun 2006 06:50:21 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: pingd.in,v 1.1 2006/04/10 14:54:46 andrew Exp $
+# $Id: pingd.in,v 1.2 2006/06/13 06:50:21 andrew Exp $
#
# pingd OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -151,22 +151,22 @@
pingd_start() {
extras=""
- if [ ! -z $OCF_RESKEY_multiplier ]; then
+ if [ ! -z "$OCF_RESKEY_multiplier" ]; then
extras="$extras -m $OCF_RESKEY_multiplier"
fi
- if [ ! -z $OCF_RESKEY_set ]; then
- extras="$extras -m $OCF_RESKEY_set"
+ if [ ! -z "$OCF_RESKEY_set" ]; then
+ extras="$extras -s $OCF_RESKEY_set"
fi
- if [ ! -z $OCF_RESKEY_section ]; then
- extras="$extras -m $OCF_RESKEY_section"
+ if [ ! -z "$OCF_RESKEY_section" ]; then
+ extras="$extras -S $OCF_RESKEY_section"
fi
- for a_host in "$OCF_RESKEY_host_list"; do
- extras="$extras -h $a_host"
+ for a_host in $OCF_RESKEY_host_list; do
+ extras="$extras -h $a_host"
done
- pingd_cmd="@hb_libdir@/pingd -D -p $OCF_RESKEY_pidfile -n $OCF_RESKEY_name
-d $OCF_RESKEY_dampen $extras"
+ pingd_cmd="@hb_libdir@/pingd -D -p $OCF_RESKEY_pidfile -a $OCF_RESKEY_name
-d $OCF_RESKEY_dampen $extras"
if [ ! -z $OCF_RESKEY_user ]; then
- su - $OCF_RESKEY_user -c "$pingd_cmd"
+ echo "$pingd_cmd" | su - $OCF_RESKEY_user
else
$pingd_cmd
fi
@@ -237,7 +237,7 @@
fi
: ${OCF_RESKEY_pidfile:="$HA_VARRUNDIR/rsctmp/pingd-${OCF_RESOURCE_INSTANCE}"}
-: ${OCF_RESKEY_name:="${OCF_RESOURCE_INSTANCE}"}
+: ${OCF_RESKEY_name:="pingd"}
: ${OCF_RESKEY_dampen:="1s"}
case $__OCF_ACTION in
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 40
********************************************
