Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/199636

Change subject: graphite: enable locking writes
......................................................................

graphite: enable locking writes

our graphite clustering plan involves using carbonate while carbon-cache is
running, this can potentially lead to corrupted whisper files if locking isn't
used, see also https://github.com/jssjr/carbonate/issues/19

Bug: T86316
Change-Id: I76b064acf3b7ccad17313a4f05c3b72b3b01b798
---
M manifests/role/graphite.pp
M modules/graphite/manifests/init.pp
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/199636/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 315539f..cc8fd96 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -161,6 +161,7 @@
         },
 
         storage_dir         => $carbon_storage_dir,
+        whisper_lock_writes => true,
     }
 
     class { '::graphite::web':
diff --git a/modules/graphite/manifests/init.pp 
b/modules/graphite/manifests/init.pp
index f60fbb1..ad00d1f 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -13,6 +13,7 @@
     $storage_schemas,
     $storage_aggregation = {},
     $storage_dir = '/var/lib/carbon',
+    $whisper_lock_writes = false,
     ) {
     package { ['graphite-carbon', 'python-whisper']: }
 
@@ -30,6 +31,7 @@
         log_cache_hits           => false,
         log_cache_queue_sorts    => false,
         log_listener_connections => false,
+        whisper_lock_writes      => $whisper_lock_writes,
         user                     => undef,  # Don't suid; Upstart will do it 
for us.
         conf_dir                 => '/etc/carbon',
         log_dir                  => '/var/log/carbon',

-- 
To view, visit https://gerrit.wikimedia.org/r/199636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b064acf3b7ccad17313a4f05c3b72b3b01b798
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to