Merge 90780763c874f9ce47dca68e03a8f38a236fc515 into 24bcdb3f3c5aa2d8d2000dc34d54a8002a914616

changelog.d/18519.doc

@@ -1 +0,0 @@
-Fix documentation of the Delete Room Admin API's status field.

changelog.d/18625.misc

@@ -1 +0,0 @@
-Log the room ID we're purging state for.

docs/admin_api/rooms.md

@@ -806,7 +806,7 @@ A response body like the following is returned:
         }, {
             "delete_id": "delete_id2",
             "room_id": "!roomid:example.com",
-            "status": "active",
+            "status": "purging",
             "shutdown_room": {
                 "kicked_users": [
                     "@foobar:example.com"
@@ -843,7 +843,7 @@ A response body like the following is returned:
 
 ```json
 {
-    "status": "active",
+    "status": "purging",
     "delete_id": "bHkCNQpHqOaFhPtK",
     "room_id": "!roomid:example.com",
     "shutdown_room": {
@@ -876,8 +876,8 @@ The following fields are returned in the JSON response body:
   - `delete_id` - The ID for this purge
   - `room_id` - The ID of the room being deleted
   - `status` - The status will be one of:
-    - `scheduled` - The deletion is waiting to be started
-    - `active` - The process is purging the room and event data from database.
+    - `shutting_down` - The process is removing users from the room.
+    - `purging` - The process is purging the room and event data from database.
     - `complete` - The process has completed successfully.
     - `failed` - The process is aborted, an error has occurred.
   - `error` - A string that shows an error message if `status` is `failed`.

synapse/storage/controllers/purge_events.py

@@ -34,7 +34,6 @@ from synapse.metrics.background_process_metrics import wrap_as_background_proces
 from synapse.storage.database import LoggingTransaction
 from synapse.storage.databases import Databases
 from synapse.types.storage import _BackgroundUpdates
-from synapse.util.stringutils import shortstr
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -168,12 +167,6 @@ class PurgeEventsStorageController:
                 break
 
             (room_id, groups_to_sequences) = next_to_delete
-
-            logger.info(
-                "[purge] deleting state groups for room %s: %s",
-                room_id,
-                shortstr(groups_to_sequences.keys(), maxitems=10),
-            )
             made_progress = await self._delete_state_groups(
                 room_id, groups_to_sequences
             )