WIP

Author: NoahStapp

pymongo/asynchronous/client_session.py

@@ -137,7 +137,6 @@
 
 import collections
 import time
-import traceback
 import uuid
 from collections.abc import Mapping as _Mapping
 from typing import (

pymongo/asynchronous/mongo_client.py

@@ -35,7 +35,6 @@
 import asyncio
 import contextlib
 import os
-import traceback
 import warnings
 import weakref
 from collections import defaultdict

pymongo/synchronous/change_stream.py

@@ -255,7 +255,7 @@ def _run_aggregation_cmd(self, session: Optional[ClientSession]) -> CommandCurso
         )
 
     def _create_cursor(self) -> CommandCursor:  # type: ignore[type-arg]
-        with self._client._tmp_session(self._session, close=False) as s:
+        with self._client._tmp_session(self._session) as s:
             return self._run_aggregation_cmd(session=s)
 
     def _resume(self) -> None:

pymongo/synchronous/client_session.py

@@ -536,11 +536,14 @@ def _end_session(self, lock: bool) -> None:
     def _end_implicit_session(self) -> None:
         # Implicit sessions can't be part of transactions or pinned connections
         if self._server_session is not None:
+            # print(f"Ending session {self}, implicit: {self._implicit}, attached: {self._attached_to_cursor}")
             self._client._return_server_session(self._server_session)
             self._server_session = None
 
     def _check_ended(self) -> None:
         if self._server_session is None:
+            # print(f"Session {self} is already ended")
+            # print(f"Session {self} is already ended, implicit: {self._implicit}, attached: {self._attached_to_cursor}: {''.join(traceback.format_stack())}")
             raise InvalidOperation("Cannot use ended session")
 
     def __enter__(self) -> ClientSession:

pymongo/synchronous/collection.py

@@ -2577,7 +2577,7 @@ def _cmd(
             cmd_cursor._maybe_pin_connection(conn)
             return cmd_cursor
 
-        with self._database.client._tmp_session(session, False) as s:
+        with self._database.client._tmp_session(session) as s:
             return self._database.client._retryable_read(
                 _cmd, read_pref, s, operation=_Op.LIST_INDEXES
             )

pymongo/synchronous/command_cursor.py

@@ -242,6 +242,7 @@ def _die_lock(self) -> None:
     def _end_session(self) -> None:
         if self._session:
             if self._session.implicit:
+                # print(f"Ending session {self}, session: {self._session}")
                 self._session._end_implicit_session()
                 self._session = None
 

pymongo/synchronous/mongo_client.py

@@ -2080,6 +2080,7 @@ def _retryable_write(
         :param bulk: bulk abstraction to execute operations in bulk, defaults to None
         """
         with self._tmp_session(session) as s:
+            # print(f"Called retryable write with session = {session!r} and got {s}: {s._server_session!r}")
             return self._retry_with_session(retryable, func, s, bulk, operation, operation_id)
 
     def _cleanup_cursor_no_lock(
@@ -2286,6 +2287,7 @@ def _tmp_session(
             finally:
                 # Call end_session when we exit this scope.
                 if not s.attached_to_cursor:
+                    # print(f"Ending session {s}: {''.join(traceback.format_stack(limit=10))}")
                     s.end_session()
         else:
             yield None