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: resources 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: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 2 Jun 2006 00:33:17 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
LVM.in
Log Message:
Small logging patch from Dejan
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LVM.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- LVM.in 10 Mar 2006 04:14:20 -0000 1.12
+++ LVM.in 2 Jun 2006 06:33:16 -0000 1.13
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LVM.in,v 1.12 2006/03/10 04:14:20 xunsun Exp $
+# $Id: LVM.in,v 1.13 2006/06/02 06:33:16 andrew Exp $
#
# LVM
#
@@ -48,7 +48,7 @@
The 'validate-all' operation checks whether the OCF parameters are valid
The 'methods' operation reports on the methods $0 supports
- $Id: LVM.in,v 1.12 2006/03/10 04:14:20 xunsun Exp $
+ $Id: LVM.in,v 1.13 2006/06/02 06:33:16 andrew Exp $
!
exit $OCF_ERR_GENERIC
@@ -170,7 +170,7 @@
then
: OK
else
- ocf_log err "LVM Volume $1 is offline"
+ ocf_log info "LVM Volume $1 is offline"
return $OCF_NOT_RUNNING
fi
------------------------------
Message: 2
Date: Fri, 2 Jun 2006 03:58:12 -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:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- unpack.c 1 Jun 2006 15:40:46 -0000 1.200
+++ unpack.c 2 Jun 2006 09:58:12 -0000 1.201
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.200 2006/06/01 15:40:46 andrew Exp $ */
+/* $Id: unpack.c,v 1.201 2006/06/02 09:58:12 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1052,10 +1052,12 @@
if(value != NULL && safe_str_neq("default", value)) {
enum rsc_role_e req_role = text2role(value);
if(req_role != RSC_ROLE_UNKNOWN && req_role != rsc->next_role){
- crm_debug("%s: Overwriting calculated next role %s"
- " with requested next role %s",
- rsc->id, role2text(rsc->next_role),
- role2text(req_role));
+ if(rsc->next_role != RSC_ROLE_UNKNOWN) {
+ crm_debug("%s: Overwriting calculated next role
%s"
+ " with requested next role %s",
+ rsc->id, role2text(rsc->next_role),
+ role2text(req_role));
+ }
rsc->next_role = req_role;
}
}
------------------------------
Message: 3
Date: Fri, 2 Jun 2006 03:58:30 -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:
native.c
Log Message:
More logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- native.c 1 Jun 2006 10:38:39 -0000 1.146
+++ native.c 2 Jun 2006 09:58:30 -0000 1.147
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.146 2006/06/01 10:38:39 andrew Exp $ */
+/* $Id: native.c,v 1.147 2006/06/02 09:58:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2088,12 +2088,14 @@
CRM_CHECK(node != NULL, return FALSE);
if(rsc->orphan) {
+ crm_debug_2("Skipping orphan: %s", rsc->id);
return FALSE;
}
running = pe_find_node_id(rsc->known_on, node->details->id);
if(force == FALSE && running != NULL) {
/* we already know the status of the resource on this node */
+ crm_debug_3("Skipping active: %s", rsc->id);
return FALSE;
}
------------------------------
Message: 4
Date: Fri, 2 Jun 2006 04:00:44 -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:
incarnation.c regression.sh
Log Message:
Novell #180699: Probe annoymous clones correctly
Add a regression case
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- incarnation.c 1 Jun 2006 14:45:55 -0000 1.95
+++ incarnation.c 2 Jun 2006 10:00:43 -0000 1.96
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.95 2006/06/01 14:45:55 andrew Exp $ */
+/* $Id: incarnation.c,v 1.96 2006/06/02 10:00:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -149,6 +149,10 @@
clone_data->ordered = TRUE;
}
+ crm_debug_2("Options for %s", rsc->id);
+ crm_debug_2("\tClone max: %d", clone_data->clone_max);
+ crm_debug_2("\tClone node max: %d", clone_data->clone_node_max);
+
clone_data->xml_obj_child = find_xml_node(
xml_obj, XML_CIB_TAG_GROUP, FALSE);
@@ -1420,24 +1424,31 @@
clone_data->child_list = g_list_sort(
clone_data->child_list, sort_rsc_id);
+ if(rsc->globally_unique == FALSE && clone_data->clone_node_max == 1) {
+ /* only look for one copy */
+ slist_iter(
+ child_rsc, resource_t, clone_data->child_list, lpc,
+
+ if(pe_find_node_id(child_rsc->running_on,
node->details->id)) {
+ return child_rsc->fns->create_probe(
+ child_rsc, node, complete, force,
data_set);
+ }
+ );
+ }
slist_iter(
child_rsc, resource_t, clone_data->child_list, lpc,
- if(rsc->globally_unique == FALSE
- && clone_data->clone_node_max == 1) {
- /* only look for one copy */
- if(pe_find_node_id(child_rsc->known_on,
node->details->id) == NULL) {
- if(child_rsc->fns->create_probe(
- child_rsc, node, complete, force,
data_set)) {
- any_created = TRUE;
- }
- }
- break;
-
- } else if(child_rsc->fns->create_probe(
+ if(child_rsc->fns->create_probe(
child_rsc, node, complete, force, data_set)) {
any_created = TRUE;
}
+
+ if(any_created
+ && rsc->globally_unique == FALSE
+ && clone_data->clone_node_max == 1) {
+ /* only look for one copy (clone :0) */
+ break;
+ }
);
return any_created;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- regression.sh 1 Jun 2006 16:41:23 -0000 1.80
+++ regression.sh 2 Jun 2006 10:00:43 -0000 1.81
@@ -52,6 +52,7 @@
do_test orphan-0 "Orphan ignore"
do_test orphan-1 "Orphan stop"
+do_test probe-0 "Probe (anon clone)"
do_test target-0 "Target Role : baseline"
do_test target-1 "Target Role : test"
------------------------------
_______________________________________________
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 8
*******************************************
