pgpool2.git / summary / log / commit / refs
commit a3f34b94f59cbe9935744003babd9e2fb53c2fa7
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Mon Apr 25 07:54:13 2022 +0000
Revert "Attempt to fix buildfarm timeout error."
This reverts commit 480c0ce0b76828428fd4823160012bb44d5eb53f.
It seems the fix is useless and causes problem with failover.
src/main/pgpool_main.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c
index ac17fbaba..ae6b55b3b 100644
--- a/src/main/pgpool_main.c
+++ b/src/main/pgpool_main.c
@@ -238,7 +238,6 @@ volatile sig_atomic_t reload_config_request = 0;
static volatile sig_atomic_t sigusr1_request = 0;
static volatile sig_atomic_t sigchld_request = 0;
static volatile sig_atomic_t wakeup_request = 0;
-static volatile sig_atomic_t pgpool_exit_request = 0;
static int pipe_fds[2]; /* for delivering signals */
@@ -2258,14 +2257,6 @@ trigger_failover_command(int node, const char *command_line,
ereport(LOG,
(errmsg("execute command: %s", exec_cmd->data)));
r = system(exec_cmd->data);
-
- /* On some platforms system(3) ignores SIGINT and SIGQUIT */
- if (WIFSIGNALED(r) &&
- (WTERMSIG(r) == SIGINT || WTERMSIG(r) == SIGQUIT))
- {
- /* set exit request set to process later on */
- pgpool_exit_request = WTERMSIG(r);
- }
}
free_string(exec_cmd);
@@ -4702,14 +4693,6 @@ void check_requests(void)
} while (sigusr1_request == 1);
}
- /* Check exit request */
- if (pgpool_exit_request != 0)
- {
- ereport(LOG,
- (errmsg("exit request was registered while executing failover/failback")));
- exit_handler(pgpool_exit_request);
- }
-
/* Check pending signals (SIGQUIT/SIGTERRM/SIGINT) */
sigpending(&sig);
print_signal_member(&sig);
[parent: 480c0ce0b768]