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: lrm by sunjd from ([email protected])
2. Linux-HA CVS: resources by sunjd from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: resources by sunjd from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 16 Jan 2006 03:05:57 -0700 (MST)
From: [email protected]
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:
reset SIGPIPE to SIG_DFL. I think it should be. One related issue is found by
Peter Kruse <[EMAIL PROTECTED]>, while the solution is proposed by [EMAIL
PROTECTED]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- lrmd.c 27 Dec 2005 22:35:07 -0000 1.200
+++ lrmd.c 16 Jan 2006 10:05:56 -0000 1.201
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.200 2005/12/27 22:35:07 alan Exp $ */
+/* $Id: lrmd.c,v 1.201 2006/01/16 10:05:56 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -1073,6 +1073,7 @@
}
CL_IGNORE_SIG(SIGINT);
CL_IGNORE_SIG(SIGHUP);
+ CL_DEFAULT_SIG(SIGPIPE);
G_main_add_SignalHandler(G_PRIORITY_HIGH, SIGTERM
, shutdown, NULL, NULL);
cl_signal_set_interrupt(SIGTERM, 1);
@@ -3466,6 +3467,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.201 2006/01/16 10:05:56 sunjd
+ * reset SIGPIPE to SIG_DFL. I think it should be. One related issue is found
by Peter Kruse <[EMAIL PROTECTED]>, while the solution is proposed by [EMAIL
PROTECTED]
+ *
* Revision 1.200 2005/12/27 22:35:07 alan
* Changed one message to not come out except at higher debug levels or in
case of error.
*
------------------------------
Message: 2
Date: Mon, 16 Jan 2006 03:16:21 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/heartbeat
Modified Files:
hto-mapfuncs.in
Log Message:
The fixing to bug 1034: ra_execocf can't deal with the env parameter whose
value includes blank
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/hto-mapfuncs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- hto-mapfuncs.in 14 Nov 2005 07:32:04 -0000 1.10
+++ hto-mapfuncs.in 16 Jan 2006 10:16:20 -0000 1.11
@@ -117,23 +117,31 @@
}
ra_setenv(){
-
- for envar in $*
- do
- setup_OCF_prefix $envar
+ i=1
+ hbvarname=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$i`
+ while [ 1==1 ]; do
+ let i=i+1
+ hbvarvalue=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$i |
fmt -u`
+ let j=i+1
+ nextvarvalue=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$j`
+ if [ ! -z "$nextvarvalue" ]; then
+ k=`echo $hbvarvalue | wc -w`
+ nextvarname=`echo $hbvarvalue | cut -d" " -f$k`
+ let k=k-1
+ havarvalue=`echo $hbvarvalue | cut -d" " -f1-$k`
+
+ ocfvarname="OCF_RESKEY_${hbvarname}"
+ export `echo $ocfvarname`="$havarvalue"
+ hbvarname=$nextvarname
+ continue
+ else
+ ocfvarname="OCF_RESKEY_${hbvarname}"
+ export `echo $ocfvarname`="$hbvarvalue"
+ return
+ fi
done
}
-setup_OCF_prefix(){
-
- hbvarname=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f1`
- hbvarvalue=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
- ocfvarname="OCF_RESKEY_${hbvarname}"
-
- eval $ocfvarname=$hbvarvalue
- export $ocfvarname
-}
-
setup_OCF_env_vars(){
hbvarname=`echo "$1" | cut -d${PARAMETER_SPLIT_SIGN} -f1`
hbvarvalue=`echo "$1" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
------------------------------
Message: 3
Date: Mon, 16 Jan 2006 03:17:44 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
This preference is no longer used
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- CM_LinuxHAv2.py.in 16 Jan 2006 09:16:32 -0000 1.127
+++ CM_LinuxHAv2.py.in 16 Jan 2006 10:17:44 -0000 1.128
@@ -126,8 +126,7 @@
<nvpair id="c-pref-5" name="stop_orphan_actions" value="false"/>
<nvpair id="c-pref-6" name="remove_after_stop" value="false"/>
<nvpair id="c-pref-7" name="is_managed_default" value="true"/>
- <nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>""" %
self.Env["SuppressCib"]
-
+ <nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>"""
cib_glue_1='''
</crm_config>
<nodes/>
------------------------------
Message: 4
Date: Mon, 16 Jan 2006 04:08:26 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
fsa.c
Log Message:
Turn down some debug logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- fsa.c 16 Jan 2006 09:19:53 -0000 1.132
+++ fsa.c 16 Jan 2006 11:08:25 -0000 1.133
@@ -252,7 +252,7 @@
} else if(fsa_actions == A_EXIT_0) {
/* temporary error */
- crm_err("Processing %s: [ state=%s cause=%s origin=%s
]",
+ crm_debug_2("Processing %s: [ state=%s cause=%s
origin=%s ]",
fsa_input2string(fsa_data->fsa_input),
fsa_state2string(fsa_state),
fsa_cause2string(fsa_data->fsa_cause),
------------------------------
Message: 5
Date: Mon, 16 Jan 2006 10:44:57 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/heartbeat
Modified Files:
hto-mapfuncs.in
Log Message:
A better way to fix bug 1034
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/hto-mapfuncs.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- hto-mapfuncs.in 16 Jan 2006 10:16:20 -0000 1.11
+++ hto-mapfuncs.in 16 Jan 2006 17:44:56 -0000 1.12
@@ -117,31 +117,30 @@
}
ra_setenv(){
- i=1
- hbvarname=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$i`
- while [ 1==1 ]; do
- let i=i+1
- hbvarvalue=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$i |
fmt -u`
- let j=i+1
- nextvarvalue=`echo "$*" | cut -d${PARAMETER_SPLIT_SIGN} -f$j`
- if [ ! -z "$nextvarvalue" ]; then
- k=`echo $hbvarvalue | wc -w`
- nextvarname=`echo $hbvarvalue | cut -d" " -f$k`
- let k=k-1
- havarvalue=`echo $hbvarvalue | cut -d" " -f1-$k`
-
- ocfvarname="OCF_RESKEY_${hbvarname}"
- export `echo $ocfvarname`="$havarvalue"
- hbvarname=$nextvarname
- continue
+
+ lastenvar=
+ for envar in $*
+ do
+ ifvarname=`echo $envar | cut -s -d${PARAMETER_SPLIT_SIGN} -f1`
+ if [ -z $ifvarname ]; then
+ envar="$lastenvar $envar"
+ setup_OCF_prefix $envar
else
- ocfvarname="OCF_RESKEY_${hbvarname}"
- export `echo $ocfvarname`="$hbvarvalue"
- return
- fi
+ setup_OCF_prefix $envar
+ fi
+ lastenvar=$envar
done
}
+setup_OCF_prefix(){
+
+ hbvarname=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f1`
+ hbvarvalue=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
+ ocfvarname="OCF_RESKEY_${hbvarname}"
+
+ export `echo $ocfvarname`="$hbvarvalue"
+}
+
setup_OCF_env_vars(){
hbvarname=`echo "$1" | cut -d${PARAMETER_SPLIT_SIGN} -f1`
hbvarvalue=`echo "$1" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 38
********************************************
