Merge pull request ceph#61880 from idryomov/wip-70041

idryomov · web-flow · commit cfe543f7a320 · 2025-02-20T16:14:12.000+01:00
test/rbd_mirror: clear Namespace::s_instance at the end of a test

Reviewed-by: Vinay Bhaskar Varada &lt;vvarada@redhat.com&gt;
diff --git a/src/test/rbd_mirror/test_mock_PoolReplayer.cc b/src/test/rbd_mirror/test_mock_PoolReplayer.cc
@@ -56,9 +56,15 @@ class Namespace<MockTestImageCtx> {
   }
 
   Namespace() {
+    ceph_assert(s_instance == nullptr);
     s_instance = this;
   }
 
+  ~Namespace() {
+    ceph_assert(s_instance == this);
+    s_instance = nullptr;
+  }
+
   void add(const std::string &name) {
     std::lock_guard locker{m_lock};
 

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,15 @@ class Namespace<MockTestImageCtx> {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`Namespace() {`
	`59`	`+ ceph_assert(s_instance == nullptr);`
`59`	`60`	`s_instance = this;`
`60`	`61`	`}`
`61`	`62`
	`63`	`+ ~Namespace() {`
	`64`	`+ ceph_assert(s_instance == this);`
	`65`	`+ s_instance = nullptr;`
	`66`	`+ }`
	`67`	`+`
`62`	`68`	`void add(const std::string &name) {`
`63`	`69`	`std::lock_guard locker{m_lock};`
`64`	`70`