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: Thu, 1 Jun 2006 10:41:24 -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.sh stages.c utils.c
Log Message:
Fix node standby and add a regression test case for it
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- regression.sh 23 May 2006 07:41:25 -0000 1.79
+++ regression.sh 1 Jun 2006 16:41:23 -0000 1.80
@@ -44,6 +44,7 @@
echo ""
do_test date-1 "Dates"
+do_test standby "Standby"
do_test comments "Comments"
do_test params-0 "Params: No change"
do_test params-1 "Params: Changed"
@@ -54,6 +55,7 @@
do_test target-0 "Target Role : baseline"
do_test target-1 "Target Role : test"
+
echo ""
do_test master-0 "Stopped -> Slave"
do_test master-1 "Stopped -> Promote"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- stages.c 30 May 2006 09:24:03 -0000 1.102
+++ stages.c 1 Jun 2006 16:41:23 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.102 2006/05/30 09:24:03 andrew Exp $ */
+/* $Id: stages.c,v 1.103 2006/06/01 16:41:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -526,7 +526,9 @@
}
return FALSE;
- } else if(chosen->details->unclean || chosen->details->shutdown) {
+ } else if(chosen->details->unclean
+ || chosen->details->standby
+ || chosen->details->shutdown) {
crm_debug("All nodes for color %d are unavailable"
", unclean or shutting down", color->id);
color->details->chosen_node = NULL;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- utils.c 1 Jun 2006 15:40:46 -0000 1.142
+++ utils.c 1 Jun 2006 16:41:23 -0000 1.143
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.142 2006/06/01 15:40:46 andrew Exp $ */
+/* $Id: utils.c,v 1.143 2006/06/01 16:41:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -618,10 +618,14 @@
node1_weight = node1->weight;
node2_weight = node2->weight;
- if(node1->details->unclean || node1->details->shutdown) {
+ if(node1->details->unclean
+ || node1->details->standby
+ || node1->details->shutdown) {
node1_weight = -INFINITY;
}
- if(node2->details->unclean || node2->details->shutdown) {
+ if(node2->details->unclean
+ || node2->details->standby
+ || node2->details->shutdown) {
node2_weight = -INFINITY;
}
------------------------------
Message: 2
Date: Thu, 1 Jun 2006 10:41:24 -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/testcases
Added Files:
standby.dot standby.exp standby.xml
Log Message:
Fix node standby and add a regression test case for it
------------------------------
_______________________________________________
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 7
*******************************************
