fix-rotate-notifs-null-stream-ordering

Author: shcherbak

build/Dockerfile

@@ -23,6 +23,10 @@ COPY workers.patch /tmp/workers.patch
 RUN patch $(ls /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/config/workers.py) \
     < /tmp/workers.patch \
     && rm /tmp/workers.patch
+COPY fix-rotate-notifs-null-stream-ordering.patch /tmp/fix-rotate-notifs-null-stream-ordering.patch
+RUN patch $(ls /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/storage/databases/main/event_push_actions.py) \
+    < /tmp/fix-rotate-notifs-null-stream-ordering.patch \
+    && rm /tmp/fix-rotate-notifs-null-stream-ordering.patch
 
 # stage 3 : apply e2e_room_keys.patch
 FROM pipwheels AS e2e_patch
@@ -40,6 +44,9 @@ RUN --mount=type=bind,from=pipwheels,source=/wheels,target=/wheels \
 COPY --from=workers_patch \
   /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/config/workers.py \
   /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/config/workers.py
+COPY --from=workers_patch \
+  /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/storage/databases/main/event_push_actions.py \
+  /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/storage/databases/main/event_push_actions.py
 
 # stage 5 : base version with e2e_room_keys table optimization
 FROM main AS e2e

build/fix-rotate-notifs-null-stream-ordering.patch

@@ -0,0 +1,15 @@
+--- a/synapse/storage/databases/main/event_push_actions.py
++++ b/synapse/storage/databases/main/event_push_actions.py
+@@ -1464,6 +1464,12 @@
+             if not self.hs.is_mine_id(user_id):
+                 continue
+
++            # event_stream_ordering is NULL for federated receipts where
++            # the server doesn't have the event locally. No push actions
++            # exist for such events, so there is nothing to clean up.
++            if stream_ordering is None:
++                continue
++
+             thread_clause = ""
+             thread_args: tuple = ()
+             if thread_id is not None: