From 124eb5f28cf6e8a33a0d72a1ead8281f6a4e84a7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 30 May 2018 09:20:01 -0400 Subject: [PATCH] rgw: update ObjectCacheInfo::time_added on overwrite Fixes: http://tracker.ceph.com/issues/24346 Signed-off-by: Casey Bodley --- src/rgw/rgw_cache.cc | 1 + src/rgw/rgw_cache.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc index 797e22bc3dc..7dc2156b0a5 100644 --- a/src/rgw/rgw_cache.cc +++ b/src/rgw/rgw_cache.cc @@ -127,6 +127,7 @@ void ObjectCache::put(const string& name, ObjectCacheInfo& info, rgw_cache_entry auto [iter, inserted] = cache_map.emplace(name, ObjectCacheEntry{}); ObjectCacheEntry& entry = iter->second; + entry.info.time_added = ceph::coarse_mono_clock::now(); if (inserted) { entry.lru_iter = lru.end(); } diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index 1911db9bcf4..6dfc0318d50 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -58,7 +58,7 @@ struct ObjectCacheInfo { map rm_xattrs; ObjectMetaInfo meta; obj_version version = {}; - ceph::coarse_mono_time time_added = ceph::coarse_mono_clock::now(); + ceph::coarse_mono_time time_added; ObjectCacheInfo() = default; -- 2.47.3