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: cts 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])
----------------------------------------------------------------------
Message: 1
Date: Mon, 16 Jan 2006 02:16:33 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
Three new ha.cf options:
- record_config_changes (on/off)
on: the current implementation logs config changes at the value of "debug"
off: the current implementation logs config changes at the value of "debug" + 1
- record_pengine_inputs (on/off)
on: the current implementation logs config changes at the value of "debug"
off: the current implementation logs config changes at the value of "debug" + 1
- enable_config_writes (on/off)
on: write (CIB) config changes to disk
off: do NOT write (CIB) config changes to disk
Remove the old enable_config_writes option from the CIB, it was broken and
required linking against the pengine library to fix as correct interpretation
required understanding the CIB's contents.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- CM_LinuxHAv2.py.in 13 Jan 2006 19:23:28 -0000 1.126
+++ CM_LinuxHAv2.py.in 16 Jan 2006 09:16:32 -0000 1.127
@@ -121,11 +121,10 @@
cib_options="""
<nvpair id="c-pref-1" name="transition_idle_timeout" value="3m"/>
<nvpair id="c-pref-2" name="symetric_cluster" value="true"/>
- <nvpair id="c-pref-3" name="suppress_cib_writes" value="%d"/>
- <nvpair id="c-pref-4" name="short_resource_names" value="true"/>
- <nvpair id="c-pref-5" name="stop_orphan_resources" value="false"/>
- <nvpair id="c-pref-6" name="stop_orphan_actions" value="false"/>
- <nvpair id="c-pref-7" name="remove_after_stop" value="false"/>
+ <nvpair id="c-pref-3" name="short_resource_names" value="true"/>
+ <nvpair id="c-pref-4" name="stop_orphan_resources" value="false"/>
+ <nvpair id="c-pref-5" name="stop_orphan_actions" value="false"/>
+ <nvpair id="c-pref-6" name="remove_after_stop" value="false"/>
<nvpair id="c-pref-7" name="is_managed_default" value="true"/>
<nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>""" %
self.Env["SuppressCib"]
------------------------------
Message: 2
Date: Mon, 16 Jan 2006 02:18: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/cib
Modified Files:
callbacks.c
Log Message:
Observe the "record_config_changes" setting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- callbacks.c 12 Jan 2006 16:14:50 -0000 1.92
+++ callbacks.c 16 Jan 2006 09:18:14 -0000 1.93
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.92 2006/01/12 16:14:50 andrew Exp $ */
+/* $Id: callbacks.c,v 1.93 2006/01/16 09:18:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -901,9 +901,8 @@
cib_post_notify(call_options, op, input, rc, the_cib);
cib_diff_notify(call_options, op, input, rc, local_diff);
-/* log_xml_diff(rc==cib_ok?LOG_DEBUG:LOG_INFO, local_diff,
"cib:diff"); */
- /* because too much depends on what is in here... */
- log_xml_diff(LOG_INFO, local_diff, "cib:diff");
+ log_xml_diff(rc==cib_ok?cib_diff_loglevel:cib_diff_loglevel-1,
+ local_diff, "cib:diff");
} else if(result_cib != NULL) {
crm_err("%s call modified the CIB", op);
@@ -1124,8 +1123,8 @@
keep_connection = FALSE;
} else if(channel->ch_status == IPC_DISCONNECT && cib_client != NULL) {
- crm_debug("Cleaning up after client disconnect: %s/%s",
- crm_str(cib_client->name), cib_client->channel_name);
+ crm_debug_2("Cleaning up after client disconnect: %s/%s",
+ crm_str(cib_client->name),cib_client->channel_name);
if(cib_client->id != NULL) {
g_hash_table_remove(client_list, cib_client->id);
------------------------------
Message: 3
Date: Mon, 16 Jan 2006 02:19:54 -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:
control.c fsa.c messages.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- control.c 13 Jan 2006 10:31:14 -0000 1.107
+++ control.c 16 Jan 2006 09:19:53 -0000 1.108
@@ -109,7 +109,6 @@
/* last attempt to shut these down */
if(is_set(fsa_input_register, R_PE_CONNECTED)) {
- crm_warn("Last attempt to shutdown the PolicyEngine");
tmp = do_pe_control(A_PE_STOP, cause, cur_state,
current_input, msg_data);
if(tmp != I_NULL) {
@@ -119,7 +118,6 @@
}
if(is_set(fsa_input_register, R_TE_CONNECTED)) {
- crm_warn("Last attempt to shutdown the Transitioner");
tmp = do_pe_control(A_TE_STOP, cause, cur_state,
current_input, msg_data);
if(tmp != I_NULL) {
@@ -131,6 +129,7 @@
crm_debug_2("Stopping all remaining local resources");
if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
stop_all_resources();
+
} else {
crm_err("Exiting with no LRM connection..."
" resources may be active!");
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- fsa.c 13 Jan 2006 18:34:25 -0000 1.131
+++ fsa.c 16 Jan 2006 09:19:53 -0000 1.132
@@ -249,7 +249,16 @@
fsa_state2string(fsa_state),
fsa_cause2string(fsa_data->fsa_cause),
fsa_data->origin);
+
+ } else if(fsa_actions == A_EXIT_0) {
+ /* temporary error */
+ crm_err("Processing %s: [ state=%s cause=%s origin=%s
]",
+ fsa_input2string(fsa_data->fsa_input),
+ fsa_state2string(fsa_state),
+ fsa_cause2string(fsa_data->fsa_cause),
+ fsa_data->origin);
}
+
#ifdef FSA_TRACE
if(new_actions != A_NOTHING) {
crm_debug_2("Adding FSA actions %.16llx for %s/%s",
@@ -442,10 +451,10 @@
do_fsa_action(fsa_data, A_MSG_ROUTE,
do_msg_route);
} else if(is_set(fsa_actions, A_RECOVER)) {
do_fsa_action(fsa_data, A_RECOVER,
do_recover);
- } else if(is_set(fsa_actions, A_CL_JOIN_REQUEST)) {
- do_fsa_action(fsa_data, A_CL_JOIN_REQUEST,
do_cl_join_offer_respond);
} else if(is_set(fsa_actions, A_CL_JOIN_RESULT)) {
do_fsa_action(fsa_data, A_CL_JOIN_RESULT,
do_cl_join_finalize_respond);
+ } else if(is_set(fsa_actions, A_CL_JOIN_REQUEST)) {
+ do_fsa_action(fsa_data, A_CL_JOIN_REQUEST,
do_cl_join_offer_respond);
} else if(is_set(fsa_actions, A_SHUTDOWN_REQ)) {
do_fsa_action(fsa_data, A_SHUTDOWN_REQ,
do_shutdown_req);
} else if(is_set(fsa_actions, A_ELECTION_VOTE)) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -3 -r1.140 -r1.141
--- messages.c 11 Jan 2006 13:06:11 -0000 1.140
+++ messages.c 16 Jan 2006 09:19:53 -0000 1.141
@@ -98,7 +98,8 @@
if(input == I_WAIT_FOR_EVENT) {
do_fsa_stall = TRUE;
- crm_debug("Stalling the FSA pending further input");
+ crm_debug("Stalling the FSA pending further input: cause=%s",
+ fsa_cause2string(cause));
if(old_len > 0) {
crm_warn("%s stalled the FSA with pending inputs",
raised_from);
@@ -410,7 +411,10 @@
break;
case I_CIB_OP:
break;
-
+/* case I_JOIN_OFFER: */
+/* break; */
+/* case I_JOIN_RESULT: */
+/* break; */
/* what else should go here? */
default:
crm_debug_4("Defering local processing of
message");
@@ -852,9 +856,13 @@
} else if(strcmp(op, CRM_OP_JOIN_OFFER) == 0) {
next_input = I_JOIN_OFFER;
+ crm_debug("Raising I_JOIN_OFFER: join-%s",
+ cl_get_string(stored_msg->msg, F_CRM_JOIN_ID));
} else if(strcmp(op, CRM_OP_JOIN_ACKNAK) == 0) {
next_input = I_JOIN_RESULT;
+ crm_debug("Raising I_JOIN_RESULT: join-%s",
+ cl_get_string(stored_msg->msg, F_CRM_JOIN_ID));
} else if(strcmp(op, CRM_OP_LRM_DELETE) == 0
|| strcmp(op, CRM_OP_LRM_REFRESH) == 0
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 36
********************************************
