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: mgmt by zhenh 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: Fri, 13 Jan 2006 00:09:26 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt
Added Files:
.cvsignore
Log Message:
add .cvsignore
------------------------------
Message: 2
Date: Fri, 13 Jan 2006 03:31:15 -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/pengine
Modified Files:
stages.c
Log Message:
Cleanups and logging - no functional change
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- stages.c 10 Jan 2006 13:52:11 -0000 1.84
+++ stages.c 13 Jan 2006 10:31:14 -0000 1.85
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.84 2006/01/10 13:52:11 andrew Exp $ */
+/* $Id: stages.c,v 1.85 2006/01/13 10:31:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -451,7 +451,7 @@
transition_id++;
transition_id_s = crm_itoa(transition_id);
- crm_info("Creating transition graph %d.", transition_id);
+ crm_debug("Creating transition graph %d.", transition_id);
data_set->graph = create_xml_node(NULL, XML_TAG_GRAPH);
crm_xml_add(data_set->graph, "global_timeout",
data_set->transition_idle_timeout);
@@ -483,6 +483,7 @@
);
crm_log_xml_debug_3(data_set->graph, "created generic action list");
+ crm_info("Created transition graph %d.", transition_id);
return TRUE;
}
------------------------------
Message: 3
Date: Fri, 13 Jan 2006 03:31: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:
fsa.c control.c lrm.c
Log Message:
Cleanups and logging - no functional change
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- fsa.c 12 Jan 2006 15:06:19 -0000 1.129
+++ fsa.c 13 Jan 2006 10:31:14 -0000 1.130
@@ -38,19 +38,51 @@
#include <crm/dmalloc_wrapper.h>
+longclock_t action_start = 0;
+longclock_t action_stop = 0;
+longclock_t action_diff = 0;
+unsigned int action_diff_ms = 0;
+
+char *fsa_our_dc = NULL;
+cib_t *fsa_cib_conn = NULL;
+char *fsa_our_dc_version = NULL;
+
+ll_lrm_t *fsa_lrm_conn;
+ll_cluster_t *fsa_cluster_conn;
+oc_node_list_t *fsa_membership_copy;
+const char *fsa_our_uuid = NULL;
+const char *fsa_our_uname = NULL;
+
+fsa_timer_t *wait_timer = NULL;
+fsa_timer_t *dc_heartbeat = NULL;
+fsa_timer_t *recheck_timer = NULL;
+fsa_timer_t *shutdown_timer = NULL;
+fsa_timer_t *election_trigger = NULL;
+fsa_timer_t *election_timeout = NULL;
+fsa_timer_t *integration_timer = NULL;
+fsa_timer_t *finalization_timer = NULL;
+fsa_timer_t *shutdown_escalation_timer = NULL;
+
+volatile gboolean do_fsa_stall = FALSE;
+volatile long long fsa_input_register = 0;
+volatile long long fsa_actions = A_NOTHING;
+volatile enum crmd_fsa_state fsa_state = S_STARTING;
+
extern uint highest_born_on;
-extern int num_join_invites;
+extern uint num_join_invites;
extern GHashTable *welcomed_nodes;
-extern GHashTable *integrated_nodes;
extern GHashTable *finalized_nodes;
extern GHashTable *confirmed_nodes;
+extern GHashTable *integrated_nodes;
extern void initialize_join(gboolean before);
-long long
-do_state_transition(long long actions,
- enum crmd_fsa_state cur_state,
- enum crmd_fsa_state next_state,
- fsa_data_t *msg_data);
+#define DOT_PREFIX "actions:trace: "
+#define do_dot_log(fmt...) do_crm_log(LOG_DEBUG_2, NULL, NULL, fmt)
+
+long long do_state_transition(long long actions,
+ enum crmd_fsa_state cur_state,
+ enum crmd_fsa_state next_state,
+ fsa_data_t *msg_data);
long long clear_flags(long long actions,
enum crmd_fsa_cause cause,
@@ -63,23 +95,10 @@
void ghash_print_node(gpointer key, gpointer value, gpointer user_data);
-#define DOT_PREFIX "live.dot: "
-#define do_dot_log(fmt...) do_crm_log(LOG_DEBUG_2, NULL, NULL, fmt)
-
-
-longclock_t action_start = 0;
-longclock_t action_stop = 0;
-longclock_t action_diff = 0;
-unsigned int action_diff_ms = 0;
-
-
-
-/* #define ELSEIF_FSA_ACTION(x,y) else IF_FSA_ACTION(x,y) */
-void init_dotfile(void);
void s_crmd_fsa_actions(fsa_data_t *fsa_data);
void log_fsa_input(fsa_data_t *stored_msg);
-void
+static void
init_dotfile(void)
{
do_dot_log(DOT_PREFIX"digraph \"g\" {");
@@ -123,32 +142,6 @@
do_dot_log(DOT_PREFIX" \"S_IDLE\" [ fontcolor = \"green\" ]");
}
-
-
-volatile enum crmd_fsa_state fsa_state = S_STARTING;
-oc_node_list_t *fsa_membership_copy;
-ll_cluster_t *fsa_cluster_conn;
-ll_lrm_t *fsa_lrm_conn;
-volatile long long fsa_input_register;
-volatile long long fsa_actions = A_NOTHING;
-const char *fsa_our_uname = NULL;
-const char *fsa_our_uuid = NULL;
-char *fsa_our_dc = NULL;
-char *fsa_our_dc_version = NULL;
-cib_t *fsa_cib_conn = NULL;
-
-fsa_timer_t *election_trigger = NULL; /* */
-fsa_timer_t *election_timeout = NULL; /* */
-fsa_timer_t *shutdown_escalation_timer = NULL; /* */
-fsa_timer_t *shutdown_timer = NULL; /* */
-fsa_timer_t *integration_timer = NULL;
-fsa_timer_t *finalization_timer = NULL;
-fsa_timer_t *dc_heartbeat = NULL;
-fsa_timer_t *wait_timer = NULL;
-fsa_timer_t *recheck_timer = NULL;
-
-volatile gboolean do_fsa_stall = FALSE;
-
static void
do_fsa_action(fsa_data_t *fsa_data, long long an_action,
enum crmd_fsa_input (*function)(long long action,
@@ -247,6 +240,15 @@
/* get the next batch of actions */
new_actions = crmd_fsa_actions[fsa_data->fsa_input][fsa_state];
fsa_actions |= new_actions;
+
+ if(fsa_data->fsa_input != I_NULL
+ && fsa_data->fsa_input != I_ROUTER) {
+ crm_debug("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",
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- control.c 11 Jan 2006 20:00:32 -0000 1.106
+++ control.c 13 Jan 2006 10:31:14 -0000 1.107
@@ -128,7 +128,7 @@
}
}
- crm_info("Stopping all remaining local resources");
+ crm_debug_2("Stopping all remaining local resources");
if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
stop_all_resources();
} else {
@@ -314,6 +314,22 @@
finalization_timer->fsa_input = I_FINALIZED;
finalization_timer->callback = crm_timer_popped;
finalization_timer->repeat = FALSE;
+#if 0
+ /* for possible enabling... a bug in the join protocol left
+ * a slave in S_PENDING while we think its in S_NOT_DC
+ *
+ * raising I_FINALIZED put us into a transition loop which is
+ * never resolved.
+ * in this loop we continually send probes which the node
NACK's because
+ * its in S_PENDING
+ *
+ * the flip-side is if we have nodes where heartbeat is active
but the
+ * CRM is not... then we'll be stuck in an election/join loop
+ *
+ * we just cant win
+ */
+ finalization_timer->fsa_input = I_ELECTION;
+#endif
} else {
was_error = TRUE;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- lrm.c 12 Jan 2006 15:15:41 -0000 1.161
+++ lrm.c 13 Jan 2006 10:31:14 -0000 1.162
@@ -916,7 +916,7 @@
crm_strdup(XML_ATTR_CRM_VERSION),
crm_strdup(CRM_FEATURE_SET));
- crm_debug("Constructed %s op for %s", operation, rsc_id);
+ crm_debug_2("Constructed %s op for %s", operation, rsc_id);
return op;
}
@@ -967,8 +967,8 @@
CRM_DEV_ASSERT(interval_s == NULL);
}
- crm_debug("Constructed %s op for %s: interval=%d",
- operation, rsc_id, op->interval);
+ crm_debug_2("Constructed %s op for %s: interval=%d",
+ operation, rsc_id, op->interval);
return op;
}
------------------------------
_______________________________________________
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 27
********************************************
