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: cts by andrew from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: include by andrew from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: resources by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Mon, 22 May 2006 05:03:41 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org 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: OCFMSDummy.in Log Message: Use the new meta namespace for CRM generated "parameters" NOTE: Neither the Filesystem (when cloned) nor the (master/slave) drbd agent functions correctly in any released version of Heartbeat - so these changes do not break backwards compatibility. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/cts/OCFMSDummy.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- OCFMSDummy.in 27 Mar 2006 15:54:35 -0000 1.2 +++ OCFMSDummy.in 22 May 2006 11:03:41 -0000 1.3 @@ -135,9 +135,9 @@ dummy_start() { - dummy_log "start instance #$OCF_RESKEY_clone slave" - do_start_resource $OCF_RESKEY_clone "slave" - if [ $OCF_RESKEY_clone -eq 0 ]; then + dummy_log "start instance #$OCF_RESKEY_CRM_meta_clone slave" + do_start_resource $OCF_RESKEY_CRM_meta_clone "slave" + if [ $OCF_RESKEY_CRM_meta_clone -eq 0 ]; then do_cmd $CRM_MASTER -v 1000 fi sleep $start_delay @@ -146,43 +146,43 @@ dummy_stop() { touch $DUMMY_RESOURCE - dummy_log "stop instance #$OCF_RESKEY_clone" - do_stop_resource $OCF_RESKEY_clone + dummy_log "stop instance #$OCF_RESKEY_CRM_meta_clone" + do_stop_resource $OCF_RESKEY_CRM_meta_clone rc=$? sleep $stop_delay return $rc } dummy_monitor() { - dummy_log "monitor instance #$OCF_RESKEY_clone" - dummy_get_status $OCF_RESKEY_clone + dummy_log "monitor instance #$OCF_RESKEY_CRM_meta_clone" + dummy_get_status $OCF_RESKEY_CRM_meta_clone rc=$? sleep $monitor_delay return $rc } dummy_promote() { - dummy_log "promote instance #$OCF_RESKEY_clone" - do_change_state $OCF_RESKEY_clone "master" + dummy_log "promote instance #$OCF_RESKEY_CRM_meta_clone" + do_change_state $OCF_RESKEY_CRM_meta_clone "master" rc=$? sleep $promote_delay return $rc } dummy_demote() { - dummy_log "demote instance #$OCF_RESKEY_clone" - do_change_state $OCF_RESKEY_clone "slave" + dummy_log "demote instance #$OCF_RESKEY_CRM_meta_clone" + do_change_state $OCF_RESKEY_CRM_meta_clone "slave" rc=$? sleep $demote_delay return $rc } dummy_notify() { - dummy_log "notify instance #$OCF_RESKEY_clone" + dummy_log "notify instance #$OCF_RESKEY_CRM_meta_clone" touch $DUMMY_RESOURCE sleep $notify_delay - local n_type="$OCF_RESKEY_notify_type" - local n_op="$OCF_RESKEY_notify_operation" + local n_type="$OCF_RESKEY_CRM_meta_notify_type" + local n_op="$OCF_RESKEY_CRM_meta_notify_operation" set -- $n_active_resource local n_active="$#" set -- $notify_stop_resource ------------------------------ Message: 2 Date: Mon, 22 May 2006 05:03:42 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : include Dir : linux-ha/include/crm Modified Files: crm.h Log Message: Use the new meta namespace for CRM generated "parameters" NOTE: Neither the Filesystem (when cloned) nor the (master/slave) drbd agent functions correctly in any released version of Heartbeat - so these changes do not break backwards compatibility. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- crm.h 22 May 2006 08:06:21 -0000 1.95 +++ crm.h 22 May 2006 11:03:41 -0000 1.96 @@ -1,4 +1,4 @@ -/* $Id: crm.h,v 1.95 2006/05/22 08:06:21 andrew Exp $ */ +/* $Id: crm.h,v 1.96 2006/05/22 11:03:41 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -47,7 +47,7 @@ #define CRM_DEPRECATED_SINCE_2_1_0 1 #define CRM_META "CRM_meta" -#if 0 +#if 1 # define crm_meta_name(field) CRM_META"_"field #else # define crm_meta_name(field) field @@ -89,7 +89,7 @@ #define CIB_FILENAME WORKING_DIR"/cib.xml" #define CIB_BACKUP WORKING_DIR"/cib_backup.xml" -#define CRM_FEATURE_SET "1.0.5" +#define CRM_FEATURE_SET "1.0.6" #define MSG_LOG 1 #define DOT_FSA_ACTIONS 1 ------------------------------ Message: 3 Date: Mon, 22 May 2006 05:03:42 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : resources Dir : linux-ha/resources/OCF Modified Files: Filesystem.in drbd.in ocf-shellfuncs.in Log Message: Use the new meta namespace for CRM generated "parameters" NOTE: Neither the Filesystem (when cloned) nor the (master/slave) drbd agent functions correctly in any released version of Heartbeat - so these changes do not break backwards compatibility. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- Filesystem.in 19 May 2006 13:58:16 -0000 1.21 +++ Filesystem.in 22 May 2006 11:03:41 -0000 1.22 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: Filesystem.in,v 1.21 2006/05/19 13:58:16 lars Exp $ +# $Id: Filesystem.in,v 1.22 2006/05/22 11:03:41 andrew Exp $ # # Support: [EMAIL PROTECTED] # 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.21 2006/05/19 13:58:16 lars Exp $ + $Id: Filesystem.in,v 1.22 2006/05/22 11:03:41 andrew Exp $ EOT } @@ -334,16 +334,16 @@ return $OCF_ERR_GENERIC fi - local n_type="$OCF_RESKEY_notify_type" - local n_op="$OCF_RESKEY_notify_operation" - local n_active="$OCF_RESKEY_notify_active_uname" + local n_type="$OCF_RESKEY_CRM_meta_notify_type" + local n_op="$OCF_RESKEY_CRM_meta_notify_operation" + local n_active="$OCF_RESKEY_CRM_meta_notify_active_uname" - case "$OCF_RESKEY_notify_type" in + case "$OCF_RESKEY_CRM_meta_notify_type" in *pre*) - case "$OCF_RESKEY_notify_operation" in + case "$OCF_RESKEY_CRM_meta_notify_operation" in *start*) # remove unames from notify_stop_uname - for UNAME in "$OCF_RESKEY_notify_stop_uname" + for UNAME in "$OCF_RESKEY_CRM_meta_notify_stop_uname" do n_active=${n_active//$UNAME} done @@ -354,19 +354,19 @@ esac ;; *post*) - case "$OCF_RESKEY_notify_operation" in + case "$OCF_RESKEY_CRM_meta_notify_operation" in *start*) # remove unames from notify_stop_uname - for UNAME in "$OCF_RESKEY_notify_stop_uname" + for UNAME in "$OCF_RESKEY_CRM_meta_notify_stop_uname" do n_active=${n_active//$UNAME} done # add unames from notify_start_uname - n_active="${n_active} $OCF_RESKEY_notify_start_uname" + n_active="${n_active} $OCF_RESKEY_CRM_meta_notify_start_uname" ;; *stop*) # remove unames from notify_stop_uname - for UNAME in "$OCF_RESKEY_notify_stop_uname" + for UNAME in "$OCF_RESKEY_CRM_meta_notify_stop_uname" do n_active=${n_active//$UNAME} done @@ -605,7 +605,7 @@ ocfs2_init() { # Check & initialize the OCFS2 specific variables. - if [ -z "$OCF_RESKEY_clone_max" ]; then + if [ -z "$OCF_RESKEY_CRM_meta_clone_max" ]; then ocf_log err "ocfs2 must be run as a clone." exit $OCF_ERR_GENERIC fi @@ -707,7 +707,7 @@ if [ "$FSTYPE" = "ocfs2" ]; then ocfs2_init else - if [ -n "$OCF_RESKEY_clone_max" ]; then + if [ -n "$OCF_RESKEY_CRM_meta_clone_max" ]; then ocf_log err "DANGER! $FSTYPE on $DEVICE is NOT cluster-aware!" ocf_log err "DO NOT RUN IT AS A CLONE!" ocf_log err "Politely refusing to proceed to avoid data corruption." =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- drbd.in 27 Apr 2006 19:54:37 -0000 1.23 +++ drbd.in 22 May 2006 11:03:41 -0000 1.24 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: drbd.in,v 1.23 2006/04/27 19:54:37 lars Exp $ +# $Id: drbd.in,v 1.24 2006/05/22 11:03:41 andrew Exp $ # # OCF Resource Agent compliant drbd resource script. # @@ -34,8 +34,8 @@ # OCF instance parameters # OCF_RESKEY_drbd_resource # OCF_RESKEY_drbdconf -# OCF_RESKEY_clone_max -# OCF_RESKEY_clone_node_max +# OCF_RESKEY_CRM_meta_clone_max +# OCF_RESKEY_CRM_meta_clone_node_max # OCF_RESKEY_master_max # OCF_RESKEY_master_node_max @@ -166,7 +166,7 @@ fi RESOURCE="$OCF_RESKEY_drbd_resource" - CLONE_NO="$OCF_RESKEY_clone" + CLONE_NO="$OCF_RESKEY_CRM_meta_clone" DRBDCONF="${OCF_RESKEY_drbdconf:=/etc/drbd.conf}" if [ ! -f "$DRBDCONF" ]; then @@ -381,13 +381,13 @@ } drbd_notify() { - local n_type="$OCF_RESKEY_notify_type" - local n_op="$OCF_RESKEY_notify_operation" - set -- $OCF_RESKEY_notify_active_resource + local n_type="$OCF_RESKEY_CRM_meta_notify_type" + local n_op="$OCF_RESKEY_CRM_meta_notify_operation" + set -- $OCF_RESKEY_CRM_meta_notify_active_resource local n_active="$#" - set -- $OCF_RESKEY_notify_stop_resource + set -- $OCF_RESKEY_CRM_meta_notify_stop_resource local n_stop="$#" - set -- $OCF_RESKEY_notify_start_resource + set -- $OCF_RESKEY_CRM_meta_notify_start_resource local n_start="$#" ocf_log debug "$RESOURCE notify: $n_type for $n_op - counts: active $n_active - starting $n_start - stopping $n_stop" @@ -456,8 +456,8 @@ return $OCF_ERR_CONFIGURED fi - if [ "$OCF_RESKEY_clone_max" -ne 2 ] \ - || [ "$OCF_RESKEY_clone_node_max" -ne 1 ] \ + if [ "$OCF_RESKEY_CRM_meta_clone_max" -ne 2 ] \ + || [ "$OCF_RESKEY_CRM_meta_clone_node_max" -ne 1 ] \ || [ "$OCF_RESKEY_master_node_max" -ne 1 ] \ || [ "$OCF_RESKEY_master_max" -ne 1 ] ; then ocf_log err "Clone options misconfigured." =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ocf-shellfuncs.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ocf-shellfuncs.in 24 Apr 2006 15:28:38 -0000 1.30 +++ ocf-shellfuncs.in 22 May 2006 11:03:41 -0000 1.31 @@ -1,5 +1,5 @@ # -# $Id: ocf-shellfuncs.in,v 1.30 2006/04/24 15:28:38 lars Exp $ +# $Id: ocf-shellfuncs.in,v 1.31 2006/05/22 11:03:41 andrew Exp $ # # Common helper functions for the OCF Resource Agents supplied by # heartbeat. @@ -123,7 +123,7 @@ # the CRM and/or left behind if the LRM fails. # # They can be identified in RA scripts by checking for: - # [ "${__OCF_ACTION}" = "monitor" -a "${OCF_RESKEY_interval}" = "0" ] + # [ "${__OCF_ACTION}" = "monitor" -a "${OCF_RESKEY_CRM_meta_interval}" = "0" ] # # Failed "slaves" should continue to use: OCF_ERR_GENERIC # Fully operational "slaves" should continue to use: OCF_SUCCESS ------------------------------ _______________________________________________ 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 68 ********************************************