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 sunjd from ([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 20 Apr 2006 21:32:49 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTStests.py.in
Log Message:
Fix a pattern error
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTStests.py.in,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- CTStests.py.in 19 Apr 2006 12:08:29 -0000 1.144
+++ CTStests.py.in 21 Apr 2006 03:32:48 -0000 1.145
@@ -1617,7 +1617,7 @@
#
def errorstoignore(self):
'''Return list of errors which should be ignored'''
- return [ """ERROR: .* Action .*%s_monitor_.* on .* failed .*rc: 0 vs.
7.*: Error""" % self.rid,
+ return [ """ERROR: .* Action .*%s_monitor_.* on .* failed .*target: 0
vs. rc: 7.*: Error""" % self.rid,
"""Updating failcount for """
]
------------------------------
Message: 2
Date: Fri, 21 Apr 2006 01:08:04 -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:
lrm.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -3 -r1.187 -r1.188
--- lrm.c 20 Apr 2006 08:59:47 -0000 1.187
+++ lrm.c 21 Apr 2006 07:08:04 -0000 1.188
@@ -546,7 +546,7 @@
slist_iter(
op, lrm_op_t, op_list, llpc,
- crm_debug_2("Processing op %s (%d) for %s (status=%d, rc=%d)",
+ crm_debug("Processing op %s (%d) for %s (status=%d, rc=%d)",
op->op_type, op->call_id, the_rsc->id,
op->op_status, op->rc);
@@ -1351,6 +1351,19 @@
return rsc_copy;
}
+static void
+cib_rsc_callback(const HA_Message *msg, int call_id, int rc,
+ crm_data_t *output, void *user_data)
+{
+ if(rc != cib_ok) {
+ crm_err("Resource update %d failed: %s",
+ call_id, cib_error2string(rc));
+ } else {
+ crm_debug("Resource update %d complete", call_id);
+ }
+}
+
+
void
do_update_resource(lrm_op_t* op)
{
@@ -1365,10 +1378,7 @@
int rc = cib_ok;
crm_data_t *update, *iter;
- CRM_DEV_ASSERT(op != NULL);
- if(crm_assert_failed) {
- return;
- }
+ CRM_CHECK(op != NULL, return);
update = create_node_state(
fsa_our_uname, NULL, NULL, NULL, NULL, NULL, FALSE,
__FUNCTION__);
@@ -1416,7 +1426,8 @@
if(rc > 0) {
/* the return code is a call number, not an error code */
- crm_debug_3("Sent resource state update message: %d", rc);
+ crm_debug("Sent resource state update message: %d", rc);
+ add_cib_op_callback(rc, FALSE, NULL, cib_rsc_callback);
} else {
crm_err("Resource state update failed: %s",
------------------------------
Message: 3
Date: Fri, 21 Apr 2006 01:08:04 -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/cib
Modified Files:
callbacks.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- callbacks.c 20 Apr 2006 15:43:23 -0000 1.120
+++ callbacks.c 21 Apr 2006 07:08:03 -0000 1.121
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.120 2006/04/20 15:43:23 andrew Exp $ */
+/* $Id: callbacks.c,v 1.121 2006/04/21 07:08:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1406,7 +1406,7 @@
crm_debug_2("Peer %s message (%s) from %s", op, seq, originator);
if(originator == NULL || safe_str_eq(originator, cib_our_uname)) {
- crm_debug_3("Discarding %s message from ourselves", op);
+ crm_debug("Discarding %s message %s from ourselves", op, seq);
return;
} else if(ccm_membership == NULL) {
------------------------------
Message: 4
Date: Fri, 21 Apr 2006 01:08:04 -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/pengine
Modified Files:
pengine.c utils.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- pengine.c 4 Apr 2006 17:15:43 -0000 1.108
+++ pengine.c 21 Apr 2006 07:08:04 -0000 1.109
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.108 2006/04/04 17:15:43 andrew Exp $ */
+/* $Id: pengine.c,v 1.109 2006/04/21 07:08:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -154,17 +154,18 @@
if(was_processing_error) {
crm_err("Transition %d:"
" ERRORs found during PE processing."
- " Input stored in: %s",
+ " PEngine Input stored in: %s",
transition_id, filename);
} else if(was_processing_warning) {
crm_warn("Transition %d:"
" WARNINGs found during PE processing."
- " Input stored in: %s",
+ " PEngine Input stored in: %s",
transition_id, filename);
} else {
- crm_info("PEngine Input stored in: %s", filename);
+ crm_info("Transition %d: PEngine Input stored in: %s",
+ transition_id, filename);
}
if(was_config_error) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- utils.c 18 Apr 2006 11:15:37 -0000 1.130
+++ utils.c 21 Apr 2006 07:08:04 -0000 1.131
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.130 2006/04/18 11:15:37 andrew Exp $ */
+/* $Id: utils.c,v 1.131 2006/04/21 07:08:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -417,8 +417,7 @@
return child_rsc;
}
}
- /* error */
- crm_debug("No match for %s", id);
+ crm_debug_2("No match for %s", id);
return NULL;
}
------------------------------
_______________________________________________
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 110
*********************************************
