RDBC-694 Fix second leak - calling __exit__ multiple times on the same DocumentStore object causes leaks

Author: poissoncorp

ravendb/documents/identity/hilo.py

@@ -18,11 +18,11 @@ def __init__(self, conventions: "DocumentConventions", generate_id: Callable[[An
         self.__conventions = conventions
         self.__generate_id = generate_id
 
-    def try_get_id_from_instance(self, entity: object) -> Tuple[bool, Union[str, None]]:
+    def try_get_id_from_instance(self, entity: Union[object, dict]) -> Tuple[bool, Union[str, None]]:
         if not entity:
             raise ValueError("Entity cannot be None")
         identity_property = "Id"  # todo: make sure it's ok, create get_identity_property within conventions if not
-        value = entity.__dict__.get(identity_property, None)
+        value = (entity if isinstance(entity, dict) else entity.__dict__).get(identity_property, None)
         if isinstance(value, str):
             return True, value
         return False, None

ravendb/documents/store/definition.py

@@ -364,6 +364,8 @@ def remove_before_close(self, event: Callable[[], None]):
         self.__before_close.remove(event)
 
     def close(self):
+        if self._disposed:
+            return
         for event in self.__before_close:
             event()
 
@@ -377,8 +379,10 @@ def close(self):
                 self.__multi_db_hilo.return_unused_range()
             except Exception:
                 pass  # ignore
-        # todo: clear subscriptions
-        self._disposed = True
+
+        if self.subscriptions is not None:
+            self.subscriptions.close()
+
         for event in self.__after_close:
             event()
 
@@ -389,6 +393,7 @@ def close(self):
             lazy.value.close()
 
         self.__thread_pool_executor.shutdown()
+        self._disposed = True
 
     def open_session(
         self, database: Optional[str] = None, session_options: Optional[SessionOptions] = None

ravendb/serverwide/operations/common.py

@@ -222,9 +222,9 @@ def __init__(
         )
 
     def get_command(self, conventions: "DocumentConventions") -> RavenCommand[DeleteDatabaseResult]:
-        return self.__DeleteDatabaseCommand(conventions, self.__parameters)
+        return self._DeleteDatabaseCommand(conventions, self.__parameters)
 
-    class __DeleteDatabaseCommand(RavenCommand[DeleteDatabaseResult], RaftCommand):
+    class _DeleteDatabaseCommand(RavenCommand[DeleteDatabaseResult], RaftCommand):
         def __init__(self, conventions: DocumentConventions, parameters: DeleteDatabaseOperation.Parameters):
             super().__init__(DeleteDatabaseResult)