RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup : remove sync_epoch

Browse Source 
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
This commit is contained in:
xinxin shu 2014-12-19 09:07:52 +08:00
parent af18cf8d61
commit 2f63e54f0f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/os/FileStore.cc
View File

@ -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;

1
src/os/FileStore.h
View File

@ -159,7 +159,6 @@ private:
Mutex lock;
bool force_sync;
Cond sync_cond;
uint64_t sync_epoch;
Mutex sync_entry_timeo_lock;
SafeTimer timer;