rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 12:10:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: some race condition in testbench on Solaris/Sparc

Browse Source
This commit is contained in:
Super-User 2010-04-21 17:36:03 +01:00
parent 74000ea71e
commit b526e3d92f
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/diag.sh
View File

@ -37,6 +37,9 @@ case $1 in
$srcdir/diag.sh wait-startup $3 $srcdir/diag.sh wait-startup $3
;; ;;
'wait-startup') # wait for rsyslogd startup ($2 is the instance) 'wait-startup') # wait for rsyslogd startup ($2 is the instance)
while test ! -f rsyslog$2.pid; do
./msleep 100 # wait 100 milliseconds
done
while test ! -f rsyslogd$2.started; do while test ! -f rsyslogd$2.started; do
./msleep 100 # wait 100 milliseconds ./msleep 100 # wait 100 milliseconds
done done

1
tests/diagtalker.c
View File

@ -65,6 +65,7 @@ int openConn(int *fd)
fprintf(stderr, "connect() failed\n"); fprintf(stderr, "connect() failed\n");
exit(1); exit(1);
} else { } else {
fprintf(stderr, "connect failed, retrying...\n");
usleep(100000); /* ms = 1000 us! */ usleep(100000); /* ms = 1000 us! */
} }
} }

3
tests/threadingmqaq.sh
View File

@ -12,6 +12,9 @@ source $srcdir/diag.sh startup threadingmqaq.conf
#source $srcdir/diag.sh tcpflood -c2 -m100000 #source $srcdir/diag.sh tcpflood -c2 -m100000
#source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages #source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh injectmsg 0 100000 source $srcdir/diag.sh injectmsg 0 100000
# we need to sleep a bit on some environments, as imdiag can not correctly
# diagnose when the action queues are empty...
sleep 3
source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh wait-shutdown
source $srcdir/diag.sh seq-check 0 99999 source $srcdir/diag.sh seq-check 0 99999