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: heartbeat by msoffen from
([email protected])
3. Linux-HA CVS: port by msoffen from
([email protected])
4. Linux-HA CVS: linux-ha by msoffen from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 24 May 2006 10:38:25 -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 stages.c
Log Message:
Fix for non-fatal assert
- target role specified Started but there was no node left to run on
- fix was to always overwrite next_role with Stopped if there is no
node left to run on
- cleaned up the assert in the process
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- native.c 24 May 2006 16:07:24 -0000 1.139
+++ native.c 24 May 2006 16:38:24 -0000 1.140
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.139 2006/05/24 16:07:24 andrew Exp $ */
+/* $Id: native.c,v 1.140 2006/05/24 16:38:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1721,8 +1721,12 @@
/* start / promote */
if(rsc->next_role != RSC_ROLE_STOPPED) {
- CRM_CHECK(next_node != NULL, return);
- if(task == start_rsc || task == action_promote) {
+ CRM_CHECK(next_node != NULL,;);
+
+ if(next_node == NULL) {
+ pe_proc_err("next role: %s", role2text(rsc->next_role));
+
+ } else if(task == start_rsc || task == action_promote) {
if(task != start_rsc || registered == FALSE) {
pe_pre_notify(rsc, next_node, op, n_data,
data_set);
}
@@ -1732,7 +1736,6 @@
crm_free(op_key);
pe_free_shallow_adv(possible_matches, FALSE);
-
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- stages.c 23 May 2006 07:48:15 -0000 1.96
+++ stages.c 24 May 2006 16:38:24 -0000 1.97
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.96 2006/05/23 07:48:15 andrew Exp $ */
+/* $Id: stages.c,v 1.97 2006/05/24 16:38:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -251,10 +251,10 @@
" now that color %d is allocated",
rsc->id, color->details->id);
- if(rsc->next_role != RSC_ROLE_UNKNOWN) {
- } else if(chosen == NULL) {
+ if(chosen == NULL) {
rsc->next_role = RSC_ROLE_STOPPED;
- } else {
+
+ } else if(rsc->next_role == RSC_ROLE_UNKNOWN) {
rsc->next_role = RSC_ROLE_STARTED;
}
------------------------------
Message: 2
Date: Wed, 24 May 2006 11:03:02 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
.cvsignore
Log Message:
Added ha_propigate to cvsignore.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- .cvsignore 14 Feb 2006 15:36:00 -0000 1.11
+++ .cvsignore 24 May 2006 17:03:01 -0000 1.12
@@ -15,3 +15,4 @@
MISC_ERRORS
hb_addnode
hb_delnode
+ha_propagate
------------------------------
Message: 3
Date: Wed, 24 May 2006 11:03:32 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: port by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : port
Dir : linux-ha/port
Modified Files:
.cvsignore
Log Message:
Added heartbeat.tar.gz to cvsignore.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/port/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- .cvsignore 27 Mar 2006 05:45:29 -0000 1.2
+++ .cvsignore 24 May 2006 17:03:32 -0000 1.3
@@ -1,3 +1,4 @@
Makefile
Makefile.in
portMakefile
+heartbeat.tar.gz
------------------------------
Message: 4
Date: Wed, 24 May 2006 11:04:36 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
ConfigureMe
Log Message:
Using group/id 90 for CCM otherwise things fail on BSD.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ConfigureMe 17 May 2006 08:34:55 -0000 1.53
+++ ConfigureMe 24 May 2006 17:04:36 -0000 1.54
@@ -103,22 +103,22 @@
}
ConfigureFreeBSD() {
- FLAGS="--prefix=/usr/local --sysconfdir=/usr/local/etc --localstatedir=/var"
+ FLAGS="--prefix=/usr/local --sysconfdir=/usr/local/etc --localstatedir=/var
--enable-all --with-group-id=90 --with-ccmuser-id=90 "
CFENV="FreeBSD"
}
ConfigureOpenBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var --with-group-id=90 --with-ccmuser-id=90"
CFENV="OpenBSD"
}
ConfigureNetBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var --with-group-id=90 --with-ccmuser-id=90"
CFENV="NetBSD"
}
ConfigureGenericBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var --with-group-id=90 --with-ccmuser-id=90"
CFENV="Generic BSD"
}
------------------------------
_______________________________________________
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 77
********************************************
