From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Apr 2015 20:57:40 +0000 (-0700)
Subject: Revert "os/newstore: avoid sync append for small ios"
X-Git-Tag: v9.1.0~242^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c1552001a2e12bfdcf8630292cb07da494dcb31;p=ceph.git

Revert "os/newstore: avoid sync append for small ios"

This reverts commit 69baab2f7eaca7688ce1d45802a82fc3539cd906.

This is slower.  :(
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 6463595e9b7e..b83fef4f8302 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -803,7 +803,6 @@ OPTION(newstore_fsync_thread_suicide_timeout, OPT_INT, 120) // suicide timeout v
 OPTION(newstore_wal_threads, OPT_INT, 4)
 OPTION(newstore_wal_thread_timeout, OPT_INT, 30)
 OPTION(newstore_wal_thread_suicide_timeout, OPT_INT, 120)
-OPTION(newstore_sync_append_min, OPT_INT, 65536)  // only do sync append for large ios
 OPTION(newstore_max_ops, OPT_U64, 512)
 OPTION(newstore_max_bytes, OPT_U64, 64*1024*1024)
 OPTION(newstore_wal_max_ops, OPT_U64, 512)
diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index aac07485497c..33c322a2c236 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -3320,9 +3320,8 @@ int NewStore::_do_write(TransContext *txc,
     }
   }
 
-  if (((o->onode.size <= offset || o->onode.size == 0) &&
-       length >= g_conf->newstore_sync_append_min) ||
-
+  if (o->onode.size <= offset ||
+      o->onode.size == 0 ||
       o->onode.data_map.empty()) {
     uint64_t x_offset;
     if (o->onode.data_map.empty()) {