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: tools by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by lars from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 22 Feb 2006 04:27:01 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
haresources2cib.py.in
Log Message:
Use a separate group id counter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- haresources2cib.py.in 17 Jan 2006 09:57:27 -0000 1.5
+++ haresources2cib.py.in 22 Feb 2006 11:27:00 -0000 1.6
@@ -376,6 +376,7 @@
cib = create_cib()
pre_line = ""
id_index = 1
+ group_index = 1
for line in file.readlines() :
line = string.strip(line)
if len (line) == 0 or line[0] == '#' :
@@ -391,7 +392,8 @@
add_resource(cib, id_index, fields[0], fields[1])
id_index += 1
elif len(fields) > 2 :
- add_resource_group(cib, id_index, fields[0], fields[1:])
+ add_resource_group(cib, group_index, fields[0],
fields[1:])
+ group_index += 1
id_index += len(fields)
else :
print "can not parse this line:"+line
------------------------------
Message: 2
Date: Wed, 22 Feb 2006 06:46:14 -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:
utils.c fsa_matrix.h fsa.c
Log Message:
Increase the prority of cancelling transitions
Add A_TE_HALT to the text conversion function
If we get a I_NODE_JOIN in S_TRANSITION_ENGINE, we need to cancel the
transition. Otherwise we risk loosing resorce action updates.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- utils.c 20 Feb 2006 12:10:41 -0000 1.86
+++ utils.c 22 Feb 2006 13:46:13 -0000 1.87
@@ -678,6 +678,9 @@
case A_TE_STOP:
actionAsText = "A_TE_STOP";
break;
+ case A_TE_HALT:
+ actionAsText = "A_TE_HALT";
+ break;
case A_TE_CANCEL:
actionAsText = "A_TE_CANCEL";
break;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa_matrix.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- fsa_matrix.h 20 Feb 2006 12:10:41 -0000 1.69
+++ fsa_matrix.h 22 Feb 2006 13:46:13 -0000 1.70
@@ -885,7 +885,7 @@
/* Got an I_NODE_JOIN */
{
- /* S_IDLE ==> */ A_TE_CANCEL|A_DC_JOIN_OFFER_ONE,
+ /* S_IDLE ==> */ A_TE_HALT|A_DC_JOIN_OFFER_ONE,
/* S_ELECTION ==> */ A_WARN,
/* S_INTEGRATION ==> */ A_DC_JOIN_OFFER_ONE,
/* S_FINALIZE_JOIN ==> */ A_DC_JOIN_OFFER_ONE,
@@ -897,7 +897,7 @@
/* S_PENDING ==> */ A_WARN,
/* S_STOPPING ==> */ A_WARN,
/* S_TERMINATE ==> */ A_WARN,
- /* S_TRANSITION_ENGINE ==> */ A_DC_JOIN_OFFER_ONE,
+ /* S_TRANSITION_ENGINE ==> */ A_TE_HALT|A_DC_JOIN_OFFER_ONE,
/* S_HALT ==> */ A_WARN,
},
@@ -1155,19 +1155,19 @@
/* Got an I_JOIN_RESULT */
{
- /* S_IDLE ==> */
A_ERROR|A_TE_CANCEL|A_DC_JOIN_OFFER_ALL,
+ /* S_IDLE ==> */
A_ERROR|A_TE_HALT|A_DC_JOIN_OFFER_ALL,
/* S_ELECTION ==> */ A_LOG,
/* S_INTEGRATION ==> */ A_LOG,
/* S_FINALIZE_JOIN ==> */
A_CL_JOIN_RESULT|A_DC_JOIN_PROCESS_ACK,
/* S_NOT_DC ==> */ A_ERROR|A_CL_JOIN_ANNOUNCE,
- /* S_POLICY_ENGINE ==> */
A_ERROR|A_TE_CANCEL|A_DC_JOIN_OFFER_ALL,
+ /* S_POLICY_ENGINE ==> */
A_ERROR|A_TE_HALT|A_DC_JOIN_OFFER_ALL,
/* S_RECOVERY ==> */ A_LOG,
/* S_RELEASE_DC ==> */ A_LOG,
/* S_STARTING ==> */ A_ERROR,
/* S_PENDING ==> */ A_CL_JOIN_RESULT,
/* S_STOPPING ==> */ A_ERROR,
/* S_TERMINATE ==> */ A_ERROR,
- /* S_TRANSITION_ENGINE ==> */
A_ERROR|A_TE_CANCEL|A_DC_JOIN_OFFER_ALL,
+ /* S_TRANSITION_ENGINE ==> */
A_ERROR|A_TE_HALT|A_DC_JOIN_OFFER_ALL,
/* S_HALT ==> */ A_WARN,
},
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- fsa.c 20 Feb 2006 12:10:41 -0000 1.139
+++ fsa.c 22 Feb 2006 13:46:13 -0000 1.140
@@ -482,6 +482,10 @@
do_fsa_action(fsa_data, A_ELECTION_CHECK,
do_election_check);
} else if(is_set(fsa_actions, A_ELECTION_START)) {
do_fsa_action(fsa_data, A_ELECTION_START,
do_election_vote);
+ } else if(is_set(fsa_actions, A_TE_HALT)) {
+ do_fsa_action(fsa_data, A_TE_HALT,
do_te_invoke);
+ } else if(is_set(fsa_actions, A_TE_CANCEL)) {
+ do_fsa_action(fsa_data, A_TE_CANCEL,
do_te_invoke);
} else if(is_set(fsa_actions, A_DC_JOIN_OFFER_ALL)) {
do_fsa_action(fsa_data, A_DC_JOIN_OFFER_ALL,
do_dc_join_offer_all);
} else if(is_set(fsa_actions, A_DC_JOIN_OFFER_ONE)) {
@@ -506,10 +510,6 @@
do_fsa_action(fsa_data, A_LRM_INVOKE,
do_lrm_invoke);
} else if(is_set(fsa_actions, A_LRM_EVENT)) {
do_fsa_action(fsa_data, A_LRM_EVENT,
do_lrm_event);
- } else if(is_set(fsa_actions, A_TE_HALT)) {
- do_fsa_action(fsa_data, A_TE_HALT,
do_te_invoke);
- } else if(is_set(fsa_actions, A_TE_CANCEL)) {
- do_fsa_action(fsa_data, A_TE_CANCEL,
do_te_invoke);
} else if(is_set(fsa_actions, A_PE_INVOKE)) {
do_fsa_action(fsa_data, A_PE_INVOKE,
do_pe_invoke);
} else if(is_set(fsa_actions, A_TE_INVOKE)) {
------------------------------
Message: 3
Date: Wed, 22 Feb 2006 06:46:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_resource.c
Log Message:
Tyop
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- crm_resource.c 3 Feb 2006 08:29:21 -0000 1.12
+++ crm_resource.c 22 Feb 2006 13:46:23 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.12 2006/02/03 08:29:21 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.13 2006/02/22 13:46:23 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -778,7 +778,7 @@
fprintf(stream, "\t--%s (-%c)\t: Locate a resource\n"
"\t\t\t Requires: -r\n", "locate", 'W');
fprintf(stream, "\t--%s (-%c)\t: Migrate a resource from it current"
- " locaiton. Use -H to specify a destination\n"
+ " location. Use -H to specify a destination\n"
"\t\t\t Requires: -r, Optional: -H\n", "migrate", 'M');
fprintf(stream, "\t--%s (-%c)\t: Remove all constraints created by -M\n"
"\t\t\t Requires: -r\n", "un-migrate", 'U');
------------------------------
Message: 4
Date: Wed, 22 Feb 2006 06:47:09 -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:
Remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- join_dc.c 20 Feb 2006 12:48:54 -0000 1.81
+++ join_dc.c 22 Feb 2006 13:47:08 -0000 1.82
@@ -300,8 +300,6 @@
}
-#define JOIN_AFTER_SYNC 1
-
/* A_DC_JOIN_FINALIZE */
enum crmd_fsa_input
do_dc_join_finalize(long long action,
@@ -315,15 +313,8 @@
/* This we can do straight away and avoid clients timing us out
* while we compute the latest CIB
*/
-#if JOIN_AFTER_SYNC
crm_debug("Finializing join-%d for %d clients",
current_join_id, g_hash_table_size(integrated_nodes));
-#else
- crm_debug("Notifying %d clients of join-%d results",
- g_hash_table_size(integrated_nodes), current_join_id);
- g_hash_table_foreach_remove(
- integrated_nodes, finalize_join_for, NULL);
-#endif
clear_bit_inplace(fsa_input_register, R_HAVE_CIB);
if(max_generation_from == NULL
|| safe_str_eq(max_generation_from, fsa_our_uname)){
@@ -405,19 +396,13 @@
fsa_cib_conn->cmds->bump_epoch(
fsa_cib_conn, cib_scope_local|cib_quorum_override);
-#if JOIN_AFTER_SYNC
/* make sure dc_uuid is re-set to us */
-
if(check_join_state(fsa_state, caller) == FALSE) {
crm_debug("Notifying %d clients of join-%d results",
g_hash_table_size(integrated_nodes), current_join_id);
g_hash_table_foreach_remove(
integrated_nodes, finalize_join_for, NULL);
}
-#else
- check_join_state(cur_state, caller);
- rc = fsa_cib_conn->cmds->sync(fsa_cib_conn, NULL, cib_quorum_override);
-#endif
}
static void
------------------------------
_______________________________________________
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 91
********************************************
