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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 22 Apr 2006 11:42:40 -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:
regression.core.sh
Log Message:
diff options
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.core.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- regression.core.sh 31 Mar 2006 12:00:59 -0000 1.17
+++ regression.core.sh 22 Apr 2006 17:42:39 -0000 1.18
@@ -19,7 +19,7 @@
verbose=$1
io_dir=testcases
-diff_opts="--ignore-all-space -U 1 -u"
+diff_opts="--ignore-all-space -u"
failed=.regression.failed.diff
# zero out the error log
> $failed
@@ -85,7 +85,7 @@
rc=2
dot -Tpng $dot_output 2>/dev/null > $dot_png
if [ -f $dot_expected ]; then
- diff $diff_opts -q $dot_expected $dot_output >/dev/null
+ diff $diff_opts $dot_expected $dot_output >/dev/null
rc=$?
if [ $rc != 0 ]; then
echo "Test $name ($base)... * Failed (PE : dot)";
@@ -103,7 +103,7 @@
rc2=2
if [ -f $expected ]; then
- diff $diff_opts -q $expected $output >/dev/null
+ diff $diff_opts $expected $output >/dev/null
rc2=$?
if [ $rc2 != 0 ]; then
echo "Test $name ($base)... * Failed (PE : raw)";
------------------------------
Message: 2
Date: Sat, 22 Apr 2006 11:47:32 -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:
Probes dont always happen first, we may be reprobing
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -3 -r1.187 -r1.188
--- unpack.c 22 Apr 2006 17:35:44 -0000 1.187
+++ unpack.c 22 Apr 2006 17:47:31 -0000 1.188
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.187 2006/04/22 17:35:44 andrew Exp $ */
+/* $Id: unpack.c,v 1.188 2006/04/22 17:47:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -977,9 +977,19 @@
if(safe_str_eq(task, CRMD_ACTION_STOP)
&& safe_str_eq(status, "0")) {
stop_index = lpc;
+
} else if(safe_str_eq(task, CRMD_ACTION_START)) {
start_index = lpc;
+
+ } else if(start_index <= stop_index
+ && safe_str_eq(task, CRMD_ACTION_STATUS)) {
+ const char *rc = crm_element_value(rsc_op,
XML_LRM_ATTR_RC);
+ if(safe_str_eq(rc, "0")
+ || safe_str_eq(rc, "8")) {
+ start_index = lpc;
+ }
}
+
unpack_rsc_op(rsc, node, rsc_op,
&max_call_id, &on_fail, data_set);
);
@@ -1002,7 +1012,7 @@
interval = get_interval(rsc_op);
if(safe_str_eq(interval, "0")) {
- crm_debug_3("Skipping %s/%s: non-recurring",
+ crm_debug_4("Skipping %s/%s: non-recurring",
id, node->details->uname);
continue;
}
------------------------------
_______________________________________________
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 118
*********************************************
