diff --git a/doc/source/discussion/components.rst b/doc/source/discussion/components.rst index 44c5bddf98..bde69e60e2 100644 --- a/doc/source/discussion/components.rst +++ b/doc/source/discussion/components.rst @@ -395,8 +395,7 @@ not read from a git repository. Zuul supports two kinds of reconfigurations. The full reconfiguration refetches and reloads the configuration of all tenants. To do so, run ``zuul-scheduler full-reconfigure``. For example this can be used to fix eventual configuration inconsistencies -after connection problems to Gerrit/Github. The signal based method by -sending a `SIGHUP` signal to the scheduler PID is deprecated. +after connection problems to Gerrit/Github. The smart reconfiguration reloads only the tenants that changed their configuration in the tenant config file. To do so, run diff --git a/releasenotes/notes/sighup-removed-a97df8640862c9c7.yaml b/releasenotes/notes/sighup-removed-a97df8640862c9c7.yaml new file mode 100644 index 0000000000..a9ce158c51 --- /dev/null +++ b/releasenotes/notes/sighup-removed-a97df8640862c9c7.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Signal based triggering of full-reconfiguration in the scheduler + (deprecated since 3.3.0) has been removed. Use ``zuul-scheduler + full-reconfigure`` instead. diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py index cbda4fbd89..e9593e5610 100755 --- a/zuul/cmd/scheduler.py +++ b/zuul/cmd/scheduler.py @@ -66,11 +66,6 @@ class Scheduler(zuul.cmd.ZuulDaemonApp): except Exception: self.log.exception("Reconfiguration failed:") - def reconfigure_handler(self, signum, frame): - signal.signal(signal.SIGHUP, signal.SIG_IGN) - self.fullReconfigure() - signal.signal(signal.SIGHUP, self.reconfigure_handler) - def exit_handler(self, signum, frame): self.sched.exit() self.sched.join() @@ -178,8 +173,6 @@ class Scheduler(zuul.cmd.ZuulDaemonApp): self.sched.stop() sys.exit(1) - signal.signal(signal.SIGHUP, self.reconfigure_handler) - if self.args.nodaemon: signal.signal(signal.SIGTERM, self.exit_handler) while True: