Revert "JounralingObjectStore: journal->committed_thru after replay"

committed_thru can race with the sync thread. This reverts commit d8d27f1. Reviewed-by: Greg Farnum <[email protected]>
dragonylffly · Nov 18, 2013 · 703f9a0 · 703f9a0
1 parent 878f354
commit 703f9a0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
@@ -469,6 +469,7 @@ int FileJournal::open(uint64_t fs_op_seq)
 {
   dout(2) << "open " << fn << " fsid " << fsid << " fs_op_seq " << fs_op_seq << dendl;
 
+  last_committed_seq = fs_op_seq;
   uint64_t next_seq = fs_op_seq + 1;
 
   int err = _open(false);
@@ -527,11 +528,6 @@ int FileJournal::open(uint64_t fs_op_seq)
   // find next entry
   read_pos = header.start;
   uint64_t seq = header.start_seq;
-
-  // last_committed_seq is 1 before the start of the journal or
-  // 0 if the start is 0
-  last_committed_seq = seq > 0 ? seq - 1 : seq;
-
   while (1) {
     bufferlist bl;
     off64_t old_pos = read_pos;

diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc
@@ -100,8 +100,6 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq)
   // done reading, make writeable.
   journal->make_writeable();
 
-  journal->committed_thru(fs_op_seq);
-
   return count;
 }