From: Tim Serong <tserong@suse.com>
Date: Thu, 9 Sep 2021 07:08:24 +0000 (+1000)
Subject: pybind/rados: don't close watch in dealloc if already closed
X-Git-Tag: v16.2.15~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cbcbe26a708ccd146fdaec6d4186bbb87d98900;p=ceph.git

pybind/rados: don't close watch in dealloc if already closed

Fixes: https://tracker.ceph.com/issues/52553
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit d292d01635c203384a9ecb1876e54014b5a8b5c4)
---

diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
index 06c4a3547303..5d1b61536daa 100644
--- a/src/pybind/rados/rados.pyx
+++ b/src/pybind/rados/rados.pyx
@@ -2056,6 +2056,8 @@ cdef class Watch(object):
         return False
 
     def __dealloc__(self):
+        if self.id == 0:
+            return
         self.ioctx.rados.require_state("connected")
         self.close()