/synapse

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

Already on GitHub? Sign in to your account

When purging, don't de-delta state groups we're about to delete #2214

Merged
merged 3 commits into from May 11, 2017

Conversation

Reviewers

@erikjohnston erikjohnston

Assignees

@erikjohnston erikjohnston

Labels
maintenance
Projects
None yet
Milestone
No milestone
2 participants
@richvdh @erikjohnston
@richvdh
Member

richvdh commented May 10, 2017

... because that's (a) pointless (b) slow and (c) eats all my disk space just when I'm trying to free disk space

@richvdh richvdh assigned erikjohnston May 10, 2017

richvdh added some commits May 10, 2017

@richvdh
add some logging to purge_history
b64d312
@richvdh
Don't de-delta state groups we're about to delete

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2113 origin/rav/hurry_up_purge succeeded in 7 min 36 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2948 origin/rav/hurry_up_purge succeeded in 7 min 29 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3018 origin/rav/hurry_up_purge succeeded in 6 min 31 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
8e345ce
synapse/storage/events.py
- for i in xrange(0, len(state_groups_to_delete), 100)
- ]
- for chunk in chunks:
+ for i in xrange(0, len(state_rows), 100):
@erikjohnston

erikjohnston May 11, 2017

Owner

It seems odd to dedupe state_groups_to_delete and then use the non-deduped list here

@richvdh

richvdh May 11, 2017

Member

the set is for easy lookup at line 2101 rather than deduping. We can't easily divide a set into chunks, hence the use of the list here. There shouldn't be any dups because the query has a GROUP BY.

synapse/storage/events.py
- new_state_edges.extend(row["state_group"] for row in rows)
+ new_state_edges.extend(
+ row["state_group"] for row in rows
+ if row["state_group"] not in state_groups_to_delete
@erikjohnston

erikjohnston May 11, 2017

Owner

Can you comment this please? It took me a few moments to realise what was going on

@richvdh

richvdh May 11, 2017

Member

yup will do more comments

@erikjohnston

erikjohnston requested changes May 11, 2017
View changes

(see comments)

@erikjohnston erikjohnston assigned richvdh and unassigned erikjohnston May 11, 2017

@richvdh
Tidy purge code and add some comments 
Try to make this clearer with more comments and some variable renames

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2116 origin/rav/hurry_up_purge succeeded in 9 min 15 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2951 origin/rav/hurry_up_purge succeeded in 6 min 52 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3021 origin/rav/hurry_up_purge succeeded in 6 min 37 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
dc026bb
@richvdh
Member

richvdh commented May 11, 2017

@erikjohnston ptal

@richvdh richvdh assigned erikjohnston and unassigned richvdh May 11, 2017

@richvdh richvdh merged commit 29ded77 into develop May 11, 2017
8 checks passed

8 checks passed

Sytest Dendron (Commit) Build #2116 origin/rav/hurry_up_purge succeeded in 9 min 15 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #2951 origin/rav/hurry_up_purge succeeded in 6 min 52 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #3021 origin/rav/hurry_up_purge succeeded in 6 min 37 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@erikjohnston erikjohnston added the maintenance label May 17, 2017

psaavedra added a commit to psaavedra/synapse that referenced this pull request May 19, 2017

@psaavedra
Merge tag 'v0.21.0' into v0.21.0_no_federate_by_default 
Changes in synapse v0.21.0 (2017-05-18)
=======================================

No changes since v0.21.0-rc3

Changes in synapse v0.21.0-rc3 (2017-05-17)
===========================================

Features:

* Add per user rate-limiting overrides (PR #2208)
* Add config option to limit maximum number of events requested by ``/sync``
  and ``/messages`` (PR #2221) Thanks to @psaavedra!

Changes:

* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228,
  #2229)
* Update username availability checker API (PR #2209, #2213)
* When purging, don't de-delta state groups we're about to delete (PR #2214)
* Documentation to check synapse version (PR #2215) Thanks to @hamber-dick!
* Add an index to event_search to speed up purge history API (PR #2218)

Bug fixes:

* Fix API to allow clients to upload one-time-keys with new sigs (PR #2206)

Changes in synapse v0.21.0-rc2 (2017-05-08)
===========================================

Changes:

* Always mark remotes as up if we receive a signed request from them (PR #2190)

Bug fixes:

* Fix bug where users got pushed for rooms they had muted (PR #2200)

Changes in synapse v0.21.0-rc1 (2017-05-08)
===========================================

Features:

* Add username availability checker API (PR #2183)
* Add read marker API (PR #2120)

Changes:

* Enable guest access for the 3pl/3pid APIs (PR #1986)
* Add setting to support TURN for guests (PR #2011)
* Various performance improvements (PR #2075, #2076, #2080, #2083, #2108,
  #2158, #2176, #2185)
* Make synctl a bit more user friendly (PR #2078, #2127) Thanks @APwhitehat!
* Replace HTTP replication with TCP replication (PR #2082, #2097, #2098,
  #2099, #2103, #2014, #2016, #2115, #2116, #2117)
* Support authenticated SMTP (PR #2102) Thanks @DanielDent!
* Add a counter metric for successfully-sent transactions (PR #2121)
* Propagate errors sensibly from proxied IS requests (PR #2147)
* Add more granular event send metrics (PR #2178)

Bug fixes:

* Fix nuke-room script to work with current schema (PR #1927) Thanks
  @zuckschwerdt!
* Fix db port script to not assume postgres tables are in the public schema
  (PR #2024) Thanks @jerrykan!
* Fix getting latest device IP for user with no devices (PR #2118)
* Fix rejection of invites to unreachable servers (PR #2145)
* Fix code for reporting old verify keys in synapse (PR #2156)
* Fix invite state to always include all events (PR #2163)
* Fix bug where synapse would always fetch state for any missing event (PR #2170)
* Fix a leak with timed out HTTP connections (PR #2180)
* Fix bug where we didn't time out HTTP requests to ASes  (PR #2192)

Docs:

* Clarify doc for SQLite to PostgreSQL port (PR #1961) Thanks @benhylau!
* Fix typo in synctl help (PR #2107) Thanks @HarHarLinks!
* ``web_client_location`` documentation fix (PR #2131) Thanks @matthewjwolff!
* Update README.rst with FreeBSD changes (PR #2132) Thanks @feld!
* Clarify setting up metrics (PR #2149) Thanks @encks!
badd30b

@richvdh richvdh deleted the rav/hurry_up_purge branch Oct 9, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment