[tor-bugs] #28113 [Core Tor/Tor]: notify systemd if shutdown will be longer than 30 seconds
Tor Bug Tracker & Wiki
blackhole at torproject.org
Mon Nov 5 01:55:11 UTC 2018
#28113: notify systemd if shutdown will be longer than 30 seconds
-------------------------------------------------+-------------------------
Reporter: Hello71 | Owner: Hello71
Type: defect | Status:
| merge_ready
Priority: Medium | Milestone: Tor:
| 0.3.5.x-final
Component: Core Tor/Tor | Version: Tor:
| 0.2.6.2-alpha
Severity: Normal | Resolution:
Keywords: tor-systemd, 029-backport-maybe, | Actual Points:
033-backport-maybe, 034-backport-maybe, 035 |
-backport-maybe |
Parent ID: | Points:
Reviewer: teor | Sponsor:
-------------------------------------------------+-------------------------
Changes (by teor):
* status: needs_revision => merge_ready
Comment:
I pushed three small commits to your pull request to fix these issues:
1. If tor's systemd TimeoutStopSec is less than the ShutdownWaitLength,
plus the time it takes tor to shut down after its ShutdownWaitLength has
expired, then systemd may terminate Tor abnormally. Let's explain that
better in the changes file.
2. Tor's systemd file in dist/ has a TimeoutSec of 30, which is too low:
https://gitweb.torproject.org/tor.git/tree/contrib/dist/tor.service.in
Debian has a TimeoutStopSec of 60, which seems like a good change to
upstream:
https://gitweb.torproject.org/debian/tor.git/tree/debian/systemd/tor@default.service
3. This is a bugfix, so it should get a bugfix changes file
See my branch ticket28113-029 for the squash and cherry-pick to 0.2.9:
https://github.com/torproject/tor/pull/474
This branch merges cleanly all the way to master:
https://github.com/torproject/tor/pull/475
(GitHub's pull requests can't do this merge, but git can.)
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/28113#comment:12>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list