Use provider instead of producer, as provider is a very specific term in replication

This commit is contained in:
Quanah Gibson-Mount 2011-01-04 01:30:28 +00:00
parent 54e2b1464e
commit b330d7630a
10 changed files with 120 additions and 120 deletions

View File

@ -25,7 +25,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
#
# Test replication:
# - start producer
# - start provider
# - start consumer
# - populate over ldap
# - perform some modifies and deleted
@ -33,7 +33,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
@ -45,7 +45,7 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -63,7 +63,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to create the context prefix entry in the producer..."
echo "Using ldapadd to create the context prefix entry in the provider..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDCP > /dev/null 2>&1
RC=$?
@ -103,7 +103,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to populate the producer directory..."
echo "Using ldapadd to populate the provider directory..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDNOCP > /dev/null 2>&1
RC=$?
@ -116,7 +116,7 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Using ldapmodify to modify producer directory..."
echo "Using ldapmodify to modify provider directory..."
#
# Do some modifications
@ -215,7 +215,7 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Performing modrdn alone on the producer..."
echo "Performing modrdn alone on the provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: dc=testdomain2,dc=example,dc=com
@ -235,7 +235,7 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Performing modify alone on the producer..."
echo "Performing modify alone on the provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: dc=itsdomain2,dc=example,dc=com
@ -255,7 +255,7 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Performing larger modify on the producer..."
echo "Performing larger modify on the provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com
@ -312,13 +312,13 @@ fi
OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -336,16 +336,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
exit 1
fi

View File

@ -27,7 +27,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
#
# Test replication:
# - start producer
# - start provider
# - start consumer
# - populate over ldap
# - perform some modifies and deleted
@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
@ -47,7 +47,7 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -65,7 +65,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to create the context prefix entry in the producer..."
echo "Using ldapadd to create the context prefix entry in the provider..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDCP > /dev/null 2>&1
RC=$?
@ -105,7 +105,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to populate the producer directory..."
echo "Using ldapadd to populate the provider directory..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDNOCP > /dev/null 2>&1
RC=$?
@ -118,13 +118,13 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -140,16 +140,16 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi
@ -169,7 +169,7 @@ KILLPIDS="$PID $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -190,7 +190,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapmodify to modify producer directory..."
echo "Using ldapmodify to modify provider directory..."
#
# Do some modifications
@ -327,13 +327,13 @@ fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -349,16 +349,16 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi
@ -367,7 +367,7 @@ echo "Stopping consumer to test recovery..."
kill -HUP $SLAVEPID
wait $SLAVEPID
echo "Modifying more entries on the producer..."
echo "Modifying more entries on the provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \
$TESTOUT 2>&1 << EOMODS
dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com
@ -424,13 +424,13 @@ KILLPIDS="$PID $SLAVEPID"
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -446,16 +446,16 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi
@ -495,13 +495,13 @@ EOMODS
sleep $SLEEP1
fi
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -517,16 +517,16 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi

View File

@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR2
#
# Test replication:
# - start producer
# - start provider
# - start consumer
# - populate over ldap
# - perform some modifies and deleted
@ -42,7 +42,7 @@ mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR2
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $DSRMASTERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
@ -54,7 +54,7 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -72,7 +72,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to create the context prefix entries in the producer..."
echo "Using ldapadd to create the context prefix entries in the provider..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDCP > /dev/null 2>&1
RC=$?
@ -112,7 +112,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to populate the producer directory..."
echo "Using ldapadd to populate the provider directory..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDNOCP > /dev/null 2>&1
RC=$?
@ -139,7 +139,7 @@ KILLPIDS="$PID $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -157,7 +157,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapmodify to modify producer directory..."
echo "Using ldapmodify to modify provider directory..."
#
# Do some modifications
@ -249,7 +249,7 @@ echo "Stopping consumer to test recovery..."
kill -HUP $SLAVEPID
sleep 10
echo "Modifying more entries on the producer..."
echo "Modifying more entries on the provider..."
$LDAPMODIFY -v -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \
$TESTOUT 2>&1 << EOMODS
dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com
@ -314,13 +314,13 @@ EOMODS
sleep $SLEEP1
fi
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'objectclass=*' \* + > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -338,16 +338,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER -s bdb=a,hdb=a < $MASTEROUT | grep -iv "^auditcontext:" > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER -s bdb=a,hdb=a < $SLAVEOUT | grep -iv "^auditcontext:" > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
exit 1
fi

View File

@ -50,7 +50,7 @@ esac
#
# Test replication of dynamic config:
# - start producer
# - start provider
# - start consumer
# - configure over ldap
# - populate over ldap
@ -58,7 +58,7 @@ esac
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
cd $PRODIR
@ -73,7 +73,7 @@ cd $TESTWD
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "" -H $URI1 \
'objectclass=*' > /dev/null 2>&1
@ -91,7 +91,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Inserting syncprov overlay on producer..."
echo "Inserting syncprov overlay on provider..."
if [ "$SYNCPROV" = syncprovmod ]; then
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
dn: cn=module,cn=config
@ -200,7 +200,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Adding schema and databases on producer..."
echo "Adding schema and databases on provider..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
include: file://$ABS_SCHEMADIR/core.ldif
@ -283,7 +283,7 @@ EOF
;;
esac
echo "Using ldapadd to populate producer..."
echo "Using ldapadd to populate provider..."
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \
>> $TESTOUT 2>&1
RC=$?
@ -316,7 +316,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Replacing olcSyncrepl on producer..."
echo "Replacing olcSyncrepl on provider..."
$LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: olcDatabase={0}config,cn=config
changetype: modify
@ -328,13 +328,13 @@ EOF
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Using ldapsearch to read config from the producer..."
echo "Using ldapsearch to read config from the provider..."
$LDAPSEARCH -b cn=config -D cn=config -H $URI1 -y $CONFIGPWF \
'objectclass=*' > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -350,27 +350,27 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved configs from producer and consumer..."
echo "Comparing retrieved configs from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer configs differ"
echo "test failed - provider and consumer configs differ"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1
fi
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI1 -w $PASSWD \
'objectclass=*' > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -388,16 +388,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
exit 1
fi

View File

@ -56,7 +56,7 @@ fi
cat /dev/null > $TESTOUT
if [ "$MEMBEROF" = memberofmod ]; then
echo "Inserting memberof overlay on producer..."
echo "Inserting memberof overlay on provider..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
dn: cn=module,cn=config
objectClass: olcModuleList

View File

@ -61,7 +61,7 @@ case "$SYNCMODE" in
;;
esac
echo "Initializing producer configurations..."
echo "Initializing provider configurations..."
$SLAPADD -F $CFPROD -n 0 <<EOF
dn: cn=config
objectClass: olcGlobal
@ -75,7 +75,7 @@ olcRootPW:< file://$CONFIGPWF
EOF
echo "Initializing producer2 configurations..."
echo "Initializing provider2 configurations..."
$SLAPADD -F $CFPRO2 -n 0 <<EOF
dn: cn=config
objectClass: olcGlobal
@ -99,7 +99,7 @@ olcDatabase: {0}config
olcRootPW:< file://$CONFIGPWF
EOF
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
cd $PRODDIR
$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
@ -110,7 +110,7 @@ fi
KILLPIDS="$KILLPIDS $PID"
cd $TESTWD
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "" -H $URI1 \
'objectclass=*' > /dev/null 2>&1
@ -127,7 +127,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Starting producer2 slapd on TCP/IP port $PORT2..."
echo "Starting provider2 slapd on TCP/IP port $PORT2..."
cd $PRO2DIR
$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
PID=$!
@ -138,7 +138,7 @@ fi
KILLPIDS="$KILLPIDS $PID"
cd $TESTWD
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "" -H $URI2 \
'objectclass=*' > /dev/null 2>&1
@ -221,7 +221,7 @@ EOF
fi
done
echo "Adding databases on producer..."
echo "Adding databases on provider..."
if [ "$SYNCPROV" = syncprovmod ]; then
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: cn=module,cn=config
@ -255,7 +255,7 @@ olcRootPW: $PASSWD
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed for producer database config1 ($RC)!"
echo "ldapadd failed for provider database config1 ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -282,12 +282,12 @@ olcRootDN: $MANAGERDN
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed for producer database config ($RC)!"
echo "ldapadd failed for provider database config ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Adding databases on producer2..."
echo "Adding databases on provider2..."
if [ "$SYNCPROV" = syncprovmod ]; then
$LDAPADD -D cn=config -H $URI2 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: cn=module,cn=config
@ -323,7 +323,7 @@ olcOverlay: {0}syncprov
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed for producer database config ($RC)!"
echo "ldapadd failed for provider database config ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -346,7 +346,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Populating producer..."
echo "Populating provider..."
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD <<EOF >> $TESTOUT 2>&1
dn: dc=example,dc=com
objectClass: top
@ -363,12 +363,12 @@ ou: ou1
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed to populate producer entry ($RC)!"
echo "ldapadd failed to populate provider entry ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Populating producer2..."
echo "Populating provider2..."
$LDAPADD -D "$MANAGERDN" -H $URI2 -w $PASSWD <<EOF >> $TESTOUT 2>&1
dn: dc=example,dc=com
objectClass: top
@ -385,12 +385,12 @@ ou: ou1
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed to populate producer entry ($RC)!"
echo "ldapadd failed to populate provider entry ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Adding syncrepl on producer..."
echo "Adding syncrepl on provider..."
$LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: olcDatabase={1}$BACKEND,cn=config
changetype: modify
@ -443,7 +443,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapmodify to modify producer2..."
echo "Using ldapmodify to modify provider2..."
$LDAPADD -D "$MANAGERDN" -H $URI2 -w $PASSWD <<EOF >> $TESTOUT 2>&1
dn: ou=ou1,dc=example,dc=com
changetype: modify
@ -502,7 +502,7 @@ else
fi
esac
echo "Using ldapmodify to modify glue suffix on producer..."
echo "Using ldapmodify to modify glue suffix on provider..."
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD <<EOF >> $TESTOUT 2>&1
dn: dc=example,dc=com
changetype: modify

View File

@ -17,7 +17,7 @@ echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
if test $SYNCPROV = syncprovno; then
echo "Syncrepl producer overlay not available, test skipped"
echo "Syncrepl provider overlay not available, test skipped"
exit 0
fi
@ -25,7 +25,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
#
# Test replication:
# - start producer
# - start provider
# - start consumer
# - populate over ldap
# - perform some modifies and deleted
@ -33,7 +33,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
@ -45,7 +45,7 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -63,7 +63,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapadd to create the context prefix entry in the producer..."
echo "Using ldapadd to create the context prefix entry in the provider..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDCP > /dev/null 2>&1
RC=$?
@ -111,7 +111,7 @@ sed -e 's/[Oo][Uu]=/ou=More /g' -e 's/^[Oo][Uu]: /ou: More /' \
-e 's/^cn: Manager/cn: More Manager/' \
$LDIFORDEREDNOCP > $MORELDIF
echo "Using ldapadd to populate the producer directory..."
echo "Using ldapadd to populate the provider directory..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFORDEREDNOCP > $TESTOUT1 2>&1 &
C1PID=$!
@ -123,7 +123,7 @@ wait $C1PID $C2PID
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Stopping the producer, sleeping 10 seconds and restarting it..."
echo "Stopping the provider, sleeping 10 seconds and restarting it..."
kill -HUP "$PID"
wait $PID
sleep 10
@ -138,7 +138,7 @@ KILLPIDS="$PID $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
@ -159,7 +159,7 @@ fi
echo "Waiting 10 seconds to let the system catch up"
sleep 10
echo "Using ldapmodify to modify producer directory..."
echo "Using ldapmodify to modify provider directory..."
#
# Do some modifications
@ -263,7 +263,7 @@ echo "Stopping consumer to test recovery..."
kill -HUP $SLAVEPID
wait $SLAVEPID
echo "Modifying more entries on the producer..."
echo "Modifying more entries on the provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \
$TESTOUT 2>&1 << EOMODS
dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com
@ -333,13 +333,13 @@ fi
OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -357,16 +357,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
exit 1
fi

View File

@ -73,7 +73,7 @@ null) nullExclude="# " ;;
esac
if [ "$MEMBEROF" = memberofmod ]; then
echo "Inserting memberof overlay on producer..."
echo "Inserting memberof overlay on provider..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
dn: cn=module,cn=config
objectClass: olcModuleList

View File

@ -2259,7 +2259,7 @@ fi
# TEST:
# Run race tests when more than one backend is replicated from the same
# producer. This will usually fail long before 100 iterations unless
# provider. This will usually fail long before 100 iterations unless
# syncrepl stores the contextCSN in the suffix of its own database, and
# that syncprov follows these rules before updating its own CSN when it
# detects updates from syncrepl:

View File

@ -46,7 +46,7 @@ esac
#
# Test replication of dynamic config with alternate slave config:
# - start producer
# - start provider
# - start consumer
# - configure over ldap
# - populate over ldap
@ -54,7 +54,7 @@ esac
# - retrieve database over ldap and compare against expected results
#
echo "Starting producer slapd on TCP/IP port $PORT1..."
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
@ -67,7 +67,7 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that producer slapd is running..."
echo "Using ldapsearch to check that provider slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "" -H $URI1 \
'objectclass=*' > /dev/null 2>&1
@ -85,7 +85,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Inserting syncprov overlay on producer..."
echo "Inserting syncprov overlay on provider..."
if [ "$SYNCPROV" = syncprovmod ]; then
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
dn: cn=module,cn=config
@ -122,7 +122,7 @@ fi
# will also be a consumer for the real cn=schema,cn=config tree.
# It has MirrorMode enabled so that it can be written directly
# while being a slave of the main schema.
echo "Configuring slave config DB on producer..."
echo "Configuring slave config DB on provider..."
$LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
dn: cn=config
changetype: modify
@ -252,7 +252,7 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Adding schema and databases on producer..."
echo "Adding schema and databases on provider..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
include: file://$ABS_SCHEMADIR/core.ldif
@ -355,7 +355,7 @@ EOF
;;
esac
echo "Using ldapadd to populate producer..."
echo "Using ldapadd to populate provider..."
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \
>> $TESTOUT 2>&1
RC=$?
@ -388,13 +388,13 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Using ldapsearch to read all the entries from the producer..."
echo "Using ldapsearch to read all the entries from the provider..."
$LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI1 -w $PASSWD \
'objectclass=*' > $MASTEROUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed at producer ($RC)!"
echo "ldapsearch failed at provider ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@ -412,16 +412,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo "Filtering producer results..."
echo "Filtering provider results..."
$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
echo "Comparing retrieved entries from producer and consumer..."
echo "Comparing retrieved entries from provider and consumer..."
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
if test $? != 0 ; then
echo "test failed - producer and consumer databases differ"
echo "test failed - provider and consumer databases differ"
exit 1
fi