Hello community, here is the log from the commit of package heartbeat checked in at Wed Apr 5 17:42:49 CEST 2006. -------- --- heartbeat/heartbeat.changes 2006-03-27 16:57:26.000000000 +0200 +++ heartbeat/heartbeat.changes 2006-04-05 17:26:43.000000000 +0200 @@ -1,0 +2,59 @@ +Wed Apr 5 17:25:44 CEST 2006 - lmb@suse.de + +- Reduce buildrequires dependencies by defaulting to path names. +- CRM fixes: + - Master/slave resources have been tested and work. + - "crm_role" now passed on to RAs as indication of m/s invocation. + - Election timer related fixes (OSDL #1151, #1154). + - Logging has been greatly enhanced and reduced in volume. + - Failcount only applies to recurring actions (monitor). + - crm_verify now can also optional save the CIB used (if invoked on + the live CIB) for reproduction. + - Better error handling and user feedback in cibadmin. + - CIB is now smaller by only saving the hash of the parameters in the + status section instead of the full list. + - DTD has been updated and the CIB can now be validated using xmllint + (OSDL #1169). + - crm_mon no longer displays provider for LSB/heartbeat class + resources. + - pengine now writes its inputs to disk under + /var/lib/heartbeat/pengine/, instead of logging them. Reduces log + flooding by 40% and improves supportability. + - New resource paramater "target_role" to specify that the admin wants + a resource to be Stopped (ie, not running), or to prevent it from + being promoted to Master. + - CIB better deals with invalid changes by the admin. + - cibadmin fixes for "Call cib_create failed (-25): The update was + empty" + - CIB deletions could cause a crash (OSDL #1141). + - Make sure logs are flushed before aborting. + - CIB now supports validation against the DTD to protect the admin + from inserting invalid XML when all nodes are 2.0.5 and up (OSDL + #1169). + - crmadmin help text advertised unimplemented commandline options + (#163517, #163563). +- GUI: + - Indicate refreshing progress in status bar to avoid appearing hung + (OSDL #1160). + - Further improved client-side caching for performance. + - Report why login to the server failed. + - Fixed a crash in conjunction with crm_resource -M (#154512, OSDL + #1176). + - Show whether a node is in standby mode or not (OSDL #1175, #1004). + - mgmtd memory leak fixed. + - Crashed daemon caused GUI to consume all CPU (OSDL #1157). +- LRM: + - Logging improvements. + - Do not send redundant notifications to crmd (OSDL #1083). + - Do report failure of class heartbeat resources (OSDL #1163). +- CIM provider: + - Detect http/https ports for openwbem (OSDL #1104, #151297). +- heartbeat core: + - Fix a crash in our IPC code on channel disconnect (OSDL #1182). +- Resource agents: + - ldirectord to use /dev/null instead of /dev/console when daemonized + (OSDL #1180). + - Remove stray "parameters" closing tag in OCFS2-enabled Filesystem + RA, causing GUI to not display help (#158531). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.tfQJAY/_old 2006-04-05 17:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.tfQJAY/_new 2006-04-05 17:41:23.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: heartbeat -BuildRequires: OpenIPMI-devel curl-devel drbd e2fsprogs-devel glib2-devel gnutls-devel iproute2 iptables iputils libnet libxml2-devel lynx lzo-devel mailx mdadm net-snmp-devel openssh openwbem-devel pam-devel python-devel python-gtk python-xml swig tcpd-devel +BuildRequires: OpenIPMI-devel curl-devel e2fsprogs-devel glib2-devel gnutls-devel iproute2 iptables iputils libnet libxml2-devel lynx lzo-devel net-snmp-devel openwbem-devel pam-devel python-devel python-gtk python-xml swig tcpd-devel %define sanity_check 0 %define with_extra_warnings 0 %define with_debugging 0 @@ -19,7 +19,7 @@ %define sanity_check_aborts_build 0 Summary: The Heartbeat Subsystem for High-Availability Linux Version: 2.0.4 -Release: 7 +Release: 8 License: GPL, LGPL URL: http://linux-ha.org/ Group: Productivity/Clustering/HA @@ -301,8 +301,7 @@ %{_libdir}/heartbeat/ccm* %{_libdir}/heartbeat/cib* %{_libdir}/heartbeat/clmtest -%{_libdir}/heartbeat/crmd -%{_libdir}/heartbeat/crmtest +%{_libdir}/heartbeat/crm* %{_libdir}/heartbeat/cts %{_libdir}/heartbeat/findif %{_libdir}/heartbeat/ha* @@ -371,6 +370,7 @@ # %ghost %attr (600, root, root) /var/lib/heartbeat/fifo %dir %attr (755, hacluster, haclient) /var/run/heartbeat/ccm %dir %attr (750, hacluster, haclient) /var/lib/heartbeat/crm +%dir %attr (750, hacluster, haclient) /var/lib/heartbeat/pengine %dir %attr (750, hacluster, haclient) /var/run/heartbeat/crm %dir /var/lib/heartbeat/cores %dir %attr (0700, root, root) /var/lib/heartbeat/cores/root @@ -431,6 +431,62 @@ %{_libdir}/pils %changelog -n heartbeat +* Wed Apr 05 2006 - lmb@suse.de +- Reduce buildrequires dependencies by defaulting to path names. +- CRM fixes: +- Master/slave resources have been tested and work. +- "crm_role" now passed on to RAs as indication of m/s invocation. +- Election timer related fixes (OSDL #1151, #1154). +- Logging has been greatly enhanced and reduced in volume. +- Failcount only applies to recurring actions (monitor). +- crm_verify now can also optional save the CIB used (if invoked on + the live CIB) for reproduction. +- Better error handling and user feedback in cibadmin. +- CIB is now smaller by only saving the hash of the parameters in the + status section instead of the full list. +- DTD has been updated and the CIB can now be validated using xmllint + (OSDL #1169). +- crm_mon no longer displays provider for LSB/heartbeat class + resources. +- pengine now writes its inputs to disk under + /var/lib/heartbeat/pengine/, instead of logging them. Reduces log + flooding by 40%% and improves supportability. +- New resource paramater "target_role" to specify that the admin wants + a resource to be Stopped (ie, not running), or to prevent it from + being promoted to Master. +- CIB better deals with invalid changes by the admin. +- cibadmin fixes for "Call cib_create failed (-25): The update was + empty" +- CIB deletions could cause a crash (OSDL #1141). +- Make sure logs are flushed before aborting. +- CIB now supports validation against the DTD to protect the admin + from inserting invalid XML when all nodes are 2.0.5 and up (OSDL + [#1169]). +- crmadmin help text advertised unimplemented commandline options + (#163517, #163563). +- GUI: +- Indicate refreshing progress in status bar to avoid appearing hung + (OSDL #1160). +- Further improved client-side caching for performance. +- Report why login to the server failed. +- Fixed a crash in conjunction with crm_resource -M (#154512, OSDL + [#1176]). +- Show whether a node is in standby mode or not (OSDL #1175, #1004). +- mgmtd memory leak fixed. +- Crashed daemon caused GUI to consume all CPU (OSDL #1157). +- LRM: +- Logging improvements. +- Do not send redundant notifications to crmd (OSDL #1083). +- Do report failure of class heartbeat resources (OSDL #1163). +- CIM provider: +- Detect http/https ports for openwbem (OSDL #1104, #151297). +- heartbeat core: +- Fix a crash in our IPC code on channel disconnect (OSDL #1182). +- Resource agents: +- ldirectord to use /dev/null instead of /dev/console when daemonized + (OSDL #1180). +- Remove stray "parameters" closing tag in OCFS2-enabled Filesystem + RA, causing GUI to not display help (#158531). * Mon Mar 27 2006 - lmb@suse.de - Logging updates. - CRM fixes: ++++++ heartbeat-CVS.tar.bz2 ++++++ ++++ 10077 lines of diff (skipped) ++++++ heartbeat-Filesystem-ocfs2.diff ++++++ --- /var/tmp/diff_new_pack.tfQJAY/_old 2006-04-05 17:41:34.000000000 +0200 +++ /var/tmp/diff_new_pack.tfQJAY/_new 2006-04-05 17:41:34.000000000 +0200 @@ -1,14 +1,32 @@ Index: resources/OCF/Filesystem.in =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v -retrieving revision 1.14 -diff -u -p -r1.14 Filesystem.in ---- resources/OCF/Filesystem.in 26 Jan 2006 18:00:05 -0000 1.14 -+++ resources/OCF/Filesystem.in 3 Feb 2006 16:23:25 -0000 -@@ -145,9 +145,31 @@ Any extra options to be given as -o opti - </parameter> - </parameters> +retrieving revision 1.17 +diff -u -r1.17 Filesystem.in +--- resources/OCF/Filesystem.in 10 Mar 2006 04:14:20 -0000 1.17 ++++ resources/OCF/Filesystem.in 5 Apr 2006 15:25:15 -0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $ ++# $Id: Filesystem.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $ + # + # Support: linux-ha@lists.linux-ha.org + # License: GNU General Public License (GPL) +@@ -95,7 +95,7 @@ + usage() { + cat <<-EOT + usage: $0 {start|stop|status|monitor|validate-all|meta-data} +- $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $ ++ $Id: Filesystem.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $ + EOT + } +@@ -143,11 +143,31 @@ + <shortdesc lang="en">options</shortdesc> + <content type="string" default="" /> + </parameter> ++ +<parameter name="ocfs2_cluster" unique="0"> +<longdesc lang="en"> +The name (UUID) of the OCFS2 cluster this filesystem is part of, @@ -18,7 +36,6 @@ +<shortdesc lang="en">OCFS2 cluster name/UUID</shortdesc> +<content type="string" default="" /> +</parameter> -+</parameters> + +<parameter name="ocfs2_configfs" unique="0"> +<longdesc lang="en"> @@ -28,8 +45,8 @@ +<shortdesc lang="en">OCFS2 configfs root</shortdesc> +<content type="string" default="" /> +</parameter> -+</parameters> -+ + </parameters> + <actions> <action name="start" timeout="60" /> <action name="stop" timeout="60" /> @@ -37,7 +54,7 @@ <action name="status" depth="0" timeout="10" interval="10" start-delay="10" /> <action name="monitor" depth="0" timeout="10" interval="10" start-delay="10" /> <action name="validate-all" timeout="5" /> -@@ -167,16 +189,10 @@ END +@@ -167,16 +187,10 @@ # flushbufs() { if @@ -57,7 +74,7 @@ fi return 0 -@@ -187,6 +203,13 @@ flushbufs() { +@@ -187,6 +201,13 @@ # Filesystem_start() { @@ -69,9 +86,9 @@ + fi + # See if the device is already mounted. - #$MOUNT | cut -d' ' -f3 | grep -e "^$MOUNTPOINT$" >/dev/null Filesystem_status >/dev/null 2>&1 -@@ -196,6 +219,8 @@ Filesystem_start() + if [ $? -eq $OCF_SUCCESS ] ; then +@@ -195,6 +216,8 @@ fi # Insert SCSI module @@ -80,7 +97,7 @@ $MODPROBE scsi_hostadapter >/dev/null 2>&1 if [ -z $FSTYPE ]; then -@@ -222,7 +247,7 @@ Filesystem_start() +@@ -221,7 +244,7 @@ if case $FSTYPE in @@ -89,7 +106,7 @@ *) true;; esac then -@@ -266,11 +291,154 @@ Filesystem_start() +@@ -265,11 +288,154 @@ } # end of Filesystem_start @@ -243,8 +260,8 @@ + # See if the device is currently mounted if - Filesystem_status >/dev/null 2>&1 -@@ -303,6 +471,7 @@ Filesystem_stop() + Filesystem_status >/dev/null 2>&1 +@@ -309,6 +475,7 @@ DEV=`$MOUNT | grep "on $MOUNTPOINT " | cut -d' ' -f1` # Unmount the filesystem $UMOUNT $MOUNTPOINT @@ -252,7 +269,7 @@ fi if [ $? -ne 0 ] ; then ocf_log err "Couldn't unmount $MOUNTPOINT" -@@ -313,7 +482,18 @@ Filesystem_stop() +@@ -319,7 +486,18 @@ : $MOUNTPOINT Not mounted. No problema! fi @@ -272,7 +289,7 @@ } # end of Filesystem_stop -@@ -339,6 +519,10 @@ Filesystem_status() +@@ -345,10 +523,14 @@ msg="$MOUNTPOINT is unmounted (stopped)" fi @@ -283,7 +300,12 @@ case "$OP" in status) ocf_log info "$msg";; esac -@@ -383,6 +567,63 @@ Filesystem_validate_all() +- return $rc ++ return_master $rc + } + # end of Filesystem_status + +@@ -383,6 +565,63 @@ return $OCF_SUCCESS } @@ -347,7 +369,7 @@ # Check the arguments passed to this script if [ $# -ne 1 ] -@@ -428,6 +669,17 @@ case $DEVICE in +@@ -428,6 +667,17 @@ ;; esac @@ -365,7 +387,7 @@ # It is possible that OCF_RESKEY_directory has one or even multiple trailing "/". # But the output of `mount` and /proc/mounts do not. if [ -z $OCF_RESKEY_directory ]; then -@@ -439,6 +691,8 @@ else +@@ -439,6 +689,8 @@ MOUNTPOINT=$(echo $OCF_RESKEY_directory | sed 's/\/*$//') : ${MOUNTPOINT:=/} # At this stage, $MOUNTPOINT does not contain trailing "/" unless it is "/" @@ -374,7 +396,7 @@ fi # Check to make sure the utilites are found -@@ -451,6 +705,8 @@ check_util $UMOUNT +@@ -451,6 +703,8 @@ case $OP in start) Filesystem_start ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...