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

Revert MSC3861 introspection cache, admin impersonation and account lock #16258

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Revert MSC3861 introspection cache, admin impersonation and account lock #16258

merged 7 commits into from
Sep 6, 2023

Conversation

sandhose
Copy link
Member

@sandhose sandhose commented Sep 5, 2023

@sandhose sandhose requested a review from a team as a code owner September 5, 2023 16:06
@sandhose sandhose changed the base branch from develop to release-v1.91 September 5, 2023 16:08
@clokep clokep mentioned this pull request Sep 5, 2023
Closed
@clokep clokep linked an issue Sep 5, 2023 that may be closed by this pull request
Synapse-1.91.1 unittest fails with Postgres DB due to missing optional authlib dependency #16244
Closed
@erikjohnston erikjohnston added the X-Release-Blocker Must be resolved before making a release label Sep 6, 2023
@erikjohnston
Copy link
Member

@sandhose this doesn't seem to include @hughns 's tests from #16215 ?

@sandhose
Copy link
Member Author

sandhose commented Sep 6, 2023

@erikjohnston I added the test for the admin token back (but not for impersonation since we're reverting that feature)

@erikjohnston erikjohnston merged commit 1940d99 into release-v1.91 Sep 6, 2023
37 checks passed
@erikjohnston erikjohnston deleted the quenting/revert-introspection-cache branch September 6, 2023 14:19
clokep added a commit that referenced this pull request Sep 6, 2023
@clokep
Add back newsfile from #16258.
fd50a9b
This was referenced Sep 7, 2023
Open
Closed
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Sep 8, 2023
@Midar
Update chat/matrix-synapse to 1.91.2
53392c6 
# Synapse 1.91.2 (2023-09-06)

### Bugfixes

- Revert [MSC3861](matrix-org/matrix-spec-proposals#3861) introspection cache, admin impersonation and account lock. ([\#16258](matrix-org/synapse#16258))


# Synapse 1.91.1 (2023-09-04)

### Bugfixes

- Fix a performance regression introduced in Synapse 1.91.0 where event persistence would cause an excessive linear growth in CPU usage. ([\#16220](matrix-org/synapse#16220))
Fizzadar added a commit to beeper/synapse-legacy-fork that referenced this pull request Sep 18, 2023
@Fizzadar
Merge tag 'v1.91.2' into merge-1.91
d444094 
- Revert [MSC3861](matrix-org/matrix-spec-proposals#3861) introspection cache, admin impersonation and account lock. ([\matrix-org#16258](matrix-org#16258))

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEF3tZXk38tRDFVnUIM/xY9qcRMEgFAmT4oZsACgkQM/xY9qcR
# MEhqCQ//WPvR3BMlw73hJZIcJXx+57PpgjBteq6xoiY1V6iB3mE9OlMMByGFlo/G
# 36mrQuwNWQvJ+3Dza82oMi3cyicPxVzDlyLBW76lc03eMmHV1shDee+XU+GzdLOF
# qCn1HQPo9CWLATZlBZyHMayzMGrwQ3bpNLtvszfAsoKX3Q7Ryh/0r+JOv7PbzHtp
# EV0hIdkyxCHnZKhcsvrtNE/XUkhk2Om6sIfyhMRDbIxVhFwtn6EihO5KItIEeO/z
# oriQep3Od97xBm457zIVODJ+Aav7d5jc9cOtiD4L4z3f6BtnmtEhw+sBCTDMfGPJ
# X3+vd/ngWU2zzmudXbKkH4DQWIAgQqoo8zaN0VlHuHG+6ZgVv0RwY980RjnepnJ/
# fjaOo674K/a0mWzgDdmpoAg4KbKxsDU4otgu5DrPVTgjbdlF63fdtc99NAY8RbA8
# WUM4vfzhZEnz951IWkZ2DWMW1F5s6Waoc8K633DZ1B6DUKi3K13XKd5MRRQp2xQ5
# e+TEpjD2kBefXRyyTgD4kh53LymglZUEN3VeRXyK+JYFgL/lVYzf+hezGNxHjYLd
# maXlTLBXfYoPqmVdZJQoZsNDS9nH179bfhFdHXi1Mx1j+9Zvdtqpu66arJTh/0DE
# qXXEMlYiYUXjaadHJ1T0bxk+TrtQS6Ay1c2ARu3c1OCeqbJPR9E=
# =9XJw
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Sep  6 16:58:19 2023 BST
# gpg:                using RSA key 177B595E4DFCB510C556750833FC58F6A7113048
# gpg: key 33FC58F6A7113048: public key "Patrick Cloke <[email protected]>" imported
# gpg: Total number processed: 1
# gpg:               imported: 1
# gpg: Good signature from "Patrick Cloke <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 177B 595E 4DFC B510 C556  7508 33FC 58F6 A711 3048

# Conflicts:
#	.github/workflows/twisted_trunk.yml
#	synapse/app/generic_worker.py
#	synapse/storage/databases/main/__init__.py
@matrixbot matrixbot mentioned this pull request Dec 22, 2023
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@erikjohnston erikjohnston erikjohnston approved these changes

Assignees
No one assigned
Labels
X-Release-Blocker Must be resolved before making a release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Synapse-1.91.1 unittest fails with Postgres DB due to missing optional authlib dependency
2 participants
@sandhose @erikjohnston