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: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 08:23:21 -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:
Makefile.am .cvsignore
Log Message:
Install the DTD to HA_LIBDIR
Hook up dtd validation in the crm_verify CLI
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 3 Apr 2006 14:40:12 -0000 1.14
+++ Makefile.am 4 Apr 2006 14:23:21 -0000 1.15
@@ -21,12 +21,15 @@
SUBDIRS = cib crmd pengine tengine admin test
DIST_SUBDIRS = cib crmd pengine tengine admin test
-crm_libdir = $(libdir)/$(HB_PKG)/crm
+dtddir = $(HA_LIBDIR)/$(HB_PKG)
crm_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/crm
crm_varrundir = $(HA_VARRUNDIR)/$(HB_PKG)/crm
noinst_HEADERS = dmalloc_wrapper.h
-crm_lib_SCRIPTS = crm-1.0.dtd
+dtd_SCRIPTS = crm.dtd
+
+crm.dtd: crm-1.0.dtd
+ cp crm-1.0.dtd crm.dtd
install-exec-local:
$(mkinstalldirs) $(DESTDIR)/$(crm_varlibdir)
@@ -37,7 +40,3 @@
-chown $(HA_CCMUSER) $(DESTDIR)/$(crm_varrundir)
-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_varrundir)
-chmod 750 $(DESTDIR)/$(crm_varrundir)
- $(mkinstalldirs) $(DESTDIR)/$(crm_libdir)
- -chown $(HA_CCMUSER) $(DESTDIR)/$(crm_libdir)
- -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_libdir)
- -chmod 750 $(DESTDIR)/$(crm_libdir)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- .cvsignore 28 Sep 2004 14:37:01 -0000 1.4
+++ .cvsignore 4 Apr 2006 14:23:21 -0000 1.5
@@ -4,3 +4,4 @@
*.beam
parser-messages
MISC_ERRORS
+crm.dtd
------------------------------
Message: 2
Date: Tue, 4 Apr 2006 08:23:21 -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/admin
Modified Files:
crm_verify.c
Log Message:
Install the DTD to HA_LIBDIR
Hook up dtd validation in the crm_verify CLI
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- crm_verify.c 3 Apr 2006 09:41:36 -0000 1.6
+++ crm_verify.c 4 Apr 2006 14:23:21 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.6 2006/04/03 09:41:36 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.7 2006/04/04 14:23:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -205,17 +205,22 @@
write_xml_file(cib_object, cib_save, FALSE);
}
-#if 0
+#if CRM_DEPRECATED_SINCE_2_0_5
status = get_object_root(XML_CIB_TAG_STATUS, cib_object);
xml_child_iter(status, node_state, XML_CIB_TAG_STATE,
xml_remove_prop(node_state, XML_CIB_TAG_LRM);
);
-#endif
+#endif
+
crm_notice("Required feature set: %s", feature_set(cib_object));
if(do_id_check(cib_object, NULL)) {
pe_config_err("ID Check failed");
}
+ if(validate_with_dtd(cib_object, HA_LIBDIR"/heartbeat/crm.dtd") ==
FALSE) {
+ pe_config_err("CIB did not pass DTD validation");
+ }
+
set_working_set_defaults(&data_set);
data_set.input = cib_object;
data_set.now = new_ha_date(TRUE);
------------------------------
Message: 3
Date: Tue, 4 Apr 2006 11:10:42 -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:
callbacks.c
Log Message:
debug
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- callbacks.c 28 Mar 2006 08:30:50 -0000 1.111
+++ callbacks.c 4 Apr 2006 17:10:42 -0000 1.112
@@ -629,8 +629,9 @@
if(fsa_diff_max_ms > 0) {
fsa_start = time_longclock();
}
- crm_debug_3("Invoked");
+ crm_debug_2("Invoked (queue len: %d)",
g_list_length(fsa_message_queue));
s_crmd_fsa(C_FSA_INTERNAL);
+ crm_debug_2("Exited (queue len: %d)",
g_list_length(fsa_message_queue));
if(fsa_diff_max_ms > 0) {
fsa_stop = time_longclock();
fsa_diff = sub_longclock(fsa_stop, fsa_start);
------------------------------
Message: 4
Date: Tue, 4 Apr 2006 11:15:44 -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:
CIB.py.in
Log Message:
Add per-series limits on the number of PE inputs to save and disable those
limits in CTS
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- CIB.py.in 3 Apr 2006 15:17:40 -0000 1.7
+++ CIB.py.in 4 Apr 2006 17:15:43 -0000 1.8
@@ -26,6 +26,9 @@
<nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>
<nvpair id="c-pref-9" name="default_resource_stickiness" value="0"/>
<nvpair id="c-pref-10" name="stonith_enabled" value="%d"/>
+ <nvpair id="c-pref-11" name="pe-error-series-max" value="-1"/>
+ <nvpair id="c-pref-12" name="pe-warn-series-max" value="-1"/>
+ <nvpair id="c-pref-13" name="pe-input-series-max" value="-1"/>
</attributes>
</cluster_property_set>'''
------------------------------
Message: 5
Date: Tue, 4 Apr 2006 11:15:44 -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
Log Message:
Add per-series limits on the number of PE inputs to save and disable those
limits in CTS
------------------------------
_______________________________________________
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 19
********************************************
