From 5ba9b8f21f8010c59dd84a0ef2acfec99e4b048f Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Wed, 10 Dec 2014 13:19:16 -0800 Subject: [PATCH] rados.py: remove Rados.__del__(); it just causes problems Recent versions of Python contain a change to thread shutdown that causes ceph to hang on exit; see http://bugs.python.org/issue21963. As it turns out, this is relatively easy to avoid by not spawning threads on exit, as Rados.__del__() will certainly do by calling shutdown(); I suspect, but haven't proven, that the problem is that shutdown() tries to start() a threading.Thread() that never makes it all the way back to signal start(). Also add a PendingReleaseNote and extra doc comments to clarify. Fixes: #8797 Signed-off-by: Dan Mick --- PendingReleaseNotes | 5 +++++ src/pybind/rados.py | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 67f1628a7e94c..62b79204964a1 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -28,3 +28,8 @@ v0.90 * The 'rados create [category]' optional category argument is no longer supported or recognized. + +* rados.py's Rados class no longer has a __del__ method; it was causing + problems on interpreter shutdown and use of threads. If your code has + Rados objects with limited lifetimes and you're concerned about locked + resources, call Rados.shutdown() explicitly. diff --git a/src/pybind/rados.py b/src/pybind/rados.py index 82521cacb8e6e..d6cfe2f07e492 100644 --- a/src/pybind/rados.py +++ b/src/pybind/rados.py @@ -259,7 +259,8 @@ Rados object in state %s." % (self.state)) def shutdown(self): """ - Disconnects from the cluster. + Disconnects from the cluster. Call this explicitly when a + Rados.connect()ed object is no longer used. """ if (self.__dict__.has_key("state") and self.state != "shutdown"): run_in_thread(self.librados.rados_shutdown, (self.cluster,)) @@ -273,9 +274,6 @@ Rados object in state %s." % (self.state)) self.shutdown() return False - def __del__(self): - self.shutdown() - def version(self): """ Get the version number of the ``librados`` C library. @@ -424,7 +422,7 @@ Rados object in state %s." % (self.state)) def connect(self, timeout=0): """ - Connect to the cluster. + Connect to the cluster. Use shutdown() to release resources. """ self.require_state("configuring") ret = run_in_thread(self.librados.rados_connect, (self.cluster,), -- 2.39.5