Steve Singer,,, ssinger at lists.slony.info
Wed Jul 7 07:33:30 PDT 2010
Update of /home/cvsd/slony1/slony1-engine/src/slony_logshipper
In directory main.slony.info:/tmp/cvs-serv23247/src/slony_logshipper

Modified Files:
	slony_logshipper.c 
Log Message:
Log shipping fixes
-slony1_dump.sh now generates a .sql file that restores in replica mode
so triggers don't fire.  It will also truncate tables before restoring
to them
-Check for the proper return code to indicate no files are queued for
processing. This will allow log_shipper to sleep waiting for more work
when no files are ready for processing.

Merged from 2.0


Index: slony_logshipper.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slony_logshipper/slony_logshipper.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** slony_logshipper.c	17 Aug 2009 17:25:50 -0000	1.4
--- slony_logshipper.c	7 Jul 2010 14:33:28 -0000	1.5
***************
*** 371,375 ****
  			break;
  
! 		if (rc == -2)
  		{
  			archscan_sort = NULL;
--- 371,375 ----
  			break;
  
! 		if (rc == -3)
  		{
  			archscan_sort = NULL;
***************
*** 386,389 ****
--- 386,390 ----
  		if (rc < 0)
  		{
+ 			errlog(LOG_ERROR,"ipc_recv_path returned an error:%d\n",rc);
  			return -1;
  		}



More information about the Slony1-commit mailing list