From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 May 2016 13:41:01 +0000 (+0100)
Subject: Enable request merging for NVMe devices
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/47d62e18357b8697a1e1f1e01c5617247ec5e69d?ds=sidebyside

Enable request merging for NVMe devices
---

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index ef153a918..50e4d3b2d 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -60,6 +60,15 @@ default_attributes(
         :max_children => "10"
       }
     }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"
+      }
+    }
   }
 )
 
diff --git a/roles/karm.rb b/roles/karm.rb
index 42b2e436a..6d2f15e79 100644
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -12,6 +12,19 @@ default_attributes(
         :hwaddress => "0c:c4:7a:a3:aa:ac"
       }
     }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1",
+        "block/nvme2n1/queue/nomerges" => "1",
+        "block/nvme3n1/queue/nomerges" => "1",
+        "block/nvme4n1/queue/nomerges" => "1",
+        "block/nvme5n1/queue/nomerges" => "1"
+      }
+    }
   }
 )