Make client attaching while an object is being swapped in disk clients

so they can do the swapin if needed.

diff --git a/src/store.cc b/src/store.cc
index ca7f0565595af87584d6e9186516bf8e626d3a55..dc3b80bdaa0bf1aa74b43ab4d374004e7b7825d6 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -313,11 +313,18 @@ StoreEntry::storeClientType() const
     if (store_status == STORE_OK) {
         /* the object has completed. */
 
-        if (mem_obj->inmem_lo == 0 && !isEmpty())
-            /* hot object */
-            return STORE_MEM_CLIENT;
-        else
-            return STORE_DISK_CLIENT;
+        if (mem_obj->inmem_lo == 0 && !isEmpty()) {
+           if (swap_status == SWAPOUT_DONE) {
+               if (mem_obj->endOffset() == mem_obj->object_sz) {
+                   /* hot object fully swapped in */
+                   return STORE_MEM_CLIENT;
+               }
+           } else {
+               /* Memory-only, or currently being swapped out */
+               return STORE_MEM_CLIENT;
+           }
+       }
+       return STORE_DISK_CLIENT;
     }
 
     /* here and past, entry is STORE_PENDING */