Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375048 )
Change subject: Instance-configurable `heapdump_directory`
......................................................................
Instance-configurable `heapdump_directory`
In a multi-instance, JBOD configuration, we need to configure
heapdumps to be stored on the individually mounted devices, and not
under a common base.
This changeset also configures 2001 (the first node of this type)
accordingly.
Bug: T169939
Change-Id: I01e775cfe1ad55f0ce7b6a018a545b7b77ad75ed
---
M hieradata/role/common/restbase/production_ng.yaml
M modules/cassandra/manifests/init.pp
M modules/cassandra/manifests/instance.pp
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index afc3836..4d41ef5 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -71,6 +71,7 @@
- /srv/sdc4/cassandra-a/data
- /srv/sdd4/cassandra-a/data
- /srv/sde4/cassandra-a/data
+ heapdump_directory: /srv/sda4/cassandra-a
b:
listen_address: 10.192.16.163
data_file_directories:
@@ -79,6 +80,7 @@
- /srv/sdc4/cassandra-b/data
- /srv/sdd4/cassandra-b/data
- /srv/sde4/cassandra-b/data
+ heapdump_directory: /srv/sdb4/cassandra-b
c:
listen_address: 10.192.16.164
data_file_directories:
@@ -87,6 +89,7 @@
- /srv/sdc4/cassanrda-c/data
- /srv/sdd4/cassanrda-c/data
- /srv/sde4/cassanrda-c/data
+ heapdump_directory: /srv/sdc4/cassandra-c
# "restbase2003.codfw.wmnet":
# a:
# listen_address: 10.192.32.134
diff --git a/modules/cassandra/manifests/init.pp
b/modules/cassandra/manifests/init.pp
index a168807..0e9d9c3 100644
--- a/modules/cassandra/manifests/init.pp
+++ b/modules/cassandra/manifests/init.pp
@@ -268,7 +268,7 @@
$data_file_directories = ['/var/lib/cassandra/data'],
$commitlog_directory = '/var/lib/cassandra/commitlog',
$hints_directory = '/var/lib/cassandra/data/hints',
- $heapdump_directory = '/var/lib/cassandra/',
+ $heapdump_directory = undef,
$disk_failure_policy = 'stop',
$row_cache_size_in_mb = 200,
$memory_allocator = 'JEMallocAllocator',
@@ -449,7 +449,7 @@
'data_file_directories' => $data_file_directories,
'commitlog_directory' => $commitlog_directory,
'hints_directory' => $hints_directory,
- 'heapdump_directory' => $heapdump_directory,
+ 'heapdump_directory' => pick($heapdump_directory,
'/var/lib/cassandra/'),
'saved_caches_directory' => $saved_caches_directory,
}}
cassandra::instance{ 'default':
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index 34b5a53..2e4b655 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -79,7 +79,7 @@
$data_file_directories =
pick($this_instance['data_file_directories'], ["${data_directory_base}/data"])
$commitlog_directory = "${data_directory_base}/commitlog"
$hints_directory = "${data_directory_base}/data/hints"
- $heapdump_directory = $data_directory_base
+ $heapdump_directory = pick($this_instance['heapdump_directory'],
$data_directory_base)
$saved_caches_directory = "${data_directory_base}/saved_caches"
}
--
To view, visit https://gerrit.wikimedia.org/r/375048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01e775cfe1ad55f0ce7b6a018a545b7b77ad75ed
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
