Merge pull request #3658 from matrix-org/rav/fix_event_persisted_posi…

…tion_metrics Fix occasional glitches in the synapse_event_persisted_position metric
matrix-org · Aug 7, 2018 · e5d2c67 · e5d2c67
2 parents 9b92720 + 865d07c
commit e5d2c67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/changelog.d/3658.bugfix b/changelog.d/3658.bugfix
@@ -0,0 +1 @@
+Fix occasional glitches in the synapse_event_persisted_position metric
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
@@ -485,9 +485,14 @@ def _persist_events(self, events_and_contexts, backfilled=False,
                     new_forward_extremeties=new_forward_extremeties,
                 )
                 persist_event_counter.inc(len(chunk))
-                synapse.metrics.event_persisted_position.set(
-                    chunk[-1][0].internal_metadata.stream_ordering,
-                )
+
+                if not backfilled:
+                    # backfilled events have negative stream orderings, so we don't
+                    # want to set the event_persisted_position to that.
+                    synapse.metrics.event_persisted_position.set(
+                        chunk[-1][0].internal_metadata.stream_ordering,
+                    )
+
                 for event, context in chunk:
                     if context.app_service:
                         origin_type = "local"