From a96fb63db6910a05e64716741f452e93d9060c7b Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Sun, 28 Jul 2013 18:27:23 -0600 Subject: [PATCH] Improved STORE_MEM_CLIENT detection. IN_MEMORY mem_status does not guarantee that the entore object is in the memory cache. We may be just loading it from a shared memrory cache, and loading may fail. We may have nibbled at the entry already (although that may not be possible, not sure). The whole memory/disk store_client designation probably needs more work, but the now-removed condition was causing store_client.cc:445: "STORE_DISK_CLIENT == getType()" assertions. --- src/store.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/store.cc b/src/store.cc index b1004cd483..20d9582468 100644 --- a/src/store.cc +++ b/src/store.cc @@ -318,11 +318,6 @@ StoreEntry::storeClientType() const * offset 0 in the memory object is the HTTP headers. */ - if (mem_status == IN_MEMORY && Config.memShared && IamWorkerProcess()) { - // clients of an object cached in shared memory are memory clients - return STORE_MEM_CLIENT; - } - assert(mem_obj); if (mem_obj->inmem_lo) -- 2.47.2