ITS#3671 must release conn->c_mutex to allow blocked writers to exit

[openldap] / tests / scripts / test007-replication

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 527c0013543c67757b5d4a4136b184c8b8fd2cc2..e8f77b227729dd99bc3545efa4f140c7661826cb 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -192,13 +192,13 @@ echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
 echo "Stopping the slave..."
-kill $SLAVEPID
+kill -HUP $SLAVEPID
 KILLPIDS="$PID $SLURPPID"
 
 echo "Waiting 5 seconds for slave slapd to die..."
 sleep 5
 
-echo "Applying more changes..."
+echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
@@ -218,13 +218,13 @@ fi
 
 
 echo "Stopping slurpd..."
-kill $SLURPPID
+kill -HUP $SLURPPID
 KILLPIDS="$PID"
 
 echo "Waiting 5 seconds for slurpd to die..."
 sleep 5
 
-echo "Applying more changes..."
+echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
@@ -243,6 +243,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Restarting slave slapd on TCP/IP port $PORT2..."
+echo "RESTART" >> $LOG2
 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
@@ -263,7 +264,8 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Starting slurpd..."
+echo "Restarting slurpd..."
+echo "RESTART" >> $SLURPLOG
 $SLURPD -f $CONF1 -d ${SLURPD_DEBUG-5} -t $DBDIR1B >> $SLURPLOG 2>&1 &
 SLURPPID=$!
 if test $WAIT != 0 ; then
@@ -304,8 +306,8 @@ else
                exit $RC
        fi
 
-       echo "Waiting 5 seconds for slurpd to send changes..."
-       sleep 5
+       echo "Waiting 15 seconds for slurpd to send changes..."
+       sleep 15
 fi
 
 echo "Using ldapsearch to read all the entries from the master..."