mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 22:51:14 +02:00
ade2d61ed0
Commit ffa4cbd62 added logic to detect SIGPIPE failure of a COPY child
process, but it only worked correctly if the SIGPIPE occurred in the
immediate child process. Depending on the shell in use and the
complexity of the shell command string, we might instead get back
an exit code of 128 + SIGPIPE, representing a shell error exit
reporting SIGPIPE in the child process.
We could just hack up ClosePipeToProgram() to add the extra case,
but it seems like this is a fairly general issue deserving a more
general and better-documented solution. I chose to add a couple
of functions in src/common/wait_error.c, which is a natural place
to know about wait-result encodings, that will test for either a
specific child-process signal type or any child-process signal failure.
Then, adjust other places that were doing ad-hoc tests of this type
to use the common functions.
In RestoreArchivedFile, this fixes a race condition affecting whether
the process will report an error or just silently proc_exit(1): before,
that depended on whether the intermediate shell got SIGTERM'd itself
or reported a child process failing on SIGTERM.
Like the previous patch, back-patch to v10; we could go further
but there seems no real need to.
Per report from Erik Rijkers.
Discussion: https://postgr.es/m/f3683f87ab1701bea5d86a7742b22432@xs4all.nl
128 lines
3.5 KiB
C
128 lines
3.5 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* wait_error.c
|
|
* Convert a wait/waitpid(2) result code to a human-readable string
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
*
|
|
* IDENTIFICATION
|
|
* src/common/wait_error.c
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef FRONTEND
|
|
#include "postgres.h"
|
|
#else
|
|
#include "postgres_fe.h"
|
|
#endif
|
|
|
|
#include <signal.h>
|
|
#include <sys/wait.h>
|
|
|
|
/*
|
|
* Return a human-readable string explaining the reason a child process
|
|
* terminated. The argument is a return code returned by wait(2) or
|
|
* waitpid(2). The result is a translated, palloc'd or malloc'd string.
|
|
*/
|
|
char *
|
|
wait_result_to_str(int exitstatus)
|
|
{
|
|
char str[512];
|
|
|
|
if (WIFEXITED(exitstatus))
|
|
{
|
|
/*
|
|
* Give more specific error message for some common exit codes that
|
|
* have a special meaning in shells.
|
|
*/
|
|
switch (WEXITSTATUS(exitstatus))
|
|
{
|
|
case 126:
|
|
snprintf(str, sizeof(str), _("command not executable"));
|
|
break;
|
|
|
|
case 127:
|
|
snprintf(str, sizeof(str), _("command not found"));
|
|
break;
|
|
|
|
default:
|
|
snprintf(str, sizeof(str),
|
|
_("child process exited with exit code %d"),
|
|
WEXITSTATUS(exitstatus));
|
|
}
|
|
}
|
|
else if (WIFSIGNALED(exitstatus))
|
|
#if defined(WIN32)
|
|
snprintf(str, sizeof(str),
|
|
_("child process was terminated by exception 0x%X"),
|
|
WTERMSIG(exitstatus));
|
|
#elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST
|
|
{
|
|
char str2[256];
|
|
|
|
snprintf(str2, sizeof(str2), "%d: %s", WTERMSIG(exitstatus),
|
|
WTERMSIG(exitstatus) < NSIG ?
|
|
sys_siglist[WTERMSIG(exitstatus)] : "(unknown)");
|
|
snprintf(str, sizeof(str),
|
|
_("child process was terminated by signal %s"), str2);
|
|
}
|
|
#else
|
|
snprintf(str, sizeof(str),
|
|
_("child process was terminated by signal %d"),
|
|
WTERMSIG(exitstatus));
|
|
#endif
|
|
else
|
|
snprintf(str, sizeof(str),
|
|
_("child process exited with unrecognized status %d"),
|
|
exitstatus);
|
|
|
|
return pstrdup(str);
|
|
}
|
|
|
|
/*
|
|
* Return true if a wait(2) result indicates that the child process
|
|
* died due to the specified signal.
|
|
*
|
|
* The reason this is worth having a wrapper function for is that
|
|
* there are two cases: the signal might have been received by our
|
|
* immediate child process, or there might've been a shell process
|
|
* between us and the child that died. The shell will, per POSIX,
|
|
* report the child death using exit code 128 + signal number.
|
|
*
|
|
* If there is no possibility of an intermediate shell, this function
|
|
* need not (and probably should not) be used.
|
|
*/
|
|
bool
|
|
wait_result_is_signal(int exit_status, int signum)
|
|
{
|
|
if (WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum)
|
|
return true;
|
|
if (WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == 128 + signum)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Return true if a wait(2) result indicates that the child process
|
|
* died due to any signal. We consider either direct child death
|
|
* or a shell report of child process death as matching the condition.
|
|
*
|
|
* If include_command_not_found is true, also return true for shell
|
|
* exit codes indicating "command not found" and the like
|
|
* (specifically, exit codes 126 and 127; see above).
|
|
*/
|
|
bool
|
|
wait_result_is_any_signal(int exit_status, bool include_command_not_found)
|
|
{
|
|
if (WIFSIGNALED(exit_status))
|
|
return true;
|
|
if (WIFEXITED(exit_status) &&
|
|
WEXITSTATUS(exit_status) > (include_command_not_found ? 125 : 128))
|
|
return true;
|
|
return false;
|
|
}
|