From 5837ec69d17659ac4e2b6520937316f7f4424cc3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 10 Apr 2015 17:07:34 -0700 Subject: [PATCH] osd: drop explicit sync/flush calls before umount Do it implicity on umount. Signed-off-by: Sage Weil --- src/ceph_osd.cc | 1 - src/os/FileStore.cc | 2 ++ src/osd/OSD.cc | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index c5a369024b8f2..c68aff70ce71a 100644 --- 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 0ec580a178ba3..f9d5554db8447 100644 --- 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 348724188cc2b..76619921a9215 100644 --- 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; -- 2.39.5