Fix error reporting after ioctl() call with pg_upgrade --clone

michaelpq · michaelpq · commit 8b1ec7d29532 · 2022-08-01T16:38:23.000+09:00
errno was not reported correctly after attempting to clone a file, leading to incorrect error reports. While scanning through the code, I have not noticed any similar mistakes. Error introduced in 3a769d8. Author: Justin Pryzby Discussion: https://postgr.es/m/20220731134135.GY15006@telsasoft.com Backpatch-through: 12
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
@@ -57,9 +57,12 @@ cloneFile(const char *src, const char *dst,
 
 	if (ioctl(dest_fd, FICLONE, src_fd) < 0)
 	{
+		int			save_errno = errno;
+
 		unlink(dst);
+
 		pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s",
-				 schemaName, relName, src, dst, strerror(errno));
+				 schemaName, relName, src, dst, strerror(save_errno));
 	}
 
 	close(src_fd);

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,12 @@ cloneFile(const char src, const char dst,`
`57`	`57`
`58`	`58`	`if (ioctl(dest_fd, FICLONE, src_fd) < 0)`
`59`	`59`	`{`
	`60`	`+ int save_errno = errno;`
	`61`	`+`
`60`	`62`	`unlink(dst);`
	`63`	`+`
`61`	`64`	`pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s",`
`62`		`- schemaName, relName, src, dst, strerror(errno));`
	`65`	`+ schemaName, relName, src, dst, strerror(save_errno));`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`close(src_fd);`