cleanups and adjust setvbuf param

project-tsurugi · Oct 6, 2023 · 4e665e9 · 4e665e9
1 parent 581d67b
commit 4e665e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/limestone/datastore.cpp b/src/limestone/datastore.cpp
@@ -156,7 +156,7 @@ void datastore::update_min_epoch_id(bool from_switch_epoch) noexcept {  // NOLIN
                 LOG_LP(ERROR) << "fflush failed, errno = " << errno;
                 std::abort();
             }
-            if (int rc = fsync(fileno(strm)); rc != 0) {
+            if (fsync(fileno(strm)) != 0) {
                 LOG_LP(ERROR) << "fsync failed, errno = " << errno;
                 std::abort();
             }

diff --git a/src/limestone/datastore_snapshot.cpp b/src/limestone/datastore_snapshot.cpp
@@ -219,7 +219,7 @@ void datastore::create_snapshot() noexcept {  // NOLINT(readability-function-cog
         LOG_LP(ERROR) << "cannot create snapshot file (" << snapshot_file << ")";
         std::abort();
     }
-    setvbuf(ostrm, nullptr, _IOFBF, 1024L * 1024L);  // NOLINT TODO: error check
+    setvbuf(ostrm, nullptr, _IOFBF, 128L * 1024L);  // NOLINT, NB. glibc may ignore size when _IOFBF and buffer=NULL
     static_assert(sizeof(log_entry::entry_type) == 1);
 #if defined SORT_METHOD_PUT_ONLY
     sortdb->each([&ostrm, last_key = std::string{}](std::string_view db_key, std::string_view db_value) mutable {

diff --git a/src/limestone/log_channel.cpp b/src/limestone/log_channel.cpp
@@ -49,7 +49,7 @@ void log_channel::begin_session() noexcept {
         LOG_LP(ERROR) << "I/O error, cannot make file on " <<  location_ << ", errno = " << errno;
         std::abort();
     }
-    setvbuf(strm_, nullptr, _IOFBF, 1024L * 1024L);  // NOLINT TODO: error check
+    setvbuf(strm_, nullptr, _IOFBF, 128L * 1024L);  // NOLINT, NB. glibc may ignore size when _IOFBF and buffer=NULL
     if (!registered_) {
         envelope_.add_file(log_file);
         registered_ = true;
@@ -62,7 +62,7 @@ void log_channel::end_session() noexcept {
         LOG_LP(ERROR) << "fflush failed, errno = " << errno;
         std::abort();
     }
-    if (int rc = fsync(fileno(strm_)); rc != 0) {
+    if (fsync(fileno(strm_)) != 0) {
         LOG_LP(ERROR) << "fsync failed, errno = " << errno;
         std::abort();
     }