ITS#9598 Do not track olcIncomingConnections in lloadd/test007

Some values we export in cn=monitor are not managed in a single place,
instead, a task exists that gathers a snapshot of the lloadd state and
stores it for monitor consumption. This exposes a race between the test
reading it out and lloadd updating this cached copy. While we still have
to rely on a shell, rather than being intelligent about whether or not
we should emit a readout into search.out or wait and try again (which is
what test004-monitor does), just filter this attribute out.
This commit is contained in:
Ondřej Kuzník 2022-10-31 09:26:12 +00:00 committed by Quanah Gibson-Mount
parent c9fb424b9e
commit f9d76ccf02
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,6 @@
# with first backend
dn: cn=Load Balancer,cn=Backends,cn=Monitor
objectClass: olmBalancer
olmIncomingConnections: 0
olmOutgoingConnections: 4
dn: cn=Incoming Connections,cn=Load Balancer,cn=Backends,cn=Monitor
@ -87,7 +86,6 @@ olmFailedOps: 0
# second backend and a rejected search, paged search (19 times x 1 entry), pwmod
dn: cn=Load Balancer,cn=Backends,cn=Monitor
objectClass: olmBalancer
olmIncomingConnections: 0
olmOutgoingConnections: 13
dn: cn=Incoming Connections,cn=Load Balancer,cn=Backends,cn=Monitor
@ -274,7 +272,6 @@ olmFailedOps: 0
# two runs of modifies (with and without TXN)
dn: cn=Load Balancer,cn=Backends,cn=Monitor
objectClass: olmBalancer
olmIncomingConnections: 0
olmOutgoingConnections: 13
dn: cn=Incoming Connections,cn=Load Balancer,cn=Backends,cn=Monitor

View File

@ -483,7 +483,10 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
LDIF=$DATADIR/lloadd/test007-monitor.ldif
echo "Filtering ldapsearch results..."
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
# For now, we don't make sure olmIncomingConnections is reflective of current
# state (=no connections open) since olmIncomingConnections can be != 0 for a
# second after it's closed
$LDIFFILTER < $SEARCHOUT | grep -v '^olmIncomingConnections:' > $SEARCHFLT
echo "Filtering original ldif used to create database..."
$LDIFFILTER < $LDIF | sed \
-e "s|@URI2@|$URI2|g" \