osd: drop explicit sync/flush calls before umount

Do it implicity on umount.

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

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index c5a369024b8f24f6a33fd4925cfa34a79776b8ea..c68aff70ce71ae3d927fcf311b4b4586e66eb1a4 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -315,7 +315,6 @@ int main(int argc, const char **argv)
           << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
       exit(1);
     }
-    store->sync_and_flush();
     store->umount();
     derr << "flushed journal " << g_conf->osd_journal
         << " for object store " << g_conf->osd_data

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 0ec580a178ba32d64e46fe150b863068c672a133..f9d5554db844759ab51c0387955f43d813301309 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1697,6 +1697,8 @@ int FileStore::umount()
 {
   dout(5) << "umount " << basedir << dendl;
   
+  flush();
+  sync();
   do_force_sync();
 
   lock.Lock();

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 348724188cc2b6db5295c99f90ef142ef5977627..76619921a9215b43d9c49c620ac780fb6b536263 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2407,8 +2407,6 @@ int OSD::shutdown()
   }
 
   dout(10) << "syncing store" << dendl;
-  store->flush();
-  store->sync();
   store->umount();
   delete store;
   store = 0;