Skip to content

Commit 07abcd9

Browse files
committed
Fix error reporting after ioctl() call with pg_upgrade --clone
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/[email protected] Backpatch-through: 12
1 parent feae5c0 commit 07abcd9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Diff for: src/bin/pg_upgrade/file.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ cloneFile(const char *src, const char *dst,
5757

5858
if (ioctl(dest_fd, FICLONE, src_fd) < 0)
5959
{
60+
int save_errno = errno;
61+
6062
unlink(dst);
6163
pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
62-
schemaName, relName, src, dst, strerror(errno));
64+
schemaName, relName, src, dst, strerror(save_errno));
6365
}
6466

6567
close(src_fd);

0 commit comments

Comments
 (0)