cleanup : remove sync_epoch

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 6b01c8189fb3d29e9a1cb86ae4918575d68331a7..261aa28582cf4db94321e9abe65c8ed259e9a618 100644 (file)
--- 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 27d6b85aa866f1259f667ec1983b34ec9322088d..f84d1361e0821117429d625e09582de690ca7c8c 100644 (file)
--- 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;