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: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: linux-ha by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 09:11:01 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Logging conditions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- xml.c 9 Apr 2006 14:51:02 -0000 1.72
+++ xml.c 9 Apr 2006 15:11:00 -0000 1.73
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.72 2006/04/09 14:51:02 andrew Exp $ */
+/* $Id: xml.c,v 1.73 2006/04/09 15:11:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2335,13 +2335,14 @@
if(modified == FALSE) {
/* nothing to report */
- } else if(safe_str_neq(tag_id, old_id)) {
+ } else if(old_id != NULL && safe_str_neq(tag_id, old_id)) {
crm_err("\"id\" collision detected... Multiple '%s' entries"
" with id=\"%s\", assigned id=\"%s\"",
tag_name, old_id, tag_id);
- } else if(old_id == NULL &&& tag_id != NULL) {
- crm_err("Detected <%s.../> object without an ID", tag_name);
+ } else if(old_id == NULL && tag_id != NULL) {
+ crm_err("Detected <%s.../> object without an ID. Assigned: %s",
+ tag_name, tag_id);
}
crm_free(old_id);
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 09:12:54 -0600 (MDT)
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/test
Modified Files:
helper.sh.in
Log Message:
Include an expression for the rule
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/helper.sh.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- helper.sh.in 7 Apr 2006 14:10:16 -0000 1.77
+++ helper.sh.in 9 Apr 2006 15:12:54 -0000 1.78
@@ -428,9 +428,8 @@
rsc=$2
result=$3
uuid1=`uuidgen`
- uuid2=`uuidgen`
- node_xml="<rsc_location id=\\\"${uuid1}\\\" rsc=\\\"${rsc}\\\"><rule
id=\\\"${uuid2}\\\" score=\\\"${result}\\\"/></rsc_location>"
+ node_xml="<rsc_location id=\\\"${uuid1}\\\" rsc=\\\"${rsc}\\\"><rule
id=\\\"${uuid1}\\\" score=\\\"${result}\\\"><expression id=\\\"${uuid1}\\\"
attribute=\\\"#uname\\\" operation=\\\"eq\\\"
value=\\\"${host}\\\"/></rule></rsc_location>"
make_constraint_adv $host "$node_xml"
}
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 09:13:23 -0600 (MDT)
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
Modified Files:
crm-1.0.dtd
Log Message:
We can be stricter here - BSC doesn't require it anymore
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- crm-1.0.dtd 9 Apr 2006 14:53:45 -0000 1.55
+++ crm-1.0.dtd 9 Apr 2006 15:13:23 -0000 1.56
@@ -169,7 +169,7 @@
<!ELEMENT lifetime (rule+)>
<!-- Annotated version -->
-<!ELEMENT rule (expression|time_expression|rule)*>
+<!ELEMENT rule (expression|time_expression|rule)+>
<!ATTLIST rule
id CDATA #REQUIRED
role CDATA #IMPLIED
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 09:14:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Add a bunch of CLIs to the .spec
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- heartbeat.spec.in 3 Apr 2006 09:51:56 -0000 1.166
+++ heartbeat.spec.in 9 Apr 2006 15:14:34 -0000 1.167
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.166 2006/04/03 09:51:56 andrew Exp $
+# $Id: heartbeat.spec.in,v 1.167 2006/04/09 15:14:34 andrew Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1167,6 +1167,9 @@
@sbindir@/crm_attribute
@sbindir@/crm_resource
@sbindir@/crm_verify
[EMAIL PROTECTED]@/attrd_updater
[EMAIL PROTECTED]@/crm_failcount
[EMAIL PROTECTED]@/crm_primitive.py
%dir %attr (755, @HA_CCMUSER@, @HA_APIGROUP@) @HA_VARRUNDIR@/@HB_PKG@/ccm
%dir %attr (750, @HA_CCMUSER@, @HA_APIGROUP@) @HA_VARRUNDIR@/@HB_PKG@/crm
%dir %attr (750, @HA_CCMUSER@, @HA_APIGROUP@) @localstatedir@/lib/@HB_PKG@/crm
------------------------------
Message: 5
Date: Sun, 9 Apr 2006 09:34:13 -0600 (MDT)
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/pengine
Modified Files:
unpack.c
Log Message:
Correctly identify "failed" monitors only
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- unpack.c 5 Apr 2006 07:37:36 -0000 1.181
+++ unpack.c 9 Apr 2006 15:34:13 -0000 1.182
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.181 2006/04/05 07:37:36 andrew Exp $ */
+/* $Id: unpack.c,v 1.182 2006/04/09 15:34:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1412,8 +1412,7 @@
task_status_i = LRM_OP_ERROR;
} else if(EXECRA_OK == actual_rc_i
- && is_probe == FALSE
- && is_stop_action == FALSE
+ && interval > 0
&& rsc->role == RSC_ROLE_MASTER) {
/* catch status ops that return 0 instead of 8 while they
* are supposed to be in master mode
------------------------------
_______________________________________________
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 47
********************************************
