Skip to content

Commit

Permalink
Restart scheduler on error
Browse files Browse the repository at this point in the history
If the scheduler receives an error, it will never restart again since
`bgw_restart_time` is set to `BGW_NEVER_RESTART`, which will prevent
all jobs from executing.

This commit fixes the issue by adding a GUC that can be set to the
restart time for the scheduler, and set the default to 30 seconds. It
also adds some additional variables to be able to shutdown the
scheduler with a non-zero exit code, which allows the restart
functionality to be tested, as well as tests.

Fixes #5091
  • Loading branch information
mkindahl committed Oct 19, 2023
1 parent f1fff68 commit f9dfb12
Show file tree
Hide file tree
Showing 10 changed files with 183 additions and 4 deletions.
1 change: 1 addition & 0 deletions .unreleased/feature_6195
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Implements: #6195 Restart scheduler on error
1 change: 1 addition & 0 deletions src/bgw/scheduler.c
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ ts_bgw_scheduler_process(int32 run_for_interval_ms,

wait_for_all_jobs_to_shutdown();
check_for_stopped_and_timed_out_jobs();
proc_exit(ts_bgw_scheduler_exit_code);
}

static void
Expand Down
27 changes: 27 additions & 0 deletions src/guc.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,20 @@ TSDLLEXPORT int ts_guc_hypertable_replication_factor_default = 1;

bool ts_guc_debug_require_batch_sorted_merge = false;

/*
* Exit code for the scheduler.
*
* Normally it exits with a zero which means that it will not restart. If an
* error is raised, it exits with error code 1, which will trigger a
* restart.
*
* This variable exists to be able to trigger a restart for a normal exit,
* which is useful when debugging.
*
* See backend/postmaster/bgworker.c
*/
int ts_bgw_scheduler_exit_code = 0;

#ifdef TS_DEBUG
bool ts_shutdown_bgw = false;
char *ts_current_timestamp_mock = NULL;
Expand Down Expand Up @@ -759,6 +773,19 @@ _guc_init(void)
/* assign_hook= */ NULL,
/* show_hook= */ NULL);

DefineCustomIntVariable(/* name= */ "timescaledb.shutdown_bgw_scheduler_exit_code",
/* short_desc= */ "exit code to use when shutting down the scheduler",
/* long_desc= */ "this is for debugging purposes",
/* valueAddr= */ &ts_bgw_scheduler_exit_code,
/* bootValue= */ 0,
/* minValue= */ 0,
/* maxValue= */ 255,
/* context= */ PGC_SIGHUP,
/* flags= */ 0,
/* check_hook= */ NULL,
/* assign_hook= */ NULL,
/* show_hook= */ NULL);

DefineCustomStringVariable(/* name= */ "timescaledb.current_timestamp_mock",
/* short_desc= */ "set the current timestamp",
/* long_desc= */ "this is for debugging purposes",
Expand Down
8 changes: 8 additions & 0 deletions src/guc.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ extern TSDLLEXPORT DistCopyTransferFormat ts_guc_dist_copy_transfer_format;
typedef void (*set_ssl_options_hook_type)(const char *user_name);
extern TSDLLEXPORT set_ssl_options_hook_type ts_set_ssl_options_hook;

/*
* Exit code to use when scheduler exits.
*
* Mostly used for debugging, but defined also for non-debug builds since that
* simplifies the code (and also simplifies debugging non-debug builds).
*/
extern TSDLLEXPORT int ts_bgw_scheduler_exit_code;

#ifdef TS_DEBUG
extern bool ts_shutdown_bgw;
extern char *ts_current_timestamp_mock;
Expand Down
20 changes: 18 additions & 2 deletions src/loader/bgw_launcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ typedef enum SchedulerState

static volatile sig_atomic_t got_SIGHUP = false;

int ts_guc_bgw_scheduler_restart_time_sec = 30;

static void
launcher_sighup(SIGNAL_ARGS)
{
Expand Down Expand Up @@ -238,10 +240,24 @@ terminate_background_worker(BackgroundWorkerHandle *handle)
}

extern void
ts_bgw_cluster_launcher_register(void)
ts_bgw_cluster_launcher_init(void)
{
BackgroundWorker worker;

DefineCustomIntVariable(/* name= */ "timescaledb.bgw_scheduler_restart_time",
/* short_desc= */ "Restart time for scheduler in seconds",
/* long_desc= */
"The number of seconds until the scheduler restart on failure.",
/* valueAddr= */ &ts_guc_bgw_scheduler_restart_time_sec,
/* bootValue= */ 30,
/* minValue= */ 1,
/* maxValue= */ 3600,
/* context= */ PGC_POSTMASTER,
/* flags= */ GUC_UNIT_S,
/* check_hook= */ NULL,
/* assign_hook= */ NULL,
/* show_hook= */ NULL);

memset(&worker, 0, sizeof(worker));
/* set up worker settings for our main worker */
snprintf(worker.bgw_name, BGW_MAXLEN, "TimescaleDB Background Worker Launcher");
Expand Down Expand Up @@ -276,7 +292,7 @@ register_entrypoint_for_db(Oid db_id, VirtualTransactionId vxid, BackgroundWorke
memset(&worker, 0, sizeof(worker));
snprintf(worker.bgw_name, BGW_MAXLEN, "TimescaleDB Background Worker Scheduler");
worker.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
worker.bgw_restart_time = BGW_NEVER_RESTART;
worker.bgw_restart_time = ts_guc_bgw_scheduler_restart_time_sec,
worker.bgw_start_time = BgWorkerStart_RecoveryFinished;
snprintf(worker.bgw_library_name, BGW_MAXLEN, EXTENSION_NAME);
snprintf(worker.bgw_function_name, BGW_MAXLEN, BGW_ENTRYPOINT_FUNCNAME);
Expand Down
4 changes: 3 additions & 1 deletion src/loader/bgw_launcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
#include <postgres.h>
#include <fmgr.h>

extern void ts_bgw_cluster_launcher_register(void);
extern int ts_guc_bgw_scheduler_restart_time_sec;

extern void ts_bgw_cluster_launcher_init(void);

/*called by postmaster at launcher bgw startup*/
TSDLLEXPORT extern Datum ts_bgw_cluster_launcher_main(PG_FUNCTION_ARGS);
Expand Down
2 changes: 1 addition & 1 deletion src/loader/loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ _PG_init(void)
timescaledb_shmem_request_hook();
#endif

ts_bgw_cluster_launcher_register();
ts_bgw_cluster_launcher_init();
ts_bgw_counter_setup_gucs();
ts_bgw_interface_register_api_version();
ts_seclabel_init();
Expand Down
83 changes: 83 additions & 0 deletions tsl/test/expected/bgw_scheduler_restart.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
-- This file and its contents are licensed under the Timescale License.
-- Please see the included NOTICE for copyright information and
-- LICENSE-TIMESCALE for a copy of the license.
\c :TEST_DBNAME :ROLE_SUPERUSER
CREATE VIEW tsdb_bgw AS
SELECT datname, application_name FROM pg_stat_activity
WHERE application_name LIKE 'TimescaleDB%'
ORDER BY datname, application_name;
SHOW timescaledb.bgw_scheduler_restart_time;
timescaledb.bgw_scheduler_restart_time
----------------------------------------
30s
(1 row)

SELECT _timescaledb_functions.start_background_workers();
start_background_workers
--------------------------
t
(1 row)

SELECT pg_sleep(10); -- Wait for scheduler to start.
pg_sleep
----------

(1 row)

SELECT * FROM tsdb_bgw;
datname | application_name
--------------------------+-----------------------------------------
db_bgw_scheduler_restart | TimescaleDB Background Worker Scheduler
| TimescaleDB Background Worker Launcher
(2 rows)

ALTER SYSTEM SET timescaledb.shutdown_bgw_scheduler TO 'on';
ALTER SYSTEM SET timescaledb.shutdown_bgw_scheduler_exit_code TO 1;
SELECT pg_reload_conf();
pg_reload_conf
----------------
t
(1 row)

SELECT pg_sleep(20); -- Wait for scheduler to exit.
pg_sleep
----------

(1 row)

SELECT * FROM tsdb_bgw;
datname | application_name
---------+----------------------------------------
| TimescaleDB Background Worker Launcher
(1 row)

ALTER SYSTEM RESET timescaledb.shutdown_bgw_scheduler;
ALTER SYSTEM RESET timescaledb.shutdown_bgw_scheduler_exit_code;
SELECT pg_reload_conf();
pg_reload_conf
----------------
t
(1 row)

SELECT pg_sleep(30); -- Wait for scheduler to restart.
pg_sleep
----------

(1 row)

SELECT * FROM tsdb_bgw;
datname | application_name
--------------------------+-----------------------------------------
db_bgw_scheduler_restart | TimescaleDB Background Worker Scheduler
| TimescaleDB Background Worker Launcher
(2 rows)

SELECT pg_terminate_backend(pid)
FROM pg_stat_activity
WHERE datname = :'TEST_DBNAME'
AND application_name LIKE 'TimescaleDB%';
pg_terminate_backend
----------------------
t
(1 row)

2 changes: 2 additions & 0 deletions tsl/test/sql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
TEST_FILES
bgw_db_scheduler.sql
bgw_scheduler_control.sql
bgw_scheduler_restart.sql
job_errors_permissions.sql
troubleshooting_job_errors.sql
bgw_db_scheduler_fixed.sql
Expand Down Expand Up @@ -139,6 +140,7 @@ set(SOLO_TESTS
# This interferes with other tests since it reloads the config to increase
# log level.
bgw_scheduler_control
bgw_scheduler_restart
bgw_db_scheduler
job_errors_permissions
troubleshooting_job_errors
Expand Down
39 changes: 39 additions & 0 deletions tsl/test/sql/bgw_scheduler_restart.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
-- This file and its contents are licensed under the Timescale License.
-- Please see the included NOTICE for copyright information and
-- LICENSE-TIMESCALE for a copy of the license.

\c :TEST_DBNAME :ROLE_SUPERUSER

CREATE VIEW tsdb_bgw AS
SELECT datname, application_name FROM pg_stat_activity
WHERE application_name LIKE 'TimescaleDB%'
ORDER BY datname, application_name;

SHOW timescaledb.bgw_scheduler_restart_time;

SELECT _timescaledb_functions.start_background_workers();

SELECT pg_sleep(10); -- Wait for scheduler to start.

SELECT * FROM tsdb_bgw;

ALTER SYSTEM SET timescaledb.shutdown_bgw_scheduler TO 'on';
ALTER SYSTEM SET timescaledb.shutdown_bgw_scheduler_exit_code TO 1;
SELECT pg_reload_conf();

SELECT pg_sleep(20); -- Wait for scheduler to exit.

SELECT * FROM tsdb_bgw;

ALTER SYSTEM RESET timescaledb.shutdown_bgw_scheduler;
ALTER SYSTEM RESET timescaledb.shutdown_bgw_scheduler_exit_code;
SELECT pg_reload_conf();

SELECT pg_sleep(30); -- Wait for scheduler to restart.

SELECT * FROM tsdb_bgw;

SELECT pg_terminate_backend(pid)
FROM pg_stat_activity
WHERE datname = :'TEST_DBNAME'
AND application_name LIKE 'TimescaleDB%';

0 comments on commit f9dfb12

Please sign in to comment.