Update of /home/cvsd/slony1/slony1-engine/tests
In directory main.slony.info:/tmp/cvs-serv6851

Modified Files:
	run_test.sh 
Log Message:
Changes to tests to support log shipping better


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** run_test.sh	21 Sep 2007 21:53:40 -0000	1.18
--- run_test.sh	19 Oct 2007 15:21:46 -0000	1.19
***************
*** 183,195 ****
        eval user=\$USER${node}
        eval port=\$PORT${node}
-       eval logship=\$LOGSHIP${node}
  
        if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
          if [ ${node} -ne ${originnode} ]; then
-           if [ "x${logship}" == "xtrue" ]; then    # Don't bother generating nodes used for log shipping
-             status "Node ${node} is a log shipping node - no need for STORE NODE"
-           else
              echo "STORE NODE (id=@node${node}, comment='node ${node}');" >> $mktmp/slonik.script
-          fi
          fi
          if [ ${node} -ge ${NUMNODES} ]; then
--- 183,190 ----
***************
*** 215,219 ****
      eval user=\$USER${i}
      eval port=\$PORT${i}
-     eval logship=\$LOGSHIP${i}
  
      if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
--- 210,213 ----
***************
*** 225,236 ****
            eval buser=\$WEAKUSER${j}
            eval bport=\$PORT${j}
-           eval blogship=\$LOGSHIP${j}
            if [ -n "${bdb}" -a "${bhost}" -a "${buser}" -a "${bport}" ]; then
-              if [[ "x${logship}" == "xtrue" || "x${blogship}" == "xtrue" ]]; then
-                  # log shipping node - no paths need exist that involve this node
-                  status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
-              else
  	    echo "STORE PATH (SERVER=@node${i}, CLIENT=@node${j}, CONNINFO='dbname=${db} host=${host} user=${buser} port=${port}');" >> $mktmp/slonik.script
-              fi
            else
              err 3 "No conninfo"
--- 219,224 ----
***************
*** 498,523 ****
  }
  
- build_logshipconf ()
- {
-     destnode=$1
-     srcnode=$2
-     CONFFILE=${mktmp}/logship-${destnode}.conf
- 
-     eval ldb=\$DB${destnode}
-     eval lhost=\$HOST${destnode}
-     eval luser=\$USER${destnode}
-     eval lport=\$PORT${destnode}
- 
-     mkdir -p ${mktmp}/offline_logs
- 
-     echo "logfile='${mktmp}/offline_logs/logshipper.log';" > ${CONFFILE}
-     echo "cluster name = '${cluster}';" >> ${CONFFILE}
-     echo "destination database ='dbname=${ldb} port=${lport} user=${luser} host=${lhost}';" >> ${CONFFILE}
-     echo "archive dir = '${mktmp}/archive_logs_${srcnode}';" >> ${CONFFILE}
-     echo "### destination dir ='${mktmp}/offline_result';" >> ${CONFFILE}
-     echo "max archives = 3600;" >> ${CONFFILE}
- #    echo "post processing command = 'gzip -9 \$inarchive';" >> ${CONFFILE}
- }
- 
  build_slonconf()
  {
--- 486,489 ----
***************
*** 545,584 ****
      echo "lag_interval=\"0 minutes\"" >> ${CONFFILE}
      if [ "x${archive}" == "xtrue" ]; then
  	echo "archive_dir='${mktmp}/archive_logs_${node}'" >> ${CONFFILE}
  	eval pgbindir=\$PGBINDIR${node}
- 	echo "command_on_logarchive='${pgbindir}/slony_logshipper ${mktmp}/logship-${LOGSHIPNODE}.conf '" >> ${CONFFILE}
-     fi
- }
- 
- launch_logshipper()
- {
-   node=1
-   while : ; do
-     if [ ${node} -ne ${originnode} ]; then
- 
-       eval db=\$DB${node}
-       eval host=\$HOST${node}
-       eval user=\$USER${node}
-       eval pgbindir=\$PGBINDIR${node}
-       eval port=\$PORT${node}
-       eval cluster=\$CLUSTER1
-       eval archive=\$ARCHIVE${node}
-       eval logship=\$LOGSHIP${node}
-       eval slonconf=\$SLONCONF${node}
- 
-       if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
-         if [ "x${logship}" == "xtrue" ]; then
-           status "launch logshipper for node ${node}"
- 	  build_logshipconf ${node} ${ARCHIVENODE}
- 	  $pgbindir/slony_logshipper ${mktmp}/logship-${node}.conf &
-         fi
-       fi
-     fi
-     if [ ${node} -ge ${NUMNODES} ]; then
-       break;
-     else
-       node=$((${node} + 1))
      fi
-   done
  }
  
--- 511,518 ----
      echo "lag_interval=\"0 minutes\"" >> ${CONFFILE}
      if [ "x${archive}" == "xtrue" ]; then
+ 	status "slonconf configures archive logging for node ${node}"
  	echo "archive_dir='${mktmp}/archive_logs_${node}'" >> ${CONFFILE}
  	eval pgbindir=\$PGBINDIR${node}
      fi
  }
  
***************
*** 620,631 ****
    node=1
    while : ; do
-       eval logship=\$LOGSHIP${node}
        eval archive=\$ARCHIVE${node}
        if [ "x${archive}" == "xtrue" ]; then
  	  ARCHIVENODE=${node}
        fi
-       if [ "x${logship}" == "xtrue" ]; then
- 	  LOGSHIPNODE=${node}
-       fi
        if [ ${node} -ge ${NUMNODES} ]; then
  	  break;
--- 554,561 ----
***************
*** 635,639 ****
    done
    status "Archive node: ${ARCHIVENODE}"
-   status "Log shipping node: ${LOGSHIPNODE}"
  
    node=1
--- 565,568 ----
***************
*** 648,652 ****
        eval cluster=\$CLUSTER1
        eval archive=\$ARCHIVE${node}
-       eval logship=\$LOGSHIP${node}
        eval slonconf=\$SLONCONF${node}
  
--- 577,580 ----
***************
*** 662,665 ****
--- 590,595 ----
            mkdir -p $mktmp/archive_logs_${node}
            archiveparm="-a ${mktmp}/archive_logs_${node}"
+ 	else
+ 	  archiveparm=""
          fi
          conninfo="dbname=${db} host=${host} user=${user} port=${port}"
***************
*** 667,692 ****
  	if [ "x${slonconf}" == "xtrue" ]; then
  	    build_slonconf ${node} "${conninfo}"
!         fi
!         if [ "x${logship}" == "xtrue" ]; then
!           status "logshipper node - no slon to launch"
!         else
! 	  if [ "x${slonconf}" == "xtrue" ]; then
! 	      status "launching: $pgbindir/slon -f ${CONFFILE}"
! 	      $pgbindir/slon -f ${CONFFILE} 1>> $mktmp/slon_log.${node} 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.${node} 2>&1 &
! 	  fi
!           tmppid=$!
!           tmpppid=$$
!           sleep 1
! 
!           foo=$(_check_pid slon ${tmppid} ${tmpppid})
! 
!           eval slon${node}_pid=${foo}
!           if [ -z "${foo}" -o "${tmppid}" != "${foo}" ]; then
              warn 3 "Failed to launch slon on node ${node} check $mktmp/slon_log.${node} for details"
!           fi
!         fi
        fi
      fi
--- 597,616 ----
  	if [ "x${slonconf}" == "xtrue" ]; then
  	    build_slonconf ${node} "${conninfo}"
! 	    status "launching: $pgbindir/slon -f ${CONFFILE}"
! 	    $pgbindir/slon -f ${CONFFILE} 1>> $mktmp/slon_log.${node} 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.${node} 2>&1 &
! 	fi
! 	tmppid=$!
! 	tmpppid=$$
! 	sleep 1
! 	
! 	foo=$(_check_pid slon ${tmppid} ${tmpppid})
! 	
! 	eval slon${node}_pid=${foo}
! 	if [ -z "${foo}" -o "${tmppid}" != "${foo}" ]; then
              warn 3 "Failed to launch slon on node ${node} check $mktmp/slon_log.${node} for details"
! 	fi
        fi
      fi