Masato Taruishi
taru****@sourc*****
2004年 6月 22日 (火) 19:10:07 JST
===================================================================
RCS file: ultrapossum/module/failover/01failover,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/failover/01failover 2004/04/02 02:34:09 1.11
+++ ultrapossum/module/failover/01failover 2004/06/22 10:10:07 1.12
@@ -97,7 +97,7 @@
if test "`ldapmaster_status`" = "running"; then
exit 0
fi
- if test "`status_pid $HAPIDFILE`" = "stopped"; then
+ if test "`$MODULEDIR/server/pid status $HAPIDFILE`" = "stopped"; then
exit 1
fi
sleep $i
@@ -107,10 +107,10 @@
exit 1) || exit 1
echo -n " `basename $SLAPD`"
if test "x$SLURPDSLAVES" != "x"; then
- wait_pid $SLURPD_PIDFILE
+ $MODULEDIR/server/pid wait $SLURPD_PIDFILE
echo -n " `basename $SLURPD`"
fi
- wait_pid $MONPIDFILE
+ $MODULEDIR/server/pid wait $MONPIDFILE
echo -n " mon"
}
@@ -121,7 +121,7 @@
if test "`$MODULEDIR/server/startup status`" = "running"; then
exit 0
fi
- if test "`status_pid $HAPIDFILE`" = "stopped"; then
+ if test "`$MODULEDIR/server/pid status $HAPIDFILE`" = "stopped"; then
exit 1
fi
sleep $i
@@ -141,6 +141,7 @@
ldapmaster_service_start()
{
+ echo "hi: $BACKUP"
if test "x$BACKUP" = "x" ; then
ldapmaster_start
else
@@ -170,14 +171,14 @@
fi
/etc/init.d/heartbeat stop | grep ERROR 1>&2 && exit 1
if test "x$HOST" = "x$MASTER"; then
- stop_pid $HAPIDFILE
+ $MODULEDIR/server/pid stop $HAPIDFILE
if test `ldapmaster_status` = "running"; then
echo -n " W: master running even though heartbeat stop " 1>&2
ldapmaster_stop
else
- if test "`status_pid $MONPIDFILE`" = "running"; then
+ if test "`$MODULEDIR/server/pid status $MONPIDFILE`" = "running"; then
echo -n " W: mon running even though heartbeat stop " 1>&2
- stop_pid $MONPIDFILE
+ $MODULEDIR/server/pid stop $MONPIDFILE
fi
echo -n "mon"
if test "$slurpd_running" = "1"; then
@@ -209,7 +210,7 @@
install -d $rpldir
$SLURPD -d $SLURPD_DEBUGLEVEL -f $ULTRAPOSSUM_MASTER_SLAPD_CONF -t $rpldir $SLURPD_EXTRA_ARGS &
echo $! > $SLURPD_PIDFILE
- wait_pid $SLURPD_PIDFILE
+ $MODULEDIR/server/pid wait $SLURPD_PIDFILE
echo -n " `basename $SLURPD`"
}
===================================================================
RCS file: ultrapossum/module/failover/recovery,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/recovery 2004/04/02 02:34:09 1.3
+++ ultrapossum/module/failover/recovery 2004/06/22 10:10:07 1.4
@@ -67,6 +67,7 @@
then
cp $RPLDIR/$OTHER/replica/slurpd.status $RPLDIR/$OWN/replica/slurpd.status || exit 1
elif [ $? -eq 1 ]; then
+ touch $RPLDIR/backup/slurpd.status
cp $RPLDIR/backup/slurpd.status $RPLDIR/$OWN/replica/slurpd.status || exit 1
else
exit 1