Merge remote-tracking branch 'upstream/stable/v3.7.x' into stable/v3.8.x

eBay · Jan 31, 2025 · 07806df · 07806df
2 parents e94eef0 + 587bfbb
commit 07806df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -2,7 +2,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "3.8.0"
+    version = "3.8.1"
 
     homepage = "https://github.corp.ebay.com/SDS/homestore"
     description = "HomeStore"
@@ -56,7 +56,7 @@ def build_requirements(self):
 
     def requirements(self):
         self.requires("iomgr/8.8.1")
-        self.requires("sisl/8.9.1")
+        self.requires("sisl/8.9.2")
 
         # FOSS, rarely updated
         self.requires("boost/1.79.0")

diff --git a/src/engine/homeds/btree/writeBack_cache.hpp b/src/engine/homeds/btree/writeBack_cache.hpp
@@ -440,10 +440,6 @@ class WriteBackCache : public std::enable_shared_from_this< WriteBackCache< K, V
                     shared_this->m_blkstore->write(wb_req->bid, wb_req->m_mem, 0, wb_req, false);
                     ++write_count;
 
-                    // we are done with this wb_req
-                    HS_REL_ASSERT_EQ(wb_req, wb_req->bn->req[cp_id]);
-                    wb_req->bn->req[cp_id] = nullptr;
-
                     if (wb_cache_outstanding_cnt > ResourceMgrSI().get_dirty_buf_qd()) {
                         CP_PERIODIC_LOG(
                             DEBUG, bt_cp_id,