Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: resources by sunjd from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 15 May 2006 04:07:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
apache.in
Log Message:
bug1254: can get metadata even httpd isnot found
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- apache.in 11 May 2006 14:56:42 -0000 1.19
+++ apache.in 15 May 2006 10:07:32 -0000 1.20
@@ -548,6 +548,7 @@
stop) return $OCF_SUCCESS;;
monitor) return $OCF_NOT_RUNNING;;
status) return $LSB_STATUS_STOPPED;;
+ meta-data) metadata_apache;;
esac
ocf_log err "No valid httpd found! Please revise your <HTTPDLIST>
item"
exit $OCF_ERR_CONFIGURED
------------------------------
Message: 2
Date: Mon, 15 May 2006 04:21:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
io.c callbacks.c
Log Message:
Allow renames and or new ID's to be assigned silently in do_id_check()
As yet no-where allows renames but everywhere except startup allows
new ID's to be assigned where one doesnt exist.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- io.c 20 Apr 2006 13:19:01 -0000 1.66
+++ io.c 15 May 2006 10:21:04 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.66 2006/04/20 13:19:01 andrew Exp $ */
+/* $Id: io.c,v 1.67 2006/05/15 10:21:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -329,7 +329,14 @@
crm_xml_add(root, "generated", XML_BOOLEAN_FALSE);
- do_id_check(root, NULL);
+ if(do_id_check(root, NULL, FALSE, FALSE)) {
+ crm_crit("%s does not contain a vaild configuration.",
+ filename);
+ crm_crit("Inhibiting respawn by Heartbeat to avoid loss"
+ " of configuration data.");
+ cl_flush_logs();
+ exit(100);
+ }
if (verifyCibXml(root) == FALSE) {
crm_crit("%s does not contain a vaild configuration.",
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- callbacks.c 21 Apr 2006 07:08:03 -0000 1.121
+++ callbacks.c 15 May 2006 10:21:04 -0000 1.122
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.121 2006/04/21 07:08:03 andrew Exp $ */
+/* $Id: callbacks.c,v 1.122 2006/05/15 10:21:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1123,7 +1123,7 @@
update_counters(__FILE__, __FUNCTION__, result_cib);
- if(do_id_check(result_cib, NULL)) {
+ if(do_id_check(result_cib, NULL, TRUE, FALSE)) {
rc = cib_id_check;
if(call_options & cib_force_diff) {
crm_err("Global update introduces id
collision!");
------------------------------
Message: 3
Date: Mon, 15 May 2006 04:21:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
ptest.c
Log Message:
Allow renames and or new ID's to be assigned silently in do_id_check()
As yet no-where allows renames but everywhere except startup allows
new ID's to be assigned where one doesnt exist.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/ptest.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ptest.c 18 Mar 2006 17:23:48 -0000 1.73
+++ ptest.c 15 May 2006 10:21:04 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Id: ptest.c,v 1.73 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: ptest.c,v 1.74 2006/05/15 10:21:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -242,7 +242,7 @@
CRM_CHECK(cib_object != NULL, return 4);
crm_notice("Required feature set: %s", feature_set(cib_object));
- do_id_check(cib_object, NULL);
+ do_id_check(cib_object, NULL, FALSE, FALSE);
crm_zero_mem_stats(NULL);
------------------------------
Message: 4
Date: Mon, 15 May 2006 04:21:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/admin
Modified Files:
crm_verify.c
Log Message:
Allow renames and or new ID's to be assigned silently in do_id_check()
As yet no-where allows renames but everywhere except startup allows
new ID's to be assigned where one doesnt exist.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- crm_verify.c 5 Apr 2006 13:37:05 -0000 1.10
+++ crm_verify.c 15 May 2006 10:21:05 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.10 2006/04/05 13:37:05 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.11 2006/05/15 10:21:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -214,7 +214,7 @@
#endif
crm_notice("Required feature set: %s", feature_set(cib_object));
- if(do_id_check(cib_object, NULL)) {
+ if(do_id_check(cib_object, NULL, FALSE, FALSE)) {
pe_config_err("ID Check failed");
}
------------------------------
Message: 5
Date: Mon, 15 May 2006 04:21:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/common
Modified Files:
xml.c
Log Message:
Allow renames and or new ID's to be assigned silently in do_id_check()
As yet no-where allows renames but everywhere except startup allows
new ID's to be assigned where one doesnt exist.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- xml.c 11 May 2006 12:13:06 -0000 1.82
+++ xml.c 15 May 2006 10:21:05 -0000 1.83
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.82 2006/05/11 12:13:06 andrew Exp $ */
+/* $Id: xml.c,v 1.83 2006/05/15 10:21:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2249,7 +2249,8 @@
}
gboolean
-do_id_check(crm_data_t *xml_obj, GHashTable *id_hash)
+do_id_check(crm_data_t *xml_obj, GHashTable *id_hash,
+ gboolean silent_add, gboolean silent_rename)
{
char *lookup_id = NULL;
gboolean modified = FALSE;
@@ -2273,7 +2274,7 @@
xml_child_iter(
xml_obj, xml_child,
- if(do_id_check(xml_child, id_hash)) {
+ if(do_id_check(xml_child, id_hash, silent_add, silent_rename)) {
modified = TRUE;
}
);
@@ -2309,9 +2310,12 @@
id_hash, lookup_id, crm_strdup(tag_id));
break;
}
- }
+ modified |= (!silent_rename);
- modified = TRUE;
+ } else {
+ modified |= (!silent_add);
+ }
+
crm_free(lookup_id);
assign_uuid(xml_obj);
tag_id = ID(xml_obj);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 44
********************************************
