diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-09-24 17:11:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 17:11:12 +0100 |
| commit | f99a9c9cb062374eb532e3caf72eb4d2e784b574 (patch) | |
| tree | fb683a5d54a2edaf8365a1894fd306d2b15188fd | |
| parent | Merge pull request #6037 from matrix-org/rav/saml_mapping_work (diff) | |
| parent | Incorporate review (diff) | |
| download | synapse-f99a9c9cb062374eb532e3caf72eb4d2e784b574.tar.xz | |
Merge pull request #6092 from matrix-org/babolivier/background_update_deactivated_return
Fix the return value in the users_set_deactivated_flag background job
| -rw-r--r-- | changelog.d/6092.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/background_updates.py | 2 | ||||
| -rw-r--r-- | synapse/storage/registration.py | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/changelog.d/6092.bugfix b/changelog.d/6092.bugfix new file mode 100644 index 0000000000..01a7498ec6 --- /dev/null +++ b/changelog.d/6092.bugfix @@ -0,0 +1 @@ +Fix the logged number of updated items for the users_set_deactivated_flag background update. diff --git a/synapse/storage/background_updates.py b/synapse/storage/background_updates.py index e5f0668f09..9522acd972 100644 --- a/synapse/storage/background_updates.py +++ b/synapse/storage/background_updates.py @@ -218,7 +218,7 @@ class BackgroundUpdateStore(SQLBaseStore): duration_ms = time_stop - time_start logger.info( - "Updating %r. Updated %r items in %rms." + "Running background update %r. Processed %r items in %rms." " (total_rate=%r/ms, current_rate=%r/ms, total_updated=%r, batch_size=%r)", update_name, items_updated, diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index ee5e85db84..241a7be51e 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -865,7 +865,7 @@ class RegistrationStore( rows = self.cursor_to_dict(txn) if not rows: - return True + return True, 0 rows_processed_nb = 0 @@ -881,18 +881,18 @@ class RegistrationStore( ) if batch_size > len(rows): - return True + return True, len(rows) else: - return False + return False, len(rows) - end = yield self.runInteraction( + end, nb_processed = yield self.runInteraction( "users_set_deactivated_flag", _background_update_set_deactivated_flag_txn ) if end: yield self._end_background_update("users_set_deactivated_flag") - return batch_size + return nb_processed @defer.inlineCallbacks def add_access_token_to_user(self, user_id, token, device_id, valid_until_ms): |