googleapis · daniel-sanche · Feb 25, 2025 · Feb 1, 2025 · Feb 21, 2025 · Feb 24, 2025
@@ -440,6 +440,9 @@ def on_snapshot(self, proto):
            proto(`google.cloud.firestore_v1.types.ListenResponse`):
                Callback method that receives a object to
        """
+        if self._closing.locked():
+            # don't process on_snapshot responses while spinning down, to prevent deadlock
+            return
        if proto is None:
            self.close()
            return

@@ -400,6 +400,15 @@ def test_watch_on_snapshot_target_w_none():
    assert inst._rpc is None


+def test_watch_on_snapshot_while_closing():
+    inst = _make_watch()
+    inst.close = mock.Mock()
+    with inst._closing:
+        inst.on_snapshot(mock.Mock())
+        # close should not be called again when already closing
+        inst.close.assert_not_called()
+
+
 def test_watch_on_snapshot_target_no_change_no_target_ids_not_current():
    inst = _make_watch()
    proto = _make_listen_response()