Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Only register devices edu handler on the master process#7255

Merged
anoadragon453 merged 2 commits intodevelopfrom
anoa/worker_edu_handler
Apr 14, 2020
Merged

Only register devices edu handler on the master process#7255
anoadragon453 merged 2 commits intodevelopfrom
anoa/worker_edu_handler

Conversation

@anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Apr 9, 2020

Fixes #7252

@anoadragon453 anoadragon453 changed the title Only register device edu handler on the master process Only register devices edu handler on the master process Apr 9, 2020
@anoadragon453 anoadragon453 requested a review from a team April 9, 2020 15:16
babolivier
babolivier approved these changes Apr 9, 2020
View reviewed changes
Copy link
Contributor

@babolivier babolivier left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please look for what broke it? If it happened in a change that hasn't been released yet (which I think is likely) then the changelog entry should probably be the same as that PR's.
Approving the review because the code lgtm.

@anoadragon453
Copy link
Member Author

anoadragon453 commented Apr 13, 2020

This was added 11 months ago: https://github.com/matrix-org/synapse/pull/5727/files#diff-41c6b7a9625f761adf0c8827779cd240R59-R62

So there might've been a deeper change in the incoming_signing_key_update function that caused this bug to surface now. Or... this isn't the only fix that's necessary.

@richvdh
Copy link
Member

richvdh commented Apr 13, 2020

This was added 11 months ago: https://github.com/matrix-org/synapse/pull/5727/files#diff-41c6b7a9625f761adf0c8827779cd240R59-R62

November 1 is... not 11 months ago.

Is it possible it's never worked right, and we're only testing it properly now?

@anoadragon453
Copy link
Member Author

anoadragon453 commented Apr 14, 2020

November 1 is... not 11 months ago.

It came from this commit, though I should've specified: 8d3542a

Is it possible it's never worked right, and we're only testing it properly now?

Always possible! :D

@anoadragon453 anoadragon453 merged commit fef82f4 into develop Apr 14, 2020
@anoadragon453 anoadragon453 deleted the anoa/worker_edu_handler branch April 14, 2020 09:10
anoadragon453 added a commit that referenced this pull request Apr 14, 2020
@anoadragon453
Only register devices edu handler on the master process (#7255)
ac6a848
anoadragon453 added a commit that referenced this pull request Apr 14, 2020
@anoadragon453
Merge branch 'release-v1.12.4' into HEAD
4cd2a4a 
* release-v1.12.4:
  Only register devices edu handler on the master process (#7255)
  tweak changelog
  1.12.3
  Fix the debian build in a better way. (#7212)
  Fix changelog wording
  1.12.2
  Pin Pillow>=4.3.0,<7.1.0 to fix dep issue
  1.12.1
richvdh added a commit that referenced this pull request Apr 22, 2020
@richvdh
Merge tag 'v1.12.4rc1' into develop
f16beaa 
Synapse 1.12.4rc1 (2020-04-22)
==============================

Features
--------

- Always send users their own device updates. ([\#7160](#7160))
- Add support for handling GET requests for `account_data` on a worker. ([\#7311](#7311))

Bugfixes
--------

- Fix a bug that prevented cross-signing with users on worker-mode synapses. ([\#7255](#7255))
- Do not treat display names as globs in push rules. ([\#7271](#7271))
- Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. ([\#7289](#7289))
clokep added a commit that referenced this pull request Apr 23, 2020
@clokep
Merge tag 'v1.12.4'
204664d 
Synapse v1.12.4

Features:

* Always send users their own device updates. (#7160)
* Add support for handling GET requests for account_data on a worker. (#7311)

Bugfixes:

* Fix a bug that prevented cross-signing with users on worker-mode synapses. (#7255)
* Do not treat display names as globs in push rules. (#7271)
* Fix a bug with cross-signing devices belonging to remote users who did not share a
  room with any user on the local homeserver. (#7289)
anoadragon453 added a commit that referenced this pull request Apr 24, 2020
@anoadragon453
Merge branch 'release-v1.12.4' of github.com:matrix-org/synapse into …
0ddaae8 
…anoa/temp_working_cache_config

* 'release-v1.12.4' of github.com:matrix-org/synapse: (123 commits)
  1.12.4
  formatting for the changelog
  1.12.4rc1
  1.12.4rc1
  Do not treat display names as globs for push rules. (#7271)
  Query missing cross-signing keys on local sig upload (#7289)
  Fix changelog file
  Support GET account_data requests on a worker (#7311)
  Revert "Query missing cross-signing keys on local sig upload"
  Always send the user updates to their own device list (#7160)
  Query missing cross-signing keys on local sig upload
  Only register devices edu handler on the master process (#7255)
  tweak changelog
  1.12.3
  Fix the debian build in a better way. (#7212)
  Fix changelog wording
  1.12.2
  Pin Pillow>=4.3.0,<7.1.0 to fix dep issue
  1.12.1
  Note where bugs were introduced
  ...
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request May 15, 2020
@anoadragon453 @phil-flex
Only register devices edu handler on the master process (matrix-org#7255
4725215 
)
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Only register devices edu handler on the master process (#7255)
a6b9338
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@babolivier babolivier babolivier approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@anoadragon453 @richvdh @babolivier