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 davidlee from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: linux-ha by davidlee from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 26 May 2006 02:46:08 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
utils.c
Log Message:
Declarations should precede code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- utils.c 22 May 2006 08:31:53 -0000 1.52
+++ utils.c 26 May 2006 08:46:07 -0000 1.53
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.52 2006/05/22 08:31:53 andrew Exp $ */
+/* $Id: utils.c,v 1.53 2006/05/26 08:46:07 davidlee Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1121,6 +1121,7 @@
XML_LRM_ATTR_OP_DIGEST,
};
+ gboolean do_delete = FALSE;
int lpc = 0;
static int meta_len = 0;
if(meta_len == 0) {
@@ -1144,7 +1145,6 @@
}
xml_prop_iter(param_set, prop_name, prop_value,
- gboolean do_delete = FALSE;
if(strncasecmp(prop_name, CRM_META, meta_len) == 0) {
do_delete = TRUE;
}
------------------------------
Message: 2
Date: Fri, 26 May 2006 04:05:56 -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:
stages.c
Log Message:
Forced probes can cause an infinite loop... disable until we figure out a
way around it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- stages.c 24 May 2006 16:38:24 -0000 1.97
+++ stages.c 26 May 2006 10:05:56 -0000 1.98
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.97 2006/05/24 16:38:24 andrew Exp $ */
+/* $Id: stages.c,v 1.98 2006/05/26 10:05:56 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -185,10 +185,12 @@
probe_complete->optional = TRUE;
}
+ /*
if(probed != NULL && crm_is_true(probed) == FALSE) {
force_probe = TRUE;
}
-
+ */
+
probe_node_complete = custom_action(
NULL, crm_strdup(CRM_OP_PROBED),
CRM_OP_PROBED, node, FALSE, TRUE, data_set);
------------------------------
Message: 3
Date: Fri, 26 May 2006 05:08:43 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
bootstrap
Log Message:
The 'which -s' flag is non-portable. And our '/dev/null' redirection means we
don't need it anyway.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/bootstrap,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- bootstrap 25 May 2006 20:18:14 -0000 1.28
+++ bootstrap 26 May 2006 11:08:43 -0000 1.29
@@ -25,16 +25,12 @@
testProgram()
{
cmd=$1
- WHICH_OPTS="-s"
if [ -z "$cmd" ]; then
return 1;
fi
arch=`uname -s`
- if [ "$arch" = "Darwin" ]; then
- WHICH_OPTS=""
- fi
# Make sure the which is in an if-block... on some platforms it throws
exceptions
#
@@ -42,7 +38,7 @@
# of an until or while loop, part of an if statement, part of a &&
# or || list.
if
- which $WHICH_OPTS $cmd </dev/null >/dev/null 2>&1
+ which $cmd </dev/null >/dev/null 2>&1
then
:
else
------------------------------
Message: 4
Date: Fri, 26 May 2006 08:53:59 -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:
stages.c native.c
Log Message:
All probes has a priority of INFINITY and will all run even if the
transition is cancelled (eg. by one or more probes "failing").
This will make sure that the "node needs to be probed" variable
will be reset and there will be no infinite loops.
If a resource is active on a node, then our calculations were done
based on it running there... so the probe should expect 0 not 7
Update the tests
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- stages.c 26 May 2006 10:05:56 -0000 1.98
+++ stages.c 26 May 2006 14:53:58 -0000 1.99
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.98 2006/05/26 10:05:56 andrew Exp $ */
+/* $Id: stages.c,v 1.99 2006/05/26 14:53:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -185,16 +185,15 @@
probe_complete->optional = TRUE;
}
- /*
if(probed != NULL && crm_is_true(probed) == FALSE) {
force_probe = TRUE;
}
- */
probe_node_complete = custom_action(
NULL, crm_strdup(CRM_OP_PROBED),
CRM_OP_PROBED, node, FALSE, TRUE, data_set);
probe_node_complete->optional = crm_is_true(probed);
+ probe_node_complete->priority = INFINITY;
add_hash_param(probe_node_complete->meta,
XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- native.c 25 May 2006 11:54:35 -0000 1.142
+++ native.c 26 May 2006 14:53:58 -0000 1.143
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.142 2006/05/25 11:54:35 andrew Exp $ */
+/* $Id: native.c,v 1.143 2006/05/26 14:53:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2098,19 +2098,24 @@
/* we already know the status of the resource on this node */
return FALSE;
}
-
- target_rc = crm_itoa(EXECRA_NOT_RUNNING);
+
key = generate_op_key(rsc->id, CRMD_ACTION_STATUS, 0);
probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node,
FALSE, TRUE, data_set);
+ probe->priority = INFINITY;
+
+ running = pe_find_node_id(rsc->running_on, node->details->id);
+ if(running == NULL) {
+ target_rc = crm_itoa(EXECRA_NOT_RUNNING);
+ add_hash_param(probe->meta, XML_ATTR_TE_TARGET_RC, target_rc);
+ crm_free(target_rc);
+ }
crm_notice("%s: Created probe for %s", node->details->uname, rsc->id);
- add_hash_param(probe->meta, XML_ATTR_TE_TARGET_RC, target_rc);
custom_action_order(rsc, NULL, probe, rsc, NULL, complete,
pe_ordering_manditory, data_set);
- crm_free(target_rc);
return TRUE;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 86
********************************************
