QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141120
Change subject: Have Wikimetrics use the redis module's configuration again
......................................................................
Have Wikimetrics use the redis module's configuration again
This change resets wikimetric's redis savepoints to
save 900 1
save 300 100
save 60 10000
and resets to
stop-writes-on-bgsave-error no
.
Depends On: I7a0a226053d562f879f188d1e42ff0b71b352c0a
Bug: 66911
Change-Id: Idecc81b2e052ed5d777a321141f60336ba8ae26b
---
M manifests/role/wikimetrics.pp
M modules/wikimetrics
2 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/141120/1
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index 877a185..6900b89 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -189,35 +189,24 @@
}
}
- # Install redis and use a custom config template.
- # Wikimetrics needs redis to save data for longer
- # than the default redis.conf.erb template allows.
- $redis_dir = '/a/redis'
- $redis_dbfilename = 'wikimetrics1-6379.rdb'
- class { '::redis':
- config_template => 'wikimetrics/redis.conf.erb',
- }
-
# TODO: Support installation of queue, web and database
# classes on different nodes (maybe?).
- class { '::wikimetrics::queue':
- require => [
- Exec['install_wikimetrics_dependencies'],
- Class['::redis'],
- ],
- }
-
class { '::wikimetrics::web':
mode => $web_mode,
require => Exec['install_wikimetrics_dependencies'],
}
- class { '::wikimetrics::scheduler':
- require => Exec['install_wikimetrics_dependencies'],
- }
-
# backup regardless of whether we are in debug mode or not
if $::wikimetrics_backup {
+ # When doing backups, we need to know the rdb file name.
+ # Hence, we cannot do with the defaults of the redis class.
+ $redis_dir = '/a/redis'
+ $redis_dbfilename = 'wikimetrics1-6379.rdb'
+ class { '::redis':
+ dir => $redis_dir,
+ dbfilename => $redis_dbfilename,
+ }
+
class { '::wikimetrics::backup':
destination => '/data/project/wikimetrics/backup',
db_name => $db_name_wikimetrics,
@@ -226,4 +215,15 @@
keep_days => 10,
}
}
+
+ class { '::wikimetrics::queue':
+ require => [
+ Exec['install_wikimetrics_dependencies'],
+ Class['::redis'],
+ ],
+ }
+
+ class { '::wikimetrics::scheduler':
+ require => Exec['install_wikimetrics_dependencies'],
+ }
}
diff --git a/modules/wikimetrics b/modules/wikimetrics
index bad3328..1e2f7e0 160000
--- a/modules/wikimetrics
+++ b/modules/wikimetrics
-Subproject commit bad33286addadafcf65bfa60868e90a216d1f5a0
+Subproject commit 1e2f7e0e969866a2725756acbd367089ad2bef76
--
To view, visit https://gerrit.wikimedia.org/r/141120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idecc81b2e052ed5d777a321141f60336ba8ae26b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
