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: crm by andrew from
([email protected])
4. Linux-HA CVS: cts by andrew from
([email protected])
5. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 28 Mar 2006 05:03:07 -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:
master.c
Log Message:
Include role information for master/slave actions.
The value should be correct but more importantly its presence indicates
that the resource is being cloned and should act "statefully".
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- master.c 18 Mar 2006 17:23:48 -0000 1.10
+++ master.c 28 Mar 2006 12:03:06 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.10 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: master.c,v 1.11 2006/03/28 12:03:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -377,6 +377,8 @@
default:
CRM_CHECK(FALSE/* unhandled */, ;);
}
+ add_hash_param(child_rsc->parameters,
+ "crm_role", role2text(child_rsc->next_role));
);
crm_info("Promoted %d (of %d) slaves to master", promoted, master_max);
g_hash_table_destroy(master_hash);
------------------------------
Message: 2
Date: Tue, 28 Mar 2006 06:05:24 -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:
unpack.c
Log Message:
Just in case, role changes dont require a restart
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- unpack.c 27 Mar 2006 15:51:58 -0000 1.170
+++ unpack.c 28 Mar 2006 13:05:23 -0000 1.171
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.170 2006/03/27 15:51:58 andrew Exp $ */
+/* $Id: unpack.c,v 1.171 2006/03/28 13:05:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1164,6 +1164,9 @@
XML_RSC_ATTR_INCARNATION_NODEMAX,
XML_RSC_ATTR_MASTER_MAX,
XML_RSC_ATTR_MASTER_NODEMAX,
+
+/* ignore master fields */
+ "crm_role",
/* ignore notify fields */
"notify_stop_resource",
------------------------------
Message: 3
Date: Tue, 28 Mar 2006 06:06:09 -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:
lrm.c
Log Message:
Fail count only applies to recurring actions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- lrm.c 27 Mar 2006 15:53:10 -0000 1.174
+++ lrm.c 28 Mar 2006 13:06:08 -0000 1.175
@@ -1336,20 +1336,21 @@
static void
update_failcount(lrm_op_t *op)
{
- const char *probe_s = NULL;
int op_status = LRM_OP_DONE;
const char *target_rc_s = NULL;
CRM_DEV_ASSERT(op != NULL);
- if(crm_is_true(probe_s)) {
+
+ if(op->interval <= 0) {
return;
}
-
+/*
+ const char *probe_s = NULL;
probe_s = g_hash_table_lookup(op->params, XML_ATTR_LRM_PROBE);
if(crm_is_true(probe_s)) {
return;
}
-
+*/
CRM_DEV_ASSERT(op->op_status != LRM_OP_PENDING);
if(crm_assert_failed) {
return;
@@ -1525,7 +1526,9 @@
crm_str(op->rsc_id),
op_status2text(op->op_status),
op->rc, execra_code2string(op->rc));
- crm_debug("Result: %s", op->output);
+ if(op->output != NULL) {
+ crm_debug("Result: %s", op->output);
+ }
break;
case LRM_OP_CANCELLED:
crm_warn("LRM operation (%d) %s_%d on %s %s",
------------------------------
Message: 4
Date: Tue, 28 Mar 2006 06:06:50 -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:
CTStests.py.in
Log Message:
Update the failure patterns to ignore
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTStests.py.in,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- CTStests.py.in 13 Mar 2006 09:37:50 -0000 1.139
+++ CTStests.py.in 28 Mar 2006 13:06:49 -0000 1.140
@@ -1625,7 +1625,8 @@
#
def errorstoignore(self):
'''Return list of errors which should be ignored'''
- return [ """ERROR: .* LRM operation.*monitor.* on %s Error: not
running""" % self.rid
+ return [ """ERROR: .* Action %s_monitor_.* on .* failed .*rc: 0 vs.
7.*: Error""" % self.rid,
+ """Updating failcount for """
]
AllTestClasses.append(ResourceRecover)
------------------------------
Message: 5
Date: Tue, 28 Mar 2006 06:07:18 -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:
.cvsignore
Log Message:
CVS ignore updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- .cvsignore 28 Sep 2004 14:37:02 -0000 1.7
+++ .cvsignore 28 Mar 2006 13:07:18 -0000 1.8
@@ -10,3 +10,5 @@
*.beam
parser-messages
MISC_ERRORS
+OCFMSDummy
+LSBDummy
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 76
********************************************
