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])
----------------------------------------------------------------------
Message: 1
Date: Mon, 29 May 2006 09:59:34 -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
Modified Files:
crm-1.0.dtd
Log Message:
Put operations at the start
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- crm-1.0.dtd 29 May 2006 15:39:14 -0000 1.70
+++ crm-1.0.dtd 29 May 2006 15:59:34 -0000 1.71
@@ -57,7 +57,7 @@
<!ELEMENT resources (primitive|group|clone|master_slave)*>
<!-- Annotated version -->
-<!ELEMENT primitive (meta_attributes*, instance_attributes*, operations?)>
+<!ELEMENT primitive (operations?, meta_attributes*, instance_attributes*)>
<!ATTLIST primitive
id CDATA #REQUIRED
description CDATA #IMPLIED
------------------------------
Message: 2
Date: Mon, 29 May 2006 10:01:29 -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:
master.c
Log Message:
If we're going to fail, do so with some decent logs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- master.c 22 May 2006 08:27:33 -0000 1.18
+++ master.c 29 May 2006 16:01:28 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.18 2006/05/22 08:27:33 andrew Exp $ */
+/* $Id: master.c,v 1.19 2006/05/29 16:01:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -267,7 +267,9 @@
child_rsc, resource_t, clone_data->child_list, lpc,
crm_debug_2("Assigning priority for %s", child_rsc->id);
- CRM_CHECK(child_rsc->color != NULL, continue);
+ CRM_CHECK(child_rsc->color != NULL,
+ crm_err("Resource %s is uncolored", child_rsc->id);
+ continue);
chosen = child_rsc->color->details->chosen_node;
if(child_rsc->role == RSC_ROLE_STARTED) {
@@ -325,7 +327,9 @@
child_rsc->priority = -INFINITY;
break;
default:
- CRM_CHECK(FALSE/* unhandled */, ;);
+ CRM_CHECK(FALSE/* unhandled */,
+ crm_err("Unknown resource role: %d
for %s",
+ child_rsc->next_role,
child_rsc->id));
}
);
@@ -337,7 +341,10 @@
slist_iter(
child_rsc, resource_t, clone_data->child_list, lpc,
- CRM_CHECK(child_rsc->color != NULL, continue);
+ CRM_CHECK(child_rsc->color != NULL,
+ crm_err("Resource %s is uncolored", child_rsc->id);
+ continue);
+
chosen = child_rsc->color->details->chosen_node;
switch(child_rsc->next_role) {
@@ -394,7 +401,9 @@
}
break;
default:
- CRM_CHECK(FALSE/* unhandled */, ;);
+ CRM_CHECK(FALSE/* unhandled */,
+ crm_err("Unknown resource role: %d
for %s",
+ child_rsc->next_role,
child_rsc->id));
}
add_hash_param(child_rsc->parameters, crm_meta_name("role"),
role2text(child_rsc->next_role));
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 99
********************************************
