mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-24 13:24:56 +08:00
Wait for central master to start after final restart.
Narrow tests for failed entry removal: 'RC = success' -> 'rc != noSuchObject'.
This commit is contained in:
parent
108dc0ef25
commit
1381825003
@ -2352,11 +2352,16 @@ EOF
|
||||
for i in 1 2 3 4 5; do
|
||||
$LDAPSEARCH -s base -b "$SUB_DN" -H $URI1 > /dev/null 2>&1
|
||||
RC=$?
|
||||
if test $RC != 0; then break; fi
|
||||
if test $RC = 32; then break; fi
|
||||
sleep $i
|
||||
done
|
||||
|
||||
if test $RC = 0; then
|
||||
if test $RC != 32; then
|
||||
if test $RC != 0; then
|
||||
echo "ldapsearch failed ($RC)!"
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
echo "ERROR: Entry not removed on central master!"
|
||||
RACE_ERROR=1
|
||||
break
|
||||
@ -2371,8 +2376,8 @@ EOF
|
||||
sleep $i
|
||||
done
|
||||
|
||||
if test $RC = 0; then
|
||||
echo "ERROR: Entry not removed on central search!"
|
||||
if test $RC != 32; then
|
||||
echo "ERROR: Entry not removed on central search! (RC=$RC)"
|
||||
RACE_ERROR=1
|
||||
break
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user