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: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 19 Feb 2006 02:07:40 -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 utils.c
Log Message:
Differentiate between a graph pass where we performed an action and one
where we are still just waiting for somethign to complete
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- graph.c 17 Feb 2006 13:30:39 -0000 1.3
+++ graph.c 19 Feb 2006 09:07:39 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.3 2006/02/17 13:30:39 andrew Exp $ */
+/* $Id: graph.c,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -304,8 +304,12 @@
} else if(num_skipped != 0) {
stat_log_level = LOG_NOTICE;
}
+
+ } else if(num_fired == 0) {
+ pass_result = transition_pending;
}
+
crm_log_maybe(stat_log_level,
"Transition %d Complete: %d, Pending: %d,"
" Fired: %d, Skipped: %d, Incomplete: %d",
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- utils.c 18 Feb 2006 12:43:58 -0000 1.3
+++ utils.c 19 Feb 2006 09:07:39 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.3 2006/02/18 12:43:58 andrew Exp $ */
+/* $Id: utils.c,v 1.4 2006/02/19 09:07:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -71,6 +71,8 @@
switch(state) {
case transition_active:
return "active";
+ case transition_pending:
+ return "pending";
case transition_complete:
return "complete";
case transition_stopped:
------------------------------
Message: 2
Date: Sun, 19 Feb 2006 02:08:33 -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/tengine
Modified Files:
actions.c callbacks.c tengine.c tengine.h utils.c
Log Message:
Only restart the transition timer if a new action was executed during the
graph pass.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- actions.c 18 Feb 2006 12:43:02 -0000 1.11
+++ actions.c 19 Feb 2006 09:08:32 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.11 2006/02/18 12:43:02 andrew Exp $ */
+/* $Id: actions.c,v 1.12 2006/02/19 09:08:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -136,8 +136,6 @@
target);
return FALSE;
}
- stop_te_timer(transition_timer);
- start_te_timer(transition_timer);
return TRUE;
}
@@ -193,6 +191,7 @@
action->timer->reason = timeout_action_warn;
start_te_timer(action->timer);
}
+
return TRUE;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- callbacks.c 18 Feb 2006 12:43:02 -0000 1.67
+++ callbacks.c 19 Feb 2006 09:08:32 -0000 1.68
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.67 2006/02/18 12:43:02 andrew Exp $ */
+/* $Id: callbacks.c,v 1.68 2006/02/19 09:08:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -408,6 +408,7 @@
}
}
+te_timer_t *transition_timer = NULL;
gboolean
te_graph_trigger(gpointer user_data)
@@ -425,9 +426,6 @@
transition_timer->source_id = 0;
transition_timer->reason = timeout_abort;
transition_timer->action = NULL;
-
- } else {
- stop_te_timer(transition_timer);
}
graph_rc = run_graph(transition_graph);
@@ -436,17 +434,23 @@
transition_timer->timeout = transition_graph->transition_timeout;
if(graph_rc == transition_active) {
crm_debug_3("Transition not yet complete");
+
/* restart the transition timer again */
+ stop_te_timer(transition_timer);
start_te_timer(transition_timer);
- return TRUE;
-
+ return TRUE;
+
+ } else if(graph_rc == transition_pending) {
+ crm_debug_3("Transition not yet complete - no actions fired");
+ return TRUE;
}
+
pending_updates = num_cib_op_callbacks();
CRM_DEV_ASSERT(pending_updates == 0);
if(graph_rc != transition_complete) {
- crm_crit("Transition failed: %s", transition_status(graph_rc));
+ crm_err("Transition failed: %s", transition_status(graph_rc));
print_graph(LOG_WARNING, transition_graph);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- tengine.c 16 Feb 2006 15:20:32 -0000 1.113
+++ tengine.c 19 Feb 2006 09:08:32 -0000 1.114
@@ -1,4 +1,4 @@
-/* $Id: tengine.c,v 1.113 2006/02/16 15:20:32 andrew Exp $ */
+/* $Id: tengine.c,v 1.114 2006/02/19 09:08:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -40,8 +40,6 @@
const HA_Message *msg, int call_id, int rc,
crm_data_t *output, void *user_data);
-te_timer_t *transition_timer = NULL;
-te_timer_t *abort_timer = NULL;
char *te_uuid = NULL;
extern gboolean shuttingdown;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- tengine.h 16 Feb 2006 15:20:32 -0000 1.33
+++ tengine.h 19 Feb 2006 09:08:32 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: tengine.h,v 1.33 2006/02/16 15:20:32 andrew Exp $ */
+/* $Id: tengine.h,v 1.34 2006/02/19 09:08:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -43,13 +43,10 @@
extern gboolean process_te_message(
HA_Message * msg, crm_data_t *xml_data, IPC_Channel *sender);
-extern GTRIGSource *transition_trigger;
extern crm_graph_t *transition_graph;
-extern char *te_uuid;
-extern uint default_transition_idle_timeout;
+extern GTRIGSource *transition_trigger;
-extern te_timer_t *transition_timer;
-extern te_timer_t *abort_timer;
+extern char *te_uuid;
extern cib_t *te_cib_conn;
extern int unconfirmed_actions(void);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/utils.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- utils.c 16 Feb 2006 17:52:58 -0000 1.54
+++ utils.c 19 Feb 2006 09:08:32 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.54 2006/02/16 17:52:58 andrew Exp $ */
+/* $Id: utils.c,v 1.55 2006/02/19 09:08:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -31,7 +31,6 @@
#include <lrm/lrm_api.h>
extern cib_t *te_cib_conn;
-extern int global_transition_timer;
gboolean timer_callback(gpointer data);
void set_timer_value(te_timer_t *timer, const char *time, int time_default);
------------------------------
_______________________________________________
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 80
********************************************
