osd: fix flush_journal command

We need to sync_and_flush *and* sync() again in order to retire any items
in the FileStore journal.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index d0ab348d6a394a7639e6d63c3fbe6e263c7d8c4f..0ec580a178ba32d64e46fe150b863068c672a133 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3842,6 +3842,14 @@ void FileStore::sync_and_flush()
   dout(10) << "sync_and_flush done" << dendl;
 }
 
+int FileStore::flush_journal()
+{
+  dout(10) << __func__ << dendl;
+  sync_and_flush();
+  sync();
+  return 0;
+}
+
 int FileStore::snapshot(const string& name)
 {
   dout(10) << "snapshot " << name << dendl;

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 710a1ad8c90d10dd1fb7b5b8dfd3b8bdbff78a34..fdff2742cac2e8eb4c79235517737cf2d12921cd 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -577,6 +577,7 @@ public:
   void flush();
   void sync_and_flush();
 
+  int flush_journal();
   int dump_journal(ostream& out);
 
   void set_fsid(uuid_d u) {

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 5b72165360b1297c35970aaa46df3b2dd89b3ee4..7120db8b3211dae54d23b6faf7835947369f9849 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -2100,6 +2100,8 @@ public:
   virtual void sync(Context *onsync) {}
   virtual void sync() {}
   virtual void flush() {}
+
+  virtual int flush_journal() { return -EOPNOTSUPP; }
   virtual void sync_and_flush() {}
 
   virtual int dump_journal(ostream& out) { return -EOPNOTSUPP; }

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4fbcf7fc7a53c7cbc643f99dde9f5ea30cde4b8a..348724188cc2b6db5295c99f90ef142ef5977627 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1657,7 +1657,7 @@ bool OSD::asok_command(string command, cmdmap_t& cmdmap, string format,
     }
     f->close_section();
   } else if (command == "flush_journal") {
-    store->sync_and_flush();
+    store->flush_journal();
   } else if (command == "dump_ops_in_flight" ||
             command == "ops") {
     if (!op_tracker.tracking_enabled) {