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])
3. Linux-HA CVS: debian by zhenh from
([email protected])
4. Linux-HA CVS: lib by zhenh from ([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 7 Jun 2006 03:01:00 -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:
Logging for unclean nodes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- stages.c 7 Jun 2006 07:34:38 -0000 1.104
+++ stages.c 7 Jun 2006 09:01:00 -0000 1.105
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.104 2006/06/07 07:34:38 andrew Exp $ */
+/* $Id: stages.c,v 1.105 2006/06/07 09:01:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -302,6 +302,7 @@
{
action_t *dc_down = NULL;
action_t *stonith_op = NULL;
+ gboolean integrity_lost = FALSE;
crm_debug_3("Processing fencing and shutdown cases");
@@ -309,6 +310,7 @@
node, node_t, data_set->nodes, lpc,
stonith_op = NULL;
+
if(node->details->unclean && data_set->stonith_enabled
&& (data_set->have_quorum
|| data_set->no_quorum_policy == no_quorum_ignore)) {
@@ -352,19 +354,23 @@
dc_down = down_op;
}
}
-
if(node->details->unclean && stonith_op == NULL) {
- pe_err("Node %s is unclean!", node->details->uname);
- pe_warn("YOUR RESOURCES ARE NOW LIKELY COMPROMISED");
- if(data_set->stonith_enabled == FALSE) {
- pe_warn("ENABLE STONITH TO KEEP YOUR RESOURCES
SAFE");
- } else {
- CRM_CHECK(data_set->have_quorum == FALSE, ;);
- crm_notice("Cannot fence until quorum is
attained (or no_quorum_policy is set to ignore)");
- }
+ integrity_lost = TRUE;
+ pe_warn("Node %s is unclean!", node->details->uname);
}
);
+ if(integrity_lost) {
+ if(data_set->have_quorum == FALSE) {
+ crm_notice("Cannot fence unclean nodes until quorum is"
+ " attained (or no_quorum_policy is set to
ignore)");
+
+ } else if(data_set->stonith_enabled == FALSE) {
+ pe_warn("YOUR RESOURCES ARE NOW LIKELY COMPROMISED");
+ pe_err("ENABLE STONITH TO KEEP YOUR RESOURCES SAFE");
+ }
+ }
+
if(dc_down != NULL) {
GListPtr shutdown_matches = find_actions(
data_set->actions, CRM_OP_SHUTDOWN, NULL);
------------------------------
Message: 2
Date: Wed, 7 Jun 2006 03:01: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
Log Message:
New test case
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- regression.sh 2 Jun 2006 10:00:43 -0000 1.81
+++ regression.sh 7 Jun 2006 09:01:23 -0000 1.82
@@ -140,6 +140,7 @@
do_test rec-node-10 "Node Recover - no quorum - stop w/fence"
do_test rec-node-11 "Node Recover - CRM down w/ group - fence "
do_test rec-node-12 "Node Recover - nothing active - fence "
+do_test rec-node-13 "Node Recover - failed resource + shutdown - fence "
echo ""
do_test multi1 "Multiple Active (stop/start)"
------------------------------
Message: 3
Date: Wed, 7 Jun 2006 03:10:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
heartbeat-2.files
Log Message:
add the quorum plugin based on the weight
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- heartbeat-2.files 29 May 2006 08:55:24 -0000 1.19
+++ heartbeat-2.files 7 Jun 2006 09:10:26 -0000 1.20
@@ -125,6 +125,7 @@
usr/lib/heartbeat/plugins/RAExec/stonith.so
usr/lib/heartbeat/plugins/quorum/majority.so
usr/lib/heartbeat/plugins/quorum/twonodes.so
+usr/lib/heartbeat/plugins/quorum/weight.so
usr/lib/heartbeat/plugins/test/test.so
usr/lib/heartbeat/plugins/tiebreaker/twonodes.so
usr/lib/heartbeat/ptest
------------------------------
Message: 4
Date: Wed, 7 Jun 2006 03:10:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/quorum
Modified Files:
Makefile.am
Added Files:
weight.c
Log Message:
add the quorum plugin based on the weight
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/quorum/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 29 May 2006 08:55:24 -0000 1.3
+++ Makefile.am 7 Jun 2006 09:10:26 -0000 1.4
@@ -33,7 +33,7 @@
halibdir = $(libdir)/@HB_PKG@
plugindir = $(halibdir)/plugins/quorum
-plugin_LTLIBRARIES = majority.la twonodes.la
+plugin_LTLIBRARIES = majority.la twonodes.la weight.la
majority_la_SOURCES = majority.c
majority_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
@@ -42,3 +42,7 @@
twonodes_la_SOURCES = twonodes.c
twonodes_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
twonodes_la_LIBADD = $(top_builddir)/replace/libreplace.la
+
+weight_la_SOURCES = weight.c
+weight_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
+weight_la_LIBADD = $(top_builddir)/replace/libreplace.la
------------------------------
Message: 5
Date: Wed, 7 Jun 2006 04:09: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:
master.c
Log Message:
Handle action re-creation correctly
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- master.c 30 May 2006 07:47:44 -0000 1.20
+++ master.c 7 Jun 2006 10:09:32 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.20 2006/05/30 07:47:44 andrew Exp $ */
+/* $Id: master.c,v 1.21 2006/06/07 10:09:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -326,6 +326,12 @@
case RSC_ROLE_STOPPED:
child_rsc->priority = -INFINITY;
break;
+ case RSC_ROLE_MASTER:
+ /* the only reason we should be here is if
+ * we're re-creating actions after a stonith
+ */
+ promoted++;
+ break;
default:
CRM_CHECK(FALSE/* unhandled */,
crm_err("Unknown resource role: %d
for %s",
@@ -400,6 +406,12 @@
lpc--;
}
break;
+ case RSC_ROLE_MASTER:
+ /* the only reason we should be here is if
+ * we're re-creating actions after a stonith
+ */
+ promoted++;
+ break;
default:
CRM_CHECK(FALSE/* unhandled */,
crm_err("Unknown resource role: %d
for %s",
------------------------------
_______________________________________________
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 18
********************************************
