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])
----------------------------------------------------------------------
Message: 1
Date: Mon, 21 Nov 2005 19:40:24 -0700 (MST)
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/tengine
Modified Files:
utils.c
Log Message:
Timer fixes prompted by BEAM complaints
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/utils.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- utils.c 14 Sep 2005 15:24:48 -0000 1.45
+++ utils.c 22 Nov 2005 02:40:24 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.45 2005/09/14 15:24:48 andrew Exp $ */
+/* $Id: utils.c,v 1.46 2005/11/22 02:40:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -379,7 +379,7 @@
if(timer->source_id > 0) {
Gmain_timeout_remove(timer->source_id);
}
- timer->source_id = -1;
+ timer->source_id = 0;
crm_warn("Timer popped in state=%d", te_fsa_state);
if(timer->reason == timeout_abort) {
@@ -430,9 +430,10 @@
gboolean
start_te_timer(te_timer_t *timer)
{
- if(((int)timer->source_id) < 0 && timer->timeout > 0) {
+ if(timer->source_id != 0) {
timer->source_id = Gmain_timeout_add(
timer->timeout, timer_callback, (void*)timer);
+ CRM_ASSERT(timer->source_id != 0);
return TRUE;
} else if(timer->timeout < 0) {
@@ -453,9 +454,9 @@
return FALSE;
}
- if(((int)timer->source_id) > 0) {
+ if(timer->source_id != 0) {
Gmain_timeout_remove(timer->source_id);
- timer->source_id = -2;
+ timer->source_id = 0;
} else {
return FALSE;
------------------------------
Message: 2
Date: Mon, 21 Nov 2005 19:43:21 -0700 (MST)
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/test
Modified Files:
1node.sh.in 2node-fail.sh.in 2node-fence.sh.in 2node.sh.in
3node-fail.sh.in 3node-rapid.sh.in 3node.sh.in cib_suite.sh.in
helper.sh.in
Log Message:
Allow BSC to pass on Tiger
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/1node.sh.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- 1node.sh.in 26 Aug 2005 08:54:32 -0000 1.32
+++ 1node.sh.in 22 Nov 2005 02:43:21 -0000 1.33
@@ -53,7 +53,7 @@
#----
do_cmd echo Create the first constraint and wait for S_IDLE
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint $test_node_1 rsc1 can
cts_assert "Creation of first constraint failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
120 \
@@ -63,7 +63,7 @@
#----
do_cmd echo Create the second constraint and wait for S_IDLE
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint $test_node_1 rsc2 can
cts_assert "Creation of second constraint failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
120 \
@@ -75,7 +75,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair id=\\\"bsc-ip-1\\\" name=\\\"ip\\\" value=\\\"${ip_rsc_1}\\\"/>"
args="$args <nvpair id=\\\"ident-string-1\\\" name=\\\"ident-string\\\"
value=\\\"Linux-HA TEST configuration file - REMOVEME!!\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 ocf IPaddr - - - $args
cts_assert "Creation of first resource failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
300 \
@@ -88,7 +88,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair id=\\\"bsc-ip-2\\\" name=\\\"ip\\\" value=\\\"${ip_rsc_2}\\\"/>"
args="$args <nvpair id=\\\"ident-string-2\\\" name=\\\"ident-string\\\"
value=\\\"Linux-HA TEST configuration file - REMOVEME!!\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 ocf IPaddr - - - $args
cts_assert "Creation of second resource failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
300 \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/2node-fail.sh.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- 2node-fail.sh.in 8 Apr 2005 13:41:34 -0000 1.17
+++ 2node-fail.sh.in 22 Nov 2005 02:43:21 -0000 1.18
@@ -51,7 +51,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_1}"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_1} ccm(.*) info: Hostname: ${test_node_1}" \
@@ -62,7 +62,7 @@
#----
do_cmd echo "wait for CRMd to start on ${test_node_1}"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_1} crmd(.*) info:(.*)FSA Hostname: ${test_node_1}" \
@@ -85,7 +85,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_1}\\\"/>
</rule>
</rsc_location>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -104,7 +104,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_2}\\\"/>
</rule>
</rsc_location>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -114,7 +114,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_1}\\\"/>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - ignore $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -125,7 +125,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_2}\\\"/>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - ignore $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -159,7 +159,7 @@
#----
do_cmd echo "wait for HA to start on $test_node_2"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_2} ccm(.*) Hostname: ${test_node_2}" \
@@ -170,7 +170,7 @@
#----
do_cmd echo "wait for CRMd to start on $test_node_2"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_2} crmd(.*)FSA Hostname: ${test_node_2}" \
@@ -209,7 +209,7 @@
test_for_election=$?
do_cmd echo Killing $fail_pieces on $fail_node
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $ADMIN_USER $fail_node "killall -9 $fail_pieces" &
if [ $test_for_election = 0 ]; then
@@ -259,7 +259,7 @@
do_cmd echo "HA still running, skipping restart"
else
do_cmd echo "wait for HA to start on $fail_node"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $fail_node $HALIB_DIR/heartbeat -M
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile}
--search -a -m 5000 \
-s "${fail_node} ccm(.*) Hostname: ${fail_node}" \
@@ -271,7 +271,7 @@
#----
do_cmd echo "wait for CRMd to start on $fail_node"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $fail_node $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search
-a -m 20000 \
-s "${fail_node} crmd(.*)FSA Hostname: ${fail_node}" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/2node-fence.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- 2node-fence.sh.in 8 Apr 2005 13:41:34 -0000 1.4
+++ 2node-fence.sh.in 22 Nov 2005 02:43:21 -0000 1.5
@@ -51,7 +51,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_1}"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_1} ccm(.*) info: Hostname: ${test_node_1}" \
@@ -62,7 +62,7 @@
#----
do_cmd echo "wait for CRMd to start on ${test_node_1}"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_1} crmd(.*) info:(.*)FSA Hostname: ${test_node_1}" \
@@ -85,7 +85,7 @@
<expression attribute=\"uname\" operation=\"eq\"
value=\"${test_node_1}\"/>
</rule>
</rsc_location>'"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -104,7 +104,7 @@
<expression attribute=\"uname\" operation=\"eq\"
value=\"${test_node_2}\"/>
</rule>
</rsc_location>'"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -114,7 +114,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\"1\" value=\"${ip_rsc_1}\"/>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - stonith $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -125,7 +125,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\"1\" value=\"${ip_rsc_2}\"/>"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - stonith $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -135,7 +135,7 @@
#----
do_cmd echo Create the fencing resource and wait for S_IDLE after start
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_incarnation $test_node_1 fence1 stonith null 2 - - ignore
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -169,7 +169,7 @@
#----
do_cmd echo "wait for HA to start on $test_node_2"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_2} ccm(.*) Hostname: ${test_node_2}" \
@@ -180,7 +180,7 @@
#----
do_cmd echo "wait for CRMd to start on $test_node_2"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a
-m 5000 \
-s "${test_node_2} crmd(.*)FSA Hostname: ${test_node_2}" \
@@ -219,7 +219,7 @@
test_for_election=$?
do_cmd echo Killing $fail_pieces on $fail_node
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $ADMIN_USER $fail_node "killall -9 $fail_pieces" &
if [ $test_for_election = 0 ]; then
@@ -269,7 +269,7 @@
do_cmd echo "HA still running, skipping restart"
else
do_cmd echo "wait for HA to start on $fail_node"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $fail_node $HALIB_DIR/heartbeat -M
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile}
--search -a -m 5000 \
-s "${fail_node} ccm(.*) Hostname: ${fail_node}" \
@@ -281,7 +281,7 @@
#----
do_cmd echo "wait for CRMd to start on $fail_node"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $fail_node $HALIB_DIR/crmd "$CRM_OPTS"
"2>&1 >/dev/null" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search
-a -m 20000 \
-s "${fail_node} crmd(.*)FSA Hostname: ${fail_node}" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/2node.sh.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- 2node.sh.in 8 Apr 2005 13:41:34 -0000 1.32
+++ 2node.sh.in 22 Nov 2005 02:43:21 -0000 1.33
@@ -65,7 +65,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_1}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
100 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -84,7 +84,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_2}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
100 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -94,7 +94,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_1}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
200 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -105,7 +105,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_2}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
200 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/3node-fail.sh.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- 3node-fail.sh.in 8 Apr 2005 13:41:34 -0000 1.10
+++ 3node-fail.sh.in 22 Nov 2005 02:43:21 -0000 1.11
@@ -35,7 +35,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_1}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_1} ccm(.*) info: Hostname: ${test_node_1}" \
@@ -46,7 +46,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_2}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_2} ccm(.*) info: Hostname: ${test_node_2}" \
@@ -57,7 +57,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_3 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_3} ccm(.*) info: Hostname: ${test_node_3}" \
@@ -68,7 +68,7 @@
#----
do_cmd echo "wait for CRMd to start on ${test_node_1}, ${test_node_2} and
${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_3 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
@@ -117,7 +117,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_2}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -140,7 +140,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_1}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -150,7 +150,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_1}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - ignore $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -161,7 +161,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_2}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - ignore $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -186,7 +186,7 @@
#----
do_cmd echo Kill CRM on $test_node_1
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $ADMIN_USER $test_node_1 "killall -9 crmd" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
10000 \
-s "crmd(.*) State transition (.*) \-> S_ELECTION"
@@ -220,7 +220,7 @@
#----
do_cmd echo Kill the CRM, CCM and Heartbeat on $test_node_2
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $ADMIN_USER $test_node_2 "killall -9 heartbeat crmd lrmd
ccm" &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
5000 \
-s "crmd(.*) State transition S_NOT_DC \-> S_ELECTION"
@@ -250,7 +250,7 @@
#----
do_cmd echo Shutdown $test_node_3
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_3 $HALIB_DIR/crmadmin -K $test_node_3
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
5000 \
-s "${test_node_3} crmd(.*)State transition (.*) \-> S_PENDING" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/3node-rapid.sh.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- 3node-rapid.sh.in 8 Apr 2005 13:41:34 -0000 1.16
+++ 3node-rapid.sh.in 22 Nov 2005 02:43:21 -0000 1.17
@@ -35,7 +35,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_1}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_1} ccm(.*) info: Hostname: ${test_node_1}" \
@@ -46,7 +46,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_2}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_2} ccm(.*) info: Hostname: ${test_node_2}" \
@@ -57,7 +57,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_3 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_3} ccm(.*) info: Hostname: ${test_node_3}" \
@@ -68,7 +68,7 @@
#----
do_cmd echo "wait for CRMd to start on ${test_node_1}, ${test_node_2} and
${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_3 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
@@ -117,7 +117,7 @@
<expression attribute=\"uname\" operation=\"eq\"
value=\"${test_node_2}\"/>
</rule>
</rsc_location>'"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> \"S_IDLE\""
@@ -140,7 +140,7 @@
<expression attribute=\"uname\" operation=\"eq\"
value=\"${test_node_1}\"/>
</rule>
</rsc_location>'"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> \"S_IDLE\""
@@ -150,7 +150,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\"1\" value=\"${ip_rsc_1}\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
2500 \
-s "crmd(.*) State transition (.*) \-> \"S_IDLE\"" \
@@ -161,7 +161,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\"1\" value=\"${ip_rsc_2}\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
2500 \
-s "crmd(.*) State transition (.*) \-> \"S_IDLE\"" \
@@ -186,7 +186,7 @@
#----
do_cmd echo Shutdown $test_node_1
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmadmin -K $test_node_1 &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
10000 \
-s "crmd(.*) State transition (.*) \-> \"S_ELECTION\"" \
@@ -227,7 +227,7 @@
#----
do_cmd echo Shutdown $test_node_2
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmadmin -K $test_node_2 &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
10000 \
-s "crmd(.*) State transition (.*) \-> \"S_ELECTION\"" \
@@ -265,7 +265,7 @@
#----
do_cmd echo Shutdown $test_node_3
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_3 $HALIB_DIR/crmadmin -K $test_node_3
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
5000 \
-s "${test_node_3} crmd(.*)State transition (.*) \-> \"S_PENDING\"" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/3node.sh.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- 3node.sh.in 8 Apr 2005 13:41:34 -0000 1.14
+++ 3node.sh.in 22 Nov 2005 02:43:21 -0000 1.15
@@ -35,7 +35,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_1}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_1} ccm(.*) info: Hostname: ${test_node_1}" \
@@ -46,7 +46,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_2}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_2} ccm(.*) info: Hostname: ${test_node_2}" \
@@ -57,7 +57,7 @@
#----
do_cmd echo "wait for HA to start on ${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_3 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null"
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
500 \
-s "${test_node_3} ccm(.*) info: Hostname: ${test_node_3}" \
@@ -68,7 +68,7 @@
#----
do_cmd echo "wait for CRMd to start on ${test_node_1}, ${test_node_2} and
${test_node_3}"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
do_cmd remote_cmd $CRMD_USER $test_node_3 $HALIB_DIR/crmd -VVVV "2>&1
>/dev/null" &
@@ -117,7 +117,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_2}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -140,7 +140,7 @@
<expression attribute=\\\"uname\\\" operation=\\\"eq\\\"
value=\\\"${test_node_1}\\\"/>
</rule>
</rsc_location>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_constraint_adv $test_node_1 $node_xml
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
1500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -150,7 +150,7 @@
do_cmd echo Create the first resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_1}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc1 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -161,7 +161,7 @@
do_cmd echo Create the second resource and wait for S_IDLE after start
args="<nvpair name=\\\"1\\\" value=\\\"${ip_rsc_2}\\\"/>"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd make_resource $test_node_1 rsc2 heartbeat IPaddr - - - $args
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
2500 \
-s "crmd(.*) State transition (.*) \-> S_IDLE" \
@@ -186,7 +186,7 @@
#----
do_cmd echo Shutdown $test_node_1
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_1 $HALIB_DIR/crmadmin -K $test_node_1 &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
10000 \
-s "crmd(.*) State transition (.*) \-> S_ELECTION" \
@@ -227,7 +227,7 @@
#----
do_cmd echo Shutdown $test_node_2
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $CRMD_USER $test_node_2 $HALIB_DIR/crmadmin -K $test_node_2 &
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
10000 \
-s "crmd(.*) State transition (.*) \-> S_ELECTION" \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/cib_suite.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cib_suite.sh.in 18 Jan 2005 20:33:03 -0000 1.3
+++ cib_suite.sh.in 22 Nov 2005 02:43:21 -0000 1.4
@@ -434,7 +434,7 @@
#----
do_cmd echo "wait for HA to start"
-crm_log_pos=$(stat -L -c %s $logfile)
+crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $test_node_1 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd remote_cmd $INIT_USER $test_node_2 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
do_cmd remote_cmd $INIT_USER $test_node_3 $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/helper.sh.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- helper.sh.in 31 Oct 2005 09:04:33 -0000 1.73
+++ helper.sh.in 22 Nov 2005 02:43:21 -0000 1.74
@@ -63,6 +63,16 @@
bsc_mode=0
crm_only=0
+STAT_OPTS="-c %s"
+KILL_OPTS="-q9"
+PS_OPTS="axf"
+arch=`uname -s`
+if [ "z$arch" = "zDarwin" ]; then
+ STAT_OPTS="-f %z"
+ KILL_OPTS="-9"
+ PS_OPTS="-ax"
+fi
+
if [ ! -z "$CRM_LOCAL_OPTS" ]; then
echo "Checking $CRM_LOCAL_OPTS for local options"
if [ -f "$CRM_LOCAL_OPTS" ]; then
@@ -112,7 +122,7 @@
export test_dump_dir="$dump_dir/$test_type/$date_str"
mkdir -p "$test_dump_dir"
echo Test dir: $test_dump_dir
- crm_test_log_start=$(stat -L -c %s $logfile)
+ crm_test_log_start=$(stat -L ${STAT_OPTS} $logfile)
}
function remote_cmd() {
@@ -137,7 +147,7 @@
srch_node=""
fi
do_cmd echo "wait for HA to start on $ha_node"
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd remote_cmd $INIT_USER $ha_node $HALIB_DIR/heartbeat -M "2>&1
>/dev/null" &
if [ $local_version = "1" ]; then
do_cmd ${testdir}/testutils.pl -l ${logfile} -p $crm_log_pos --search
-a -m 100 \
@@ -156,7 +166,7 @@
do_cmd echo "Check if CRMd was started too"
do_cmd remote_cmd $INIT_USER $ha_node "killall -INT crmd"
if [ $? = 1 ]; then
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
do_cmd echo "wait for CRMd to start on $ha_node"
do_cmd remote_cmd $CRMD_USER $ha_node $HALIB_DIR/crmd "$CRM_OPTS" "2>&1
>/dev/null" &
fi
@@ -172,7 +182,7 @@
a_node=$1; shift;
down_cmd=$1; shift;
do_cmd echo Shutdown $a_node
- crm_log_pos=$(stat -L -c %s $logfile)
+ crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
srch_node="$a_node "
if [ $local_version = "1" ]; then
@@ -471,7 +481,7 @@
node_num=`expr $node_num + 1`
done
- crm_test_log_end=$(stat -L -c %s $logfile)
+ crm_test_log_end=$(stat -L ${STAT_OPTS} $logfile)
do_cmd echo "ERROR: $*"
do_cmd echo "test $test_type: FAILED"
if [ $bsc_mode = 0 ]; then
@@ -490,8 +500,8 @@
dump_file="/tmp/${a_node_index}-${a_node}.tgz"
remote_cmd $ADMIN_USER ${a_node} "mkdir /tmp/crm"
- remote_cmd $ADMIN_USER ${a_node} "stat -L -c %s $logfile >
/tmp/crm/.logend"
- remote_cmd ${ADMIN_USER} ${a_node} "ps axf > /tmp/crm/processes"
+ remote_cmd $ADMIN_USER ${a_node} "stat -L ${STAT_OPTS} $logfile >
/tmp/crm/.logend"
+ remote_cmd ${ADMIN_USER} ${a_node} "ps ${PS_OPTS} > /tmp/crm/processes"
remote_cmd ${ADMIN_USER} ${a_node} "$HALIB_DIR/crmtest/testutils.pl --dump
-pf /tmp/crm/.logstart -l $logfile > /tmp/crm/cluster-test.log"
# `which ssh` [EMAIL PROTECTED] "$HALIB_DIR/crmtest/testutils.pl --dump -pf
/tmp/crm/.logstart -epf /tmp/crm/.logend -l $logfile >
/tmp/crm/cluster-test.log"
@@ -626,7 +636,7 @@
do_cmd echo Cleaning up on $ha_host
# be *very* sure everything has stopped
- do_cmd remote_cmd $INIT_USER $ha_host "killall -q9 heartbeat ccm lrmd crmd
crmadmin cibadmin ha_logd stonithd cib pengine tengine"
+ do_cmd remote_cmd $INIT_USER $ha_host "killall ${KILL_OPTS} heartbeat ccm
lrmd crmd crmadmin cibadmin ha_logd stonithd cib pengine tengine"
# resources too
do_cmd remote_cmd $INIT_USER $ha_host "/etc/ha.d/resource.d/IPaddr
$ip_rsc_1 stop" 2>&1 > /dev/null
@@ -646,7 +656,7 @@
if [ `dirname $logfile` = "/tmp/crm" ]; then
do_cmd remote_cmd $INIT_USER $ha_host "/etc/init.d/syslog restart"
fi
- remote_cmd $ADMIN_USER $ha_host "stat -L -c %s $logfile >
/tmp/crm/.logstart"
+ remote_cmd $ADMIN_USER $ha_host "stat -L ${STAT_OPTS} $logfile >
/tmp/crm/.logstart"
do_cmd remote_cmd $ADMIN_USER $ha_host "logger -i -p local7.info
__crmtest_${test_type}_log_mark__"
do_cmd sleep 2
do_cmd remote_cmd $ADMIN_USER $ha_host "echo 1 >
/proc/sys/kernel/core_uses_pid"
@@ -657,7 +667,7 @@
function mark_log()
{
- export crm_log_pos=$(stat -L -c %s $logfile)
+ export crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
}
function gres()
@@ -695,7 +705,7 @@
# successfully sourced
if [ $local_version = 1 ]; then
- test_node_1=`uname -n`
+ test_node_1=`uname -n | tr 'A-Z' 'a-z'`
test_node_2=""
test_node_3=""
echo "Set test_node_1=\"$test_node_1\""
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 62
********************************************
