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: cts by davidlee from
([email protected])
2. Linux-HA CVS: lib by sunjd from ([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: fencing by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Jun 2006 16:12:36 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
Makefile.am
Log Message:
On uninstall should ideally remove python's derived *.pyc and *.pyo files.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 25 Mar 2006 16:53:29 -0000 1.12
+++ Makefile.am 22 Jun 2006 22:12:36 -0000 1.13
@@ -42,3 +42,19 @@
lsbdir = $(libdir)/heartbeat/cts
lsb_SCRIPTS = LSBDummy
+## Python scripts *.py can generate *.pyc and *.pyo alongside.
+## Should remove these on "uninstall".
+##
+## This code was copied, with adaptation, from the expansion in "Makefile.in"
+## of the corresponding code to uninstall "hard_SCRIPTS".
+uninstall-hook:
+ @$(NORMAL_UNINSTALL)
+ @list='$(hard_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ fc="$${f}c"; \
+ fo="$${f}o"; \
+ echo " rm -f '$(DESTDIR)$(harddir)/$$fc'"; \
+ rm -f "$(DESTDIR)$(harddir)/$$fc"; \
+ echo " rm -f '$(DESTDIR)$(harddir)/$$fo'"; \
+ rm -f "$(DESTDIR)$(harddir)/$$fo"; \
+ done
------------------------------
Message: 2
Date: Thu, 22 Jun 2006 23:33:19 -0600 (MDT)
From: [email protected]
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/plugins/lrm
Modified Files:
raexecstonith.c
Log Message:
bug#1300: adjust priority
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecstonith.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- raexecstonith.c 12 Jun 2006 08:18:16 -0000 1.22
+++ raexecstonith.c 23 Jun 2006 05:33:18 -0000 1.23
@@ -33,6 +33,7 @@
#include <errno.h>
#include <glib.h>
#include <clplumbing/cl_log.h>
+#include <clplumbing/uids.h>
#include <pils/plugin.h>
#include <dirent.h>
#include <libgen.h> /* Add it for compiling on OSX */
@@ -201,8 +202,8 @@
/* send the RA operation to stonithd to simulate a RA's actions */
if ( 0==STRNCMP_CONST(op_type, "start")
|| 0==STRNCMP_CONST(op_type, "stop") ) {
- cl_log(LOG_DEBUG
- , "Will %s STONITH resource <rsc_id=%s> : Device=%s"
+ cl_log(LOG_INFO
+ , "Try to %s STONITH resource <rsc_id=%s> : Device=%s"
, op_type, rsc_id, rsc_type);
}
@@ -269,6 +270,7 @@
get_resource_list(GList ** rsc_info)
{
int rc;
+ int needprivs = !cl_have_full_privs();
if ( rsc_info == NULL ) {
cl_log(LOG_ERR, "Parameter error: get_resource_list");
@@ -281,16 +283,21 @@
*rsc_info = NULL;
}
- cl_log(LOG_INFO, "To get stonith resource list");
+ if (needprivs) {
+ return_to_orig_privs();
+ }
if (ST_OK != stonithd_signon("STONITH_RA")) {
cl_log(LOG_ERR, "%s:%d: Can not signon to the stonithd."
, __FUNCTION__, __LINE__);
- return -1;
+ rc = -1;
+ } else {
+ rc = stonithd_list_stonith_types(rsc_info);
+ stonithd_signoff();
}
- rc = stonithd_list_stonith_types(rsc_info);
- stonithd_signoff();
-
+ if (needprivs) {
+ return_to_dropped_privs();
+ }
return rc;
}
------------------------------
Message: 3
Date: Fri, 23 Jun 2006 00:42:11 -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:
use the same naming rule with crm_standby
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- mgmt_crm.c 21 Jun 2006 02:28:28 -0000 1.58
+++ mgmt_crm.c 23 Jun 2006 06:42:10 -0000 1.59
@@ -761,7 +761,7 @@
}
snprintf(xml, MAX_STRLEN,
- "<node id=\"%s\"><instance_attributes id=\"standby-\%s\">"
+ "<node id=\"%s\"><instance_attributes id=\"nodes-\%s\">"
"<attributes><nvpair id=\"standby-%s\" name=\"standby\"
value=\"%s\"/>"
"</attributes></instance_attributes></node>",
id, id, id, argv[2]);
------------------------------
Message: 4
Date: Fri, 23 Jun 2006 02:14:03 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/test
Modified Files:
STONITHDBasicSanityCheck.in
Log Message:
sh != bash ... also compare numbers numerically rather than as strings
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/test/STONITHDBasicSanityCheck.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- STONITHDBasicSanityCheck.in 25 Mar 2005 02:16:09 -0000 1.2
+++ STONITHDBasicSanityCheck.in 23 Jun 2006 08:14:02 -0000 1.3
@@ -38,23 +38,23 @@
# Add stonith resource.
$LRMADMIN -A s1 stonith null NULL hostlist=$MYSELF
- [ $? == 0 ] || let ERR_COUNT++
+ [ $? -eq 0 ] || let ERR_COUNT++
# Start stonith resource, equal to initializing the stonith device.
$LRMADMIN -E s1 start 0 0 0
- [ $? == 0 ] || let ERR_COUNT++
+ [ $? -eq 0 ] || let ERR_COUNT++
# Test stonith operation: query
$APITEST $QUERY $MYSELF $TIMEOUT 0
- [ $? == 0 ] || let ERR_COUNT++
+ [ $? -eq 0 ] || let ERR_COUNT++
# Test stonith operation: reset
$APITEST $RESET $MYSELF $TIMEOUT 0
- [ $? == 0 ] || let ERR_COUNT++
+ [ $? -eq 0 ] || let ERR_COUNT++
# Test stonithd's error handling - to stonith an unaccessible host
$APITEST $POWEROFF notexist $TIMEOUT 2
- [ $? == 0 ] || let ERR_COUNT++
+ [ $? -eq 0 ] || let ERR_COUNT++
}
@@ -91,7 +91,7 @@
$STONITHD -at
sleep 1
$STONITHD -s
- if [ $? != 0 ]; then
+ if [ $? -ne 0 ]; then
echo Can not start stonithd
exit 1
fi
@@ -106,7 +106,7 @@
sleep 1
#check is the new instance running
$LRMD -s
- if [ $? != 0 ]; then
+ if [ $? -ne 0 ]; then
echo Can not start lrmd
exit 1
fi
@@ -124,7 +124,7 @@
run_test
clean_work
-if [ $ERR_COUNT == 0 ]; then
+if [ $ERR_COUNT -eq 0 ]; then
echo "All tests for stonithd are ok."
else
echo "There are $ERR_COUNT errors when testing stonthd."
------------------------------
_______________________________________________
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 87
********************************************
