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: resources by lars from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 25 May 2006 08:58:40 -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:
fsa_matrix.h
Log Message:
Novell #178764: I_ERROR should always result in a transition to S_RECOVERY
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa_matrix.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- fsa_matrix.h 22 Feb 2006 13:46:13 -0000 1.70
+++ fsa_matrix.h 25 May 2006 14:58:39 -0000 1.71
@@ -191,8 +191,8 @@
{
/* S_IDLE ==> */ S_RECOVERY,
/* S_ELECTION ==> */ S_RECOVERY,
- /* S_INTEGRATION ==> */ S_INTEGRATION,
- /* S_FINALIZE_JOIN ==> */ S_INTEGRATION,
+ /* S_INTEGRATION ==> */ S_RECOVERY,
+ /* S_FINALIZE_JOIN ==> */ S_RECOVERY,
/* S_NOT_DC ==> */ S_RECOVERY,
/* S_POLICY_ENGINE ==> */ S_RECOVERY,
/* S_RECOVERY ==> */ S_RECOVERY,
------------------------------
Message: 2
Date: Thu, 25 May 2006 11:15:57 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Filesystem.in
Log Message:
- In post-notify for a stop, the "start" list should be empty and
ignored.
- Ignore post-stop and pre-start.
- Enhance debug logging.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- Filesystem.in 23 May 2006 16:48:56 -0000 1.23
+++ Filesystem.in 25 May 2006 17:15:56 -0000 1.24
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.23 2006/05/23 16:48:56 lars Exp $
+# $Id: Filesystem.in,v 1.24 2006/05/25 17:15:56 lars 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.23 2006/05/23 16:48:56 lars Exp $
+ $Id: Filesystem.in,v 1.24 2006/05/25 17:15:56 lars Exp $
EOT
}
@@ -330,29 +330,45 @@
local n_stop="$OCF_RESKEY_CRM_meta_notify_stop_uname"
local n_start="$OCF_RESKEY_CRM_meta_notify_start_uname"
- if [ "$n_type" = "pre" ]; then
- if [ "$n_op" = "stop" ]; then
+ ocf_log debug "$OCFS2_UUID - notify: $n_type for $n_op"
+ ocf_log debug "$OCFS2_UUID - notify active: $n_active"
+ ocf_log debug "$OCFS2_UUID - notify stop: $n_stop"
+ ocf_log debug "$OCFS2_UUID - notify start: $n_start"
+
+ case "$n_type" in
+ pre)
+ case "$n_op" in
+ stop)
ocf_log debug "$OCFS2_UUID: ignoring pre-notify for
stop."
return $OCF_SUCCESS
- fi
- else
- # TODO: This should be safe, but I don't dare yet.
- # if [ "$n_op" = "start" ]; then
- # ocf_log debug "$OCFS2_UUID: ignoring post-notify for
start."
- # return $OCF_SUCCESS
- # fi
-
- # remove unames from notify_stop_uname; these have been
- # stopped and can no longer be considered active.
- for UNAME in "$n_stop"; do
- n_active="${n_active//$UNAME/}"
- done
- fi
- # These will be started/have been started. Prepare to
- # communicate with them.
- n_active="$n_active $n_start"
-
- ocf_log debug "$OCFS2_UUID - notify: $n_type for $n_op - active on
$n_active"
+ ;;
+ start)
+ # These are about to become active; prepare to
+ # communicate with them.
+ n_active="$n_active $n_start"
+ ;;
+ esac
+ ;;
+ post)
+ case "$n_op" in
+ stop)
+ # remove unames from notify_stop_uname; these have been
+ # stopped and can no longer be considered active.
+ for UNAME in "$n_stop"; do
+ n_active="${n_active//$UNAME/}"
+ done
+ ;;
+ start)
+ if [ "$n_op" = "start" ]; then
+ ocf_log debug "$OCFS2_UUID: ignoring
post-notify for start."
+ return $OCF_SUCCESS
+ fi
+ ;;
+ esac
+ ;;
+ esac
+
+ ocf_log debug "$OCFS2_UUID - post-processed active: $n_active"
local n_myself=${HA_CURHOST:-$(uname -n | tr A-Z a-z)}
ocf_log debug "$OCFS2_UUID: I am node $n_myself."
@@ -364,12 +380,11 @@
;;
esac
- # (1)
if [ -d "$OCFS2_FS_ROOT" ]; then
entry_prefix=$OCFS2_FS_ROOT/
for entry in $OCFS2_FS_ROOT/* ; do
n_fs="${entry##$entry_prefix}"
- ocf_log debug "$OCFS2_UUID: Found node $n_fs"
+# ocf_log debug "$OCFS2_UUID: Found current node $n_fs"
case " $n_active " in
*" $n_fs "*)
# Construct a list of nodes which are present
@@ -384,24 +399,22 @@
ocf_log warn "$OCFS2_UUID: Removing nodes on
start"
fi
ocf_log info "$OCFS2_UUID: Removing dead node: $n_fs"
- if rm -f $entry ; then
- ocf_log debug "$OCFS2_UUID: Removal of $n_fs
ok."
- else
+ if ! rm -f $entry ; then
ocf_log err "$OCFS2_UUID: Removal of $n_fs
failed!"
fi
;;
esac
done
else
- ocf_log info "$OCFS2_UUID: Doesn't exist yet, creating."
+ ocf_log info "$OCFS2_UUID: heartbeat directory doesn't exist
yet, creating."
mkdir -p $OCFS2_FS_ROOT
fi
- ocf_log debug "$OCFS2_UUID: Nodes which already exist: $n_exists"
+ ocf_log debug "$OCFS2_UUID: Existing node list: $n_exists"
# (2)
for entry in $n_active ; do
- ocf_log debug "$OCFS2_UUID: Expected active node: $entry"
+# ocf_log debug "$OCFS2_UUID: Expected active node: $entry"
case " $n_exists " in
*" $entry "*)
ocf_log debug "$OCFS2_UUID: Already active: $entry"
@@ -413,7 +426,6 @@
ocf_log info "$OCFS2_UUID: Activating node: $entry"
if ! ln -s $OCFS2_CLUSTER_ROOT/node/$entry
$OCFS2_FS_ROOT/$entry ; then
ocf_log err "$OCFS2_CLUSTER_ROOT/node/$entry:
failed to link"
- # exit $OCF_ERR_GENERIC
fi
;;
esac
------------------------------
_______________________________________________
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 82
********************************************
