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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 26 Apr 2006 07:34:11 -0600 (MDT)
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:
messages.c
Log Message:
Always process our IPC messages immediately
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- messages.c 18 Apr 2006 11:20:29 -0000 1.148
+++ messages.c 26 Apr 2006 13:34:11 -0000 1.149
@@ -409,15 +409,17 @@
switch(result) {
case I_NULL:
break;
- case I_DC_HEARTBEAT:
- break;
case I_CIB_OP:
break;
-/* case I_JOIN_OFFER: */
-/* break; */
-/* case I_JOIN_RESULT: */
-/* break; */
- /* what else should go here? */
+ case I_ROUTER:
+ if(cause == C_IPC_MESSAGE) {
+ /* process local messages immediately
+ * it might be the TE telling us its
+ * done
+ */
+ break;
+ }
+ /* fall through */
default:
crm_debug_4("Defering local processing of
message");
register_fsa_input_later(
------------------------------
Message: 2
Date: Wed, 26 Apr 2006 07:35:20 -0600 (MDT)
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
Log Message:
Turn down the logging
Dont update the CIB with failed cancel ops
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- actions.c 23 Apr 2006 19:50:19 -0000 1.25
+++ actions.c 26 Apr 2006 13:35:19 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.25 2006/04/23 19:50:19 andrew Exp $ */
+/* $Id: actions.c,v 1.26 2006/04/26 13:35:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -473,7 +473,7 @@
te_log_action(log_level, "Transition %d status: %s - %s",
graph->id, op, graph->abort_reason);
- print_graph(LOG_DEBUG_2, graph);
+ print_graph(LOG_DEBUG_3, graph);
cmd = create_request(
op, NULL, NULL, CRM_SYSTEM_DC, CRM_SYSTEM_TENGINE, NULL);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- callbacks.c 23 Apr 2006 19:50:19 -0000 1.77
+++ callbacks.c 26 Apr 2006 13:35:19 -0000 1.78
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.77 2006/04/23 19:50:19 andrew Exp $ */
+/* $Id: callbacks.c,v 1.78 2006/04/26 13:35:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -221,7 +221,7 @@
start_global_timer(transition_timer,
transition_graph->transition_timeout);
trigger_graph();
- print_graph(LOG_DEBUG, transition_graph);
+ print_graph(LOG_DEBUG_2, transition_graph);
}
} else if(strcmp(op, CRM_OP_TE_HALT) == 0) {
@@ -440,9 +440,15 @@
unconfirmed++;
crm_debug("Action %d: unconfirmed",action->id);
- if(action->type == action_type_rsc && send_updates) {
- cib_action_update(action, LRM_OP_PENDING);
+ if(action->type != action_type_rsc) {
+ continue;
+ } else if(send_updates == FALSE) {
+ continue;
+ } if(safe_str_eq(task, "cancel")) {
+ /* we dont need to update the CIB with these */
+ continue;
}
+ cib_action_update(action, LRM_OP_PENDING);
);
);
if(unconfirmed > 0) {
@@ -503,7 +509,7 @@
graph_rc = run_graph(transition_graph);
timeout = transition_graph->transition_timeout;
- print_graph(LOG_DEBUG_2, transition_graph);
+ print_graph(LOG_DEBUG_3, transition_graph);
if(graph_rc == transition_active) {
crm_debug_3("Transition not yet complete");
------------------------------
Message: 3
Date: Wed, 26 Apr 2006 07:35:48 -0600 (MDT)
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:
CTStests.py.in
Log Message:
Create a LoggingTest but dont turn it on
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTStests.py.in,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- CTStests.py.in 21 Apr 2006 03:32:48 -0000 1.145
+++ CTStests.py.in 26 Apr 2006 13:35:48 -0000 1.146
@@ -189,6 +189,7 @@
self.CM.statall()
# Make sure logging is working and we have enough disk space...
if not self.CM.Env["DoBSC"]:
+ self.CM.ns.WaitForAllNodesToComeUp(self.CM.Env["nodes"])
if not self.CM.TestLogging():
sys.exit(1)
if not self.CM.CheckDf():
@@ -2324,3 +2325,33 @@
def is_applicable(self):
'''SimulStartLite is a setup test and never applicable'''
return 0
+
+###################################################################
+class LoggingTest(CTSTest):
+###################################################################
+ def __init__(self, cm):
+ CTSTest.__init__(self,cm)
+ self.name="Logging"
+
+ def __call__(self, dummy):
+ '''Perform the 'Logging' test. '''
+ self.incr("calls")
+
+ self.CM.ns.WaitForAllNodesToComeUp(self.CM.Env["nodes"])
+
+ # Make sure logging is working and we have enough disk space...
+ if not self.CM.TestLogging():
+ sys.exit(1)
+ if not self.CM.CheckDf():
+ sys.exit(1)
+
+ def is_applicable(self):
+ '''ResourceRecover is applicable only when there are resources running
+ on our cluster and environment is linux-ha-v2'''
+ return self.CM.Env["DoBSC"]
+
+ def errorstoignore(self):
+ '''Return list of errors which should be ignored'''
+ return []
+
+#AllTestClasses.append(LoggingTest)
------------------------------
Message: 4
Date: Wed, 26 Apr 2006 07:36:06 -0600 (MDT)
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/cib
Modified Files:
cib_client.c
Log Message:
Improved error message
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- cib_client.c 9 Apr 2006 12:56:50 -0000 1.55
+++ cib_client.c 26 Apr 2006 13:36:05 -0000 1.56
@@ -666,7 +666,7 @@
error_msg = "failed adding field to cib message";
break;
case cib_id_check:
- error_msg = "id-collision detected";
+ error_msg = "missing id or id-collision detected";
break;
case cib_operation:
error_msg = "invalid operation";
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 136
*********************************************
