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: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 22 Feb 2006 12:20:25 -0700 (MST)
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/admin
Modified Files:
crm_resource.c
Log Message:
Make the implications of what the admin is doing REALLY obvious
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- crm_resource.c 22 Feb 2006 14:44:25 -0000 1.14
+++ crm_resource.c 22 Feb 2006 19:20:25 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.14 2006/02/22 14:44:25 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.15 2006/02/22 19:20:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -359,6 +359,20 @@
}
} else {
+ if(do_force == FALSE) {
+ fprintf(stderr,
+ "WARNING: Creating rsc_location constraint '%s'"
+ " with a score of -INFINITY for resource %s"
+ " on %s.\n",
+ ID(dont_run), rsc_id, existing_node);
+ fprintf(stderr, "\tThis will prevent %s from running"
+ " on %s until the constraint is removed using"
+ " the 'crm_resource -U' command or manually"
+ " with cibadmin\n", rsc_id, existing_node);
+ fprintf(stderr, "\tThis will be the case even if %s is"
+ " the last node in the cluster", existing_node);
+ }
+
crm_xml_add(dont_run, "rsc", rsc_id);
rule = create_xml_node(dont_run, XML_TAG_RULE);
expr = create_xml_node(rule, XML_TAG_EXPRESSION);
------------------------------
Message: 2
Date: Thu, 23 Feb 2006 02:36:02 -0700 (MST)
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/crmd
Modified Files:
tengine.c join_dc.c
Log Message:
A_TE_HALT was being filtered incorrectly
- which means transitions could still be active during the join process
- which means resource actions could be overwritten (lost) during the join
- which means resources could be active more than once
- which is the bug I tried to *remove* yesterday
We can detect this with the R_IN_TRANSITION register flag
- Complain loudy if it's set during a join (so we're sure its fixed)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/tengine.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- tengine.c 3 Feb 2006 15:01:39 -0000 1.26
+++ tengine.c 23 Feb 2006 09:36:01 -0000 1.27
@@ -106,7 +106,7 @@
fsa_action2string(action));
return I_NULL;
- } else if(fsa_state != S_TRANSITION_ENGINE && action ^ A_TE_CANCEL) {
+ } else if(fsa_state != S_TRANSITION_ENGINE && (action & A_TE_INVOKE)) {
crm_debug("No need to invoke the TE (%s) in state %s",
fsa_action2string(action),
fsa_state2string(fsa_state));
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- join_dc.c 22 Feb 2006 13:47:08 -0000 1.82
+++ join_dc.c 23 Feb 2006 09:36:01 -0000 1.83
@@ -382,6 +382,11 @@
set_bit_inplace(fsa_input_register, R_HAVE_CIB);
clear_bit_inplace(fsa_input_register, R_CIB_ASKED);
+ if(is_set(fsa_input_register, R_IN_TRANSITION)) {
+ crm_err("join-%d: We are still in a transition!",
current_join_id);
+ crm_err("join-%d: Resource actions may be overwritten with join
data", current_join_id);
+ }
+
set_uuid(fsa_cluster_conn, cib, XML_ATTR_DC_UUID, fsa_our_uname);
crm_debug_3("Update %s in the CIB to our uuid: %s",
XML_ATTR_DC_UUID, crm_element_value(cib, XML_ATTR_DC_UUID));
------------------------------
Message: 3
Date: Thu, 23 Feb 2006 03:31:01 -0700 (MST)
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/crmd
Modified Files:
join_dc.c
Log Message:
Dont just detect it, wait for the TE to finish what it was doing before
continuing.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- join_dc.c 23 Feb 2006 09:36:01 -0000 1.83
+++ join_dc.c 23 Feb 2006 10:31:00 -0000 1.84
@@ -320,6 +320,12 @@
|| safe_str_eq(max_generation_from, fsa_our_uname)){
set_bit_inplace(fsa_input_register, R_HAVE_CIB);
}
+
+ if(is_set(fsa_input_register, R_IN_TRANSITION)) {
+ crm_warn("join-%d: We are still in a transition."
+ "Delaying until the TE completes.", current_join_id);
+ crmd_fsa_stall(NULL);
+ }
if(is_set(fsa_input_register, R_HAVE_CIB) == FALSE) {
/* ask for the agreed best CIB */
@@ -382,11 +388,6 @@
set_bit_inplace(fsa_input_register, R_HAVE_CIB);
clear_bit_inplace(fsa_input_register, R_CIB_ASKED);
- if(is_set(fsa_input_register, R_IN_TRANSITION)) {
- crm_err("join-%d: We are still in a transition!",
current_join_id);
- crm_err("join-%d: Resource actions may be overwritten with join
data", current_join_id);
- }
-
set_uuid(fsa_cluster_conn, cib, XML_ATTR_DC_UUID, fsa_our_uname);
crm_debug_3("Update %s in the CIB to our uuid: %s",
XML_ATTR_DC_UUID, crm_element_value(cib, XML_ATTR_DC_UUID));
------------------------------
Message: 4
Date: Thu, 23 Feb 2006 04:16:05 -0700 (MST)
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/crmd
Modified Files:
join_dc.c
Log Message:
Stall the FSA *and* exit the function, no point stalling it if we keep going.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- join_dc.c 23 Feb 2006 10:31:00 -0000 1.84
+++ join_dc.c 23 Feb 2006 11:16:05 -0000 1.85
@@ -323,8 +323,9 @@
if(is_set(fsa_input_register, R_IN_TRANSITION)) {
crm_warn("join-%d: We are still in a transition."
- "Delaying until the TE completes.", current_join_id);
+ " Delaying until the TE completes.", current_join_id);
crmd_fsa_stall(NULL);
+ return I_NULL;
}
if(is_set(fsa_input_register, R_HAVE_CIB) == FALSE) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 93
********************************************
