Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add process hooks to tell systemd our state. #5732

Merged
merged 5 commits into from Jul 23, 2019

Conversation

@erikjohnston
Copy link
Member

commented Jul 22, 2019

Adds new dependency on sdnotify, but python3-sdnotify packages exists on debian stretch so I think that is fine.

@erikjohnston erikjohnston force-pushed the erikj/sdnotify branch from a8205f2 to 79f689e Jul 22, 2019

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Jul 22, 2019

@erikjohnston

This comment has been minimized.

Copy link
Member Author

commented Jul 22, 2019

Is there anywhere suitable this needs to be doc'ed?

@richvdh
Copy link
Member

left a comment

probably needs updates to the example systemd configs too; I wouldn't otherwise bother to document it.

hs.get_reactor().addSystemEventTrigger(
"after",
"startup",
lambda: sd_channel.notify("READY=1\nMAINPID=%s" % (os.getpid())),

This comment has been minimized.

Copy link
@richvdh

richvdh Jul 22, 2019

Member

doesn't this need to happen a bit later? IIRC we do some acme foo after the reactor starts but before we bind the http and replication listeners

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Jul 22, 2019

Author Member

Oh, it looked like we started listening pretty much immediately we start the reactor, but actually we do some acme stuff first. Good spot.

Call startup commands as system triggers.
This helps ensures that we only consider ourselves "up" once all the
startup functions have completed.

@erikjohnston erikjohnston requested a review from richvdh Jul 22, 2019

@richvdh
Copy link
Member

left a comment

lgtm

contrib/systemd/matrix-synapse.service Show resolved Hide resolved
@codecov

This comment has been minimized.

Copy link

commented Jul 23, 2019

Codecov Report

Merging #5732 into develop will decrease coverage by 0.01%.
The diff coverage is 23.07%.

@@             Coverage Diff             @@
##           develop    #5732      +/-   ##
===========================================
- Coverage    63.48%   63.47%   -0.02%     
===========================================
  Files          331      331              
  Lines        36305    36313       +8     
  Branches      5989     5992       +3     
===========================================
- Hits         23050    23048       -2     
- Misses       11618    11626       +8     
- Partials      1637     1639       +2

@erikjohnston erikjohnston force-pushed the erikj/sdnotify branch from 096e2c2 to cda4460 Jul 23, 2019

@erikjohnston erikjohnston merged commit 841b128 into develop Jul 23, 2019

19 checks passed

buildkite/synapse Build #3022 passed (17 minutes, 55 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 35 seconds)
Details
buildkite/synapse/check-style Passed (2 minutes, 30 seconds)
Details
buildkite/synapse/isort Passed (32 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (38 seconds)
Details
buildkite/synapse/packaging Passed (29 seconds)
Details
buildkite/synapse/pipeline Passed (13 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (12 minutes, 20 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (4 minutes, 35 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (10 minutes, 41 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (4 minutes, 32 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (12 minutes, 4 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (11 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (11 minutes, 10 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (4 minutes, 32 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Soft failed (exit status 1)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (4 minutes, 41 seconds)
Details
codecov/patch 23.07% of diff hit (target 0%)
Details
codecov/project 63.47% (target 0%)
Details
babolivier added a commit that referenced this pull request Aug 15, 2019
Merge tag 'v1.3.0'
Synapse 1.3.0 (2019-08-15)
==========================

Bugfixes
--------

- Fix 500 Internal Server Error on `publicRooms` when the public room list was
  cached. ([\#5851](#5851))

Synapse 1.3.0rc1 (2019-08-13)
==========================

Features
--------

- Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. ([\#5686](#5686))
- Add sd_notify hooks to ease systemd integration and allows usage of Type=Notify. ([\#5732](#5732))
- Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead. ([\#5754](#5754), [\#5848](#5848))
- Synapse can now be configured to not join remote rooms of a given "complexity" (currently, state events) over federation. This option can be used to prevent adverse performance on resource-constrained homeservers. ([\#5783](#5783))
- Allow defining HTML templates to serve the user on account renewal attempt when using the account validity feature. ([\#5807](#5807))

Bugfixes
--------

- Fix UISIs during homeserver outage. ([\#5693](#5693), [\#5789](#5789))
- Fix stack overflow in server key lookup code. ([\#5724](#5724))
- start.sh no longer uses deprecated cli option. ([\#5725](#5725))
- Log when we receive an event receipt from an unexpected origin. ([\#5743](#5743))
- Fix debian packaging scripts to correctly build sid packages. ([\#5775](#5775))
- Correctly handle redactions of redactions. ([\#5788](#5788))
- Return 404 instead of 403 when accessing /rooms/{roomId}/event/{eventId} for an event without the appropriate permissions. ([\#5798](#5798))
- Fix check that tombstone is a state event in push rules. ([\#5804](#5804))
- Fix error when trying to login as a deactivated user when using a worker to handle login. ([\#5806](#5806))
- Fix bug where user `/sync` stream could get wedged in rare circumstances. ([\#5825](#5825))
- The purge_remote_media.sh script was fixed. ([\#5839](#5839))

Deprecations and Removals
-------------------------

- Synapse now no longer accepts the `-v`/`--verbose`, `-f`/`--log-file`, or `--log-config` command line flags, and removes the deprecated `verbose` and `log_file` configuration file options. Users of these options should migrate their options into the dedicated log configuration. ([\#5678](#5678), [\#5729](#5729))
- Remove non-functional 'expire_access_token' setting. ([\#5782](#5782))

Internal Changes
----------------

- Make Jaeger fully configurable. ([\#5694](#5694))
- Add precautionary measures to prevent future abuse of `window.opener` in default welcome page. ([\#5695](#5695))
- Reduce database IO usage by optimising queries for current membership. ([\#5706](#5706), [\#5738](#5738), [\#5746](#5746), [\#5752](#5752), [\#5770](#5770), [\#5774](#5774), [\#5792](#5792), [\#5793](#5793))
- Improve caching when fetching `get_filtered_current_state_ids`. ([\#5713](#5713))
- Don't accept opentracing data from clients. ([\#5715](#5715))
- Speed up PostgreSQL unit tests in CI. ([\#5717](#5717))
- Update the coding style document. ([\#5719](#5719))
- Improve database query performance when recording retry intervals for remote hosts. ([\#5720](#5720))
- Add a set of opentracing utils. ([\#5722](#5722))
- Cache result of get_version_string to reduce overhead of `/version` federation requests. ([\#5730](#5730))
- Return 'user_type' in admin API user endpoints results. ([\#5731](#5731))
- Don't package the sytest test blacklist file. ([\#5733](#5733))
- Replace uses of returnValue with plain return, as returnValue is not needed on Python 3. ([\#5736](#5736))
- Blacklist some flakey tests in worker mode. ([\#5740](#5740))
- Fix some error cases in the caching layer. ([\#5749](#5749))
- Add a prometheus metric for pending cache lookups. ([\#5750](#5750))
- Stop trying to fetch events with event_id=None. ([\#5753](#5753))
- Convert RedactionTestCase to modern test style. ([\#5768](#5768))
- Allow looping calls to be given arguments. ([\#5780](#5780))
- Set the logs emitted when checking typing and presence timeouts to DEBUG level, not INFO. ([\#5785](#5785))
- Remove DelayedCall debugging from the test suite, as it is no longer required in the vast majority of Synapse's tests. ([\#5787](#5787))
- Remove some spurious exceptions from the logs where we failed to talk to a remote server. ([\#5790](#5790))
- Improve performance when making `.well-known` requests by sharing the SSL options between requests. ([\#5794](#5794))
- Disable codecov GitHub comments on PRs. ([\#5796](#5796))
- Don't allow clients to send tombstone events that reference the room it's sent in. ([\#5801](#5801))
- Deny redactions of events sent in a different room. ([\#5802](#5802))
- Deny sending well known state types as non-state events. ([\#5805](#5805))
- Handle incorrectly encoded query params correctly by returning a 400. ([\#5808](#5808))
- Handle pusher being deleted during processing rather than logging an exception. ([\#5809](#5809))
- Return 502 not 500 when failing to reach any remote server. ([\#5810](#5810))
- Reduce global pauses in the events stream caused by expensive state resolution during persistence. ([\#5826](#5826))
- Add a lower bound to well-known lookup cache time to avoid repeated lookups. ([\#5836](#5836))
- Whitelist history visbility sytests in worker mode tests. ([\#5843](#5843))
@mguentner mguentner referenced this pull request Aug 15, 2019
4 of 10 tasks complete
mguentner added a commit to mguentner/nixpkgs that referenced this pull request Aug 16, 2019
nixos/matrix-synapse: use notify instead of simple
Starting with 1.3.0, matrix-synapse supports notifying
systemd. Relevant PR: matrix-org/synapse#5732
maxice8 added a commit to maxice8/aports that referenced this pull request Aug 16, 2019
mguentner added a commit to mguentner/nixpkgs that referenced this pull request Aug 18, 2019
nixos/matrix-synapse: use notify instead of simple
Starting with 1.3.0, matrix-synapse supports notifying
systemd. Relevant PR: matrix-org/synapse#5732
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.