JournalingObjectStore: journal_replay committed_seq fix

Previously, committed_seq was set to op_seq at the end of
replay_journal.  committed_seq should not actually be set until the
sync thread runs.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc
index 1b960638701f5f095dbcc14f2df3ede21da214d3..c41d505bfa7545d5e54ae5463c1f5f046a92e443 100644 (file)
--- a/src/os/JournalingObjectStore.cc
+++ b/src/os/JournalingObjectStore.cc
@@ -31,6 +31,7 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq)
   dout(10) << "journal_replay fs op_seq " << fs_op_seq << dendl;
   op_seq = fs_op_seq;
   committed_seq = op_seq;
+       committing_seq = op_seq;
   applied_seq = fs_op_seq;
 
   if (!journal)
@@ -80,7 +81,6 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq)
     seq++;  // we expect the next op
   }
 
-  committed_seq = op_seq;
   applied_seq = op_seq;
 
   // done reading, make writeable.