Fri Sep 7 12:50:12 PDT 2007
- Previous message: [Slony1-commit] slony1-engine/tests testresults.sql
- Next message: [Slony1-commit] slony1-engine/tests/test1 README settings.ik
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/tests In directory main.slony.info:/tmp/cvs-serv10809 Modified Files: run_test.sh Log Message: Add code to generate slon .conf files (run_test.sh), and configure various of the existing tests to selectively use .conf files to verify that the config file parser works and that sensible values don't break things. Index: run_test.sh =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** run_test.sh 11 Jul 2007 17:20:18 -0000 1.15 --- run_test.sh 7 Sep 2007 19:50:10 -0000 1.16 *************** *** 496,499 **** --- 496,529 ---- } + build_slonconf() + { + node=$1 + conninfo=$2 + eval archive=\$ARCHIVE{node} + CONFFILE=$mktmp/slon-conf.${node} + echo "log_level=2" > ${CONFFILE} + echo "vac_frequency=2" >> ${CONFFILE} + echo "sync_interval=2010" >> ${CONFFILE} + echo "sync_interval_timeout=15000" >> ${CONFFILE} + echo "sync_group_maxsize=8" >> ${CONFFILE} + echo "sync_max_rowsize=4096" >> ${CONFFILE} + echo "sync_max_largemem=1048576" >> ${CONFFILE} + echo "syslog=1" >> ${CONFFILE} + echo "log_timestamp=true" >> ${CONFFILE} + echo "log_timestamp_format='%Y-%m-%d %H:%M:%S %Z'" >> ${CONFFILE} + echo "pid_file='${mktmp}/slon-pid.${alias}'" >> ${CONFFILE} + echo "syslog_facility=LOCAL0" >> ${CONFFILE} + echo "syslog_ident=slon-${cluster}-${alias}" >> ${CONFFILE} + echo "cluster_name='${cluster}'" >> ${CONFFILE} + echo "conn_info='${conninfo}'" >> ${CONFFILE} + echo "desired_sync_time=60000" >> ${CONFFILE} + echo "sql_on_connection=\"SET log_min_duration_statement to '1000';\"" >> ${CONFFILE} + echo "command_on_log_archive='/bin/true'" >> ${CONFFILE} + echo "lag_interval=\"0 minutes\"" >> ${CONFFILE} + if [ "x${archive}" == "xtrue" ]; then + echo "archive_dir='${mktmp}/archive_logs_${alias}'" >> ${CONFFILE} + fi + } + launch_slon() { *************** *** 505,513 **** eval opgbindir=\$PGBINDIR${originnode} eval oport=\$PORT${originnode} eval cluster=\$CLUSTER1 conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}" ! status "launching originnode : $opgbindir/slon -s500 -g10 -d2 $cluster \"$conninfo\"" ! $opgbindir/slon -s500 -g10 -d2 $cluster "$conninfo" 1> $mktmp/slon_log.${originnode} 2> $mktmp/slon_log.${originnode} & tmppid=$! tmpppid=$$ --- 535,552 ---- eval opgbindir=\$PGBINDIR${originnode} eval oport=\$PORT${originnode} + eval oslonconf=\$SLONCONF${originnode} eval cluster=\$CLUSTER1 conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}" ! if [ "x${slonconf}" == "xtrue" ]; then ! build_slonconf ${originnode} "${conninfo}" ! slonparms=" -f ${mktmp}/slon-conf.${originnode} " ! status "launching originnode : $opgbindir/slon ${slonparms}" ! $opgbindir/slon -f ${mktmp}/slon-conf.${originnode} 1> $mktmp/slon_log.${originnode} 2> $mktmp/slon_log.${originnode} & ! else ! slonparms=" -s500 -g10 -d2 $cluster \"$conninfo\"" ! status "launching originnode : $opgbindir/slon ${slonparms}" ! $opgbindir/slon -s500 -g10 -d2 $cluster "$conninfo" 1> $mktmp/slon_log.${originnode} 2> $mktmp/slon_log.${originnode} & ! fi tmppid=$! tmpppid=$$ *************** *** 533,536 **** --- 572,576 ---- eval archive=\$ARCHIVE{alias} eval logship=\$LOGSHIP${alias} + eval slonconf=\$SLONCONF${alias} if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then *************** *** 545,557 **** mkdir -p $mktmp/archive_logs_${alias} archiveparm="-a ${mktmp}/archive_logs_${alias}" ! fi conninfo="dbname=${db} host=${host} user=${user} port=${port}" if [ "x${logship}" == "xtrue" ]; then status "do not launch slon for node ${alias} - it receives data via log shipping" else - status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\"" ! $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster "$conninfo" 1>> $mktmp/slon_log.${alias} 2>&1 & tmppid=$! tmpppid=$$ --- 585,605 ---- mkdir -p $mktmp/archive_logs_${alias} archiveparm="-a ${mktmp}/archive_logs_${alias}" ! fi conninfo="dbname=${db} host=${host} user=${user} port=${port}" + if [ "x${slonconf}" == "xtrue" ]; then + build_slonconf ${alias} "${conninfo}" + fi if [ "x${logship}" == "xtrue" ]; then status "do not launch slon for node ${alias} - it receives data via log shipping" else ! if [ "x${slonconf}" == "xtrue" ]; then ! status "launching: $pgbindir/slon -f ${CONFFILE}" ! $pgbindir/slon -f ${CONFFILE} 1>> $mktmp/slon_log.${alias} 2>&1 & ! else ! status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\"" ! $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster "$conninfo" 1>> $mktmp/slon_log.${alias} 2>&1 & ! fi tmppid=$! tmpppid=$$
- Previous message: [Slony1-commit] slony1-engine/tests testresults.sql
- Next message: [Slony1-commit] slony1-engine/tests/test1 README settings.ik
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list