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: include by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 20 Feb 2006 09:21:52 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
transition.h
Log Message:
Remove unused files
Sort out the action timer code now that we have a common TE library
Rename the timer typedef
Quiet some logging now that it works smoothly
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/transition.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- transition.h 19 Feb 2006 09:07:39 -0000 1.4
+++ transition.h 20 Feb 2006 16:21:52 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: transition.h,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
+/* $Id: transition.h,v 1.5 2006/02/20 16:21:52 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -31,7 +31,7 @@
action_type_crm
} action_type_e;
-typedef struct te_timer_s te_timer_t;
+typedef struct te_timer_s crm_action_timer_t;
typedef struct synapse_s {
@@ -53,7 +53,7 @@
GHashTable *params;
action_type_e type;
- te_timer_t *timer;
+ crm_action_timer_t *timer;
synapse_t *synapse;
gboolean sent_update; /* sent to the CIB */
------------------------------
Message: 2
Date: Mon, 20 Feb 2006 09:24: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:
control.c
Log Message:
Make it a BadNews item instead
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- control.c 20 Feb 2006 15:07:25 -0000 1.117
+++ control.c 20 Feb 2006 16:24:05 -0000 1.118
@@ -711,7 +711,7 @@
ha_node_uuid = get_uuid(fsa_cluster_conn, ha_node);
if(ha_node_uuid == NULL) {
- crm_err("Node %s: no uuid found", ha_node);
+ crm_warn("Node %s: no uuid found", ha_node);
continue;
}
------------------------------
Message: 3
Date: Mon, 20 Feb 2006 09:25:50 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/transition
Modified Files:
graph.c unpack.c utils.c
Log Message:
Sort out the action timer code now that we have a common TE library
Rename the timer typedef
Quiet some logging now that it works smoothly
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- graph.c 19 Feb 2006 09:07:39 -0000 1.4
+++ graph.c 20 Feb 2006 16:25:50 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
+/* $Id: graph.c,v 1.5 2006/02/20 16:25:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -56,7 +56,7 @@
);
if(updates) {
- crm_debug("Updated synapse %d", synapse->id);
+ crm_debug_2("Updated synapse %d", synapse->id);
}
return updates;
}
@@ -96,7 +96,7 @@
}
if(updates) {
- crm_debug("Updated synapse %d", synapse->id);
+ crm_debug_2("Updated synapse %d", synapse->id);
}
return updates;
}
@@ -122,7 +122,8 @@
);
if(updates) {
- crm_debug("Updated graph with completed action %d", action->id);
+ crm_debug_2("Updated graph with completed action %d",
+ action->id);
}
return updates;
}
@@ -255,7 +256,7 @@
return transition_complete;
}
- crm_debug("Entering graph %d callback", graph->id);
+ crm_debug_2("Entering graph %d callback", graph->id);
slist_iter(
synapse, synapse_t, graph->synapses, lpc,
@@ -264,9 +265,9 @@
num_complete++;
} else if (synapse->executed) {
- int pending_log = LOG_DEBUG_2;
- if(synapse->priority <= graph->abort_priority) {
- pending_log = LOG_INFO;
+ int pending_log = LOG_DEBUG;
+ if(synapse->priority > graph->abort_priority) {
+ pending_log = LOG_DEBUG_2;
}
crm_log_maybe(pending_log,
"Synapse %d: confirmation pending",
@@ -310,13 +311,13 @@
}
+ crm_log_maybe(stat_log_level+1,
+ "====================================================");
crm_log_maybe(stat_log_level,
"Transition %d Complete: %d, Pending: %d,"
" Fired: %d, Skipped: %d, Incomplete: %d",
graph->id, num_complete, num_pending, num_fired,
num_skipped, num_incomplete);
- crm_log_maybe(stat_log_level+1,
- "====================================================");
return pass_result;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/unpack.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- unpack.c 18 Feb 2006 12:44:17 -0000 1.3
+++ unpack.c 20 Feb 2006 16:25:50 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.3 2006/02/18 12:44:17 andrew Exp $ */
+/* $Id: unpack.c,v 1.4 2006/02/20 16:25:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -86,12 +86,6 @@
crm_debug_3("Action %d has timer set to %dms",
action->id, action->timeout);
-
- crm_malloc0(action->timer, sizeof(te_timer_t));
- action->timer->timeout = 2 * action->timeout;
- action->timer->source_id = 0;
- action->timer->reason = timeout_action_warn;
- action->timer->action = action;
return action;
}
@@ -220,9 +214,9 @@
static void
destroy_action(crm_action_t *action)
{
- if(action->timer->source_id > 0) {
- crm_debug_3("Removing timer for action: %d",action->id);
-/* Gmain_timeout_remove(action->timer->source_id); */
+ if(action->timer) {
+ CRM_DEV_ASSERT(action->timer->source_id == 0);
+/* Gmain_timeout_remove(action->timer->source_id); */
}
g_hash_table_destroy(action->params);
free_xml(action->xml);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- utils.c 19 Feb 2006 09:07:39 -0000 1.4
+++ utils.c 20 Feb 2006 16:25:50 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
+/* $Id: utils.c,v 1.5 2006/02/20 16:25:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -163,10 +163,11 @@
break;
}
- if(action->timeout > 0 || action->timer->source_id > 0) {
+ if(action->timeout > 0) {
do_crm_log(log_level, __FILE__, __FUNCTION__,
"%s\ttimeout=%d, timer=%d", prefix,
- action->timeout, action->timer->source_id);
+ action->timeout,
+ action->timer?action->timer->source_id:0);
}
if(action->confirmed == FALSE) {
------------------------------
Message: 4
Date: Mon, 20 Feb 2006 09:28:38 -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:
This should happen at most once *ever* in a cluster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- CM_LinuxHAv2.py.in 20 Feb 2006 05:38:03 -0000 1.134
+++ CM_LinuxHAv2.py.in 20 Feb 2006 16:28:38 -0000 1.135
@@ -111,6 +111,7 @@
r"Welcome reply not received from",
r"Attempting to schedule .* after a stop",
r"Resource .* was active at shutdown",
+ r"Node .*: no uuid found",
),
})
del self["Standby"]
------------------------------
_______________________________________________
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 87
********************************************
