Masato Taruishi
taru****@users*****
2004年 10月 13日 (水) 12:20:15 JST
===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/failover/11failover 2004/10/12 09:36:10 1.13
+++ ultrapossum/module/failover/11failover 2004/10/13 03:20:15 1.14
@@ -156,15 +156,21 @@
if test "x$BACKUP" = "x" ; then
ldapmaster_start
else
- if test "x`$MODULEDIR/server/startup slave_status`" = "xstopped"; then
- ldapslave_start
- echo -n " "
+ if test "x$HEARTBEAT_NICE_FAILBACK" != "x" &&
+ test "x$HEARTBEAT_AUTO_FAILBACK" = "xoff" ||
+ include "$HOST" "$SYNCBACKUPS" ||
+ test "x$HOST" = "x$BACKUP"
+ then
+ if test "x`$MODULEDIR/server/startup slave_status`" = "xstopped"; then
+ ldapslave_start
+ echo -n " "
+ fi
fi
/etc/init.d/heartbeat start | grep ERROR 1>&2 && exit 1
$MODULEDIR/server/pid wait $HAPIDFILE
echo -n "heartbeat"
if test "x$HOST" = "x$MASTER"; then
- if test "x$HEARTBEAT_NICE_FAILBACK" = "x" || test "x$HEARTBEAT_AUTO_FAILBACK" = "xon"; then
+ if test "x$HEARTBEAT_NICE_FAILBACK" = "x" || test "x$HEARTBEAT_AUTO_FAILBACK" != "xoff"; then
wait_master_service
else
wait_backup_service