From 2f63e54f0fc15f7a98a4a3bb8dc9bcb6977db571 Mon Sep 17 00:00:00 2001 From: xinxin shu Date: Fri, 19 Dec 2014 09:07:52 +0800 Subject: [PATCH] cleanup : remove sync_epoch Signed-off-by: xinxin shu --- src/os/FileStore.cc | 7 ++----- src/os/FileStore.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 6b01c8189fb3d..261aa28582cf4 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -504,7 +504,7 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbit index_manager(do_update), ondisk_finisher(g_ceph_context), lock("FileStore::lock"), - force_sync(false), sync_epoch(0), + force_sync(false), sync_entry_timeo_lock("sync_entry_timeo_lock"), timer(g_ceph_context, sync_entry_timeo_lock), stop(false), sync_thread(this), @@ -3483,10 +3483,7 @@ void FileStore::sync_entry() logger->set(l_os_committing, 1); - // make flusher stop flushing previously queued stuff - sync_epoch++; - - dout(15) << "sync_entry committing " << cp << " sync_epoch " << sync_epoch << dendl; + dout(15) << "sync_entry committing " << cp << dendl; stringstream errstream; if (g_conf->filestore_debug_omap_check && !object_map->check(errstream)) { derr << errstream.str() << dendl; diff --git a/src/os/FileStore.h b/src/os/FileStore.h index 27d6b85aa866f..f84d1361e0821 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -159,7 +159,6 @@ private: Mutex lock; bool force_sync; Cond sync_cond; - uint64_t sync_epoch; Mutex sync_entry_timeo_lock; SafeTimer timer; -- 2.39.5