Fix

facebook · Apr 18, 2024 · bc3719d · bc3719d
1 parent e82fe7c
commit bc3719d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/db/db_impl/db_impl.cc b/db/db_impl/db_impl.cc
@@ -633,7 +633,7 @@ Status DBImpl::CloseHelper() {
     }
     for (auto& log : logs_) {
       uint64_t log_number = log.writer->get_log_number();
-      Status s = log.ClearWriter();
+      Status s = log.ClearWriter(immutable_db_options_.use_fsync);
       if (!s.ok()) {
         ROCKS_LOG_WARN(
             immutable_db_options_.info_log,

diff --git a/db/db_impl/db_impl.h b/db/db_impl/db_impl.h
@@ -1680,9 +1680,17 @@ class DBImpl : public DB {
       writer = nullptr;
       return w;
     }
-    Status ClearWriter() {
+    Status ClearWriter(bool use_fsync) {
       // TODO: plumb Env::IOActivity, Env::IOPriority
-      Status s = writer->WriteBuffer(WriteOptions());
+      WriteOptions wopts;
+      Status s = writer->WriteBuffer(wopts);
+      if (s.ok()) {
+        IOOptions opts;
+        s = WritableFileWriter::PrepareIOOptions(wopts, opts);
+        if (s.ok()) {
+          s = writer->file()->Sync(opts, use_fsync);
+        }
+      }
       delete writer;
       writer = nullptr;
       return s;

diff --git a/unreleased_history/behavior_changes/wal_sync_on_close.md b/unreleased_history/behavior_changes/wal_sync_on_close.md
@@ -0,0 +1 @@
+DB `Close()` will sync the WALs now