From 136848d27f8fdbbaae9444061a412d60a2a6caaf Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 27 Mar 2019 19:17:46 -0400
Subject: [PATCH] librbd: enable the simple IO scheduler by default

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 PendingReleaseNotes   | 6 ++++++
 src/common/options.cc | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 255ac9f0ba1..eb4e9f54eec 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -20,3 +20,9 @@
   write IOs are completed prior to completing. The
   librbd cache policy can be controlled via a new
   "rbd_cache_policy" configuration option.
+
+* librbd now includes a simple IO scheduler which attempts to
+  batch together multiple IOs against the same backing RBD
+  data block object. The librbd IO scheduler policy can be
+  controlled via a new "rbd_io_scheduler" configuration
+  option.
diff --git a/src/common/options.cc b/src/common/options.cc
index da82ba3e28c..b3137157fba 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7295,7 +7295,7 @@ static std::vector<Option> get_rbd_options() {
     .set_description("RBD Image access timestamp refresh interval. Set to 0 to disable access timestamp update."),
 
     Option("rbd_io_scheduler", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("none")
+    .set_default("simple")
     .set_enum_allowed({"none", "simple"})
     .set_description("RBD IO scheduler"),
 
-- 
2.39.5