BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193301
Change subject: removing discard on jessie cache SSDs
......................................................................
removing discard on jessie cache SSDs
Change-Id: I3c7941861631c8b2eee20590827afa85094eb6ae
---
M manifests/role/cache.pp
M modules/varnish/manifests/setup_filesystem.pp
2 files changed, 1 insertion(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/193301/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3bba663..cfab629 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -817,17 +817,6 @@
varnish_instances => [ '', 'frontend' ],
}
}
-
- if $::realm == 'production' and os_version('debian >= jessie') {
- # set discard for ext4 rootfs on nodes using SSD backend storage
- mount { '/':
- ensure => mounted,
- fstype => 'ext4',
- options => 'errors=remount-ro,discard',
- pass => 1,
- remounts => true,
- }
- }
}
class text inherits role::cache::varnish::2layer {
diff --git a/modules/varnish/manifests/setup_filesystem.pp
b/modules/varnish/manifests/setup_filesystem.pp
index e972cb5..31b53ab 100644
--- a/modules/varnish/manifests/setup_filesystem.pp
+++ b/modules/varnish/manifests/setup_filesystem.pp
@@ -5,7 +5,7 @@
elsif os_version('debian >= jessie') {
# setup_filesystem is only used on the non-bits caches,
# which are all set up as ext4-on-SSD...
- $custom_mount_opts = ',nobarrier,data=writeback,discard'
+ $custom_mount_opts = ',nobarrier,data=writeback'
}
else {
# nodiratime is redundant, but I'm hoping to avoid
--
To view, visit https://gerrit.wikimedia.org/r/193301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7941861631c8b2eee20590827afa85094eb6ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
