Properly report errno/out-of-disk-space error from pg_upgrade when in

bmomjian · bmomjian · commit a0d7c5f6894f · 2010-07-09T16:51:23.000Z
copy mode, per report from depstein@alliedtesting.com.

Patch suggestion from Magnus.

Backpatch to 9.0.X.
diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING
@@ -1,4 +1,4 @@
-$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.2 2010/07/03 14:23:13 momjian Exp $
+$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.3 2010/07/09 16:51:23 momjian Exp $
 
 The most effective way to test pg_upgrade, aside from testing on user
 data, is by upgrading the PostgreSQL regression database.
@@ -22,11 +22,6 @@ Here are the steps needed to create a regression database dump file:
     a)  Change CREATE FUNCTION shared object paths to use '$libdir'
         The old and new cluster will have different shared object paths.
 
-    b)  Remove 'regex_flavor' (not supported in Postgres 9.0)
-
-    c)  Change CREATE OR REPLACE LANGUAGE to CREATE LANGUAGE
-        The former syntax is only supported in Postgres 9.0.
-
     d)  Perform the load/dump twice
         This fixes problems with the ordering of COPY columns for
         inherited tables.
@@ -35,7 +30,11 @@ Here are the steps needed to create a regression database dump file:
         Commands like CREATE TRIGGER and ALTER TABLE sometimes have
         differences.
 
-    f)  Adjust extra_float_digits
+    c)  For pre-9.0, change CREATE OR REPLACE LANGUAGE to CREATE LANGUAGE
+
+    b)  For pre-9.0, remove 'regex_flavor'
+
+    f)  For pre-9.0, adjust extra_float_digits
 	Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0
 	databases, and extra_float_digits=-3 for >= 9.0 databases.
 	It is necessary to modify 9.0 pg_dump to always use -3, and
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -4,7 +4,7 @@
  *	file system operations
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.13 2010/07/06 19:18:55 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.14 2010/07/09 16:51:23 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -170,6 +170,8 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 
 		if (nbytes < 0)
 		{
+			int save_errno = errno;
+			
 			if (buffer != NULL)
 				free(buffer);
 
@@ -179,6 +181,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 			if (dest_fd != 0)
 				close(dest_fd);
 
+			errno = save_errno;
 			return -1;
 		}
 
@@ -190,8 +193,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 		if (write(dest_fd, buffer, nbytes) != nbytes)
 		{
 			/* if write didn't set errno, assume problem is no disk space */
-			if (errno == 0)
-				errno = ENOSPC;
+			int save_errno = errno ? errno : ENOSPC;
 
 			if (buffer != NULL)
 				free(buffer);
@@ -202,6 +204,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 			if (dest_fd != 0)
 				close(dest_fd);
 
+			errno = save_errno;
 			return -1;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* file system operations`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2010, PostgreSQL Global Development Group`
`7`		`- * $PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.13 2010/07/06 19:18:55 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.14 2010/07/09 16:51:23 momjian Exp $`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`#include "pg_upgrade.h"`
`@@ -170,6 +170,8 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`170`	`170`
`171`	`171`	`if (nbytes < 0)`
`172`	`172`	`{`
	`173`	`+ int save_errno = errno;`
	`174`	`+`
`173`	`175`	`if (buffer != NULL)`
`174`	`176`	`free(buffer);`
`175`	`177`
`@@ -179,6 +181,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`179`	`181`	`if (dest_fd != 0)`
`180`	`182`	`close(dest_fd);`
`181`	`183`
	`184`	`+ errno = save_errno;`
`182`	`185`	`return -1;`
`183`	`186`	`}`
`184`	`187`
`@@ -190,8 +193,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`190`	`193`	`if (write(dest_fd, buffer, nbytes) != nbytes)`
`191`	`194`	`{`
`192`	`195`	`/* if write didn't set errno, assume problem is no disk space */`
`193`		`- if (errno == 0)`
`194`		`- errno = ENOSPC;`
	`196`	`+ int save_errno = errno ? errno : ENOSPC;`
`195`	`197`
`196`	`198`	`if (buffer != NULL)`
`197`	`199`	`free(buffer);`
`@@ -202,6 +204,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`202`	`204`	`if (dest_fd != 0)`
`203`	`205`	`close(dest_fd);`
`204`	`206`
	`207`	`+ errno = save_errno;`
`205`	`208`	`return -1;`
`206`	`209`	`}`
`207`	`210`	`}`