Merge pull request #50 from vinser52/fix_unresolved_handle

Fix issue with "Destorying an unresolved handle"
intel · Feb 17, 2022 · 019b2a5 · 019b2a5
2 parents 043df5f + c95b2b3
commit 019b2a5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cachelib/allocator/Handle.h b/cachelib/allocator/Handle.h
@@ -392,6 +392,12 @@ struct ReadHandleImpl {
       }
     }
 
+   protected:
+    friend class ReadHandleImpl;
+    // Method used only by ReadHandleImpl ctor
+    void discard() {
+      it_.store(nullptr, std::memory_order_relaxed);
+    }
    private:
     // we are waiting on Item* to be set to a value. One of the valid values is
     // nullptr. So choose something that we dont expect to indicate a ptr
@@ -475,6 +481,7 @@ struct ReadHandleImpl {
     if (it_ && it_->isIncomplete()) {
       waitContext_ = std::make_shared<ItemWaitContext>(alloc);
       if (!alloc_->addWaitContextForMovingItem(it->getKey(), waitContext_)) {
+        waitContext_->discard();
         waitContext_.reset();
       }
     }