From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Nov 2013 20:57:39 +0000 (-0800)
Subject: Revert "JounralingObjectStore: journal->committed_thru after replay"
X-Git-Tag: v0.73~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=703f9a09e2449712a99f0865db982cb0c66d820d;p=ceph.git

Revert "JounralingObjectStore: journal->committed_thru after replay"

committed_thru can race with the sync thread.

This reverts commit d8d27f13e11dcaefd3aa1c049b97c980283da575.
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 287f4b676717..4a2af08dd4c0 100644
--- 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
index 4147ced8a3ab..e662580ac42b 100644
--- 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;
 }