Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372469 )
Change subject: Use absolute paths for `data_file_directories`
......................................................................
Use absolute paths for `data_file_directories`
For JBOD configurations, we need to be able to configure paths outside of
the "base directory" (where commitlogs, et al. are stored).
Bug: T169939
Change-Id: I89c8db6cc4a3a7399c45974a906670789fd3aa75
---
M hieradata/role/common/restbase/dev_cluster.yaml
M hieradata/role/common/restbase/production_ng.yaml
M modules/cassandra/manifests/instance.pp
3 files changed, 35 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/role/common/restbase/dev_cluster.yaml
b/hieradata/role/common/restbase/dev_cluster.yaml
index d1a5ee9..47aa05d 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -85,44 +85,44 @@
a:
listen_address: 10.64.0.167
data_file_directories:
- - data_0
- - data_1
- - data_2
- - data_3
+ - /srv/cassandra-a/data_0
+ - /srv/cassandra-a/data_1
+ - /srv/cassandra-a/data_2
+ - /srv/cassandra-a/data_3
jmx_exporter_enabled: true
b:
listen_address: 10.64.0.168
data_file_directories:
- - data_0
- - data_1
- - data_2
- - data_3
+ - /srv/cassandra-b/data_0
+ - /srv/cassandra-b/data_1
+ - /srv/cassandra-b/data_2
+ - /srv/cassandra-b/data_3
jmx_exporter_enabled: true
"restbase-dev1005.eqiad.wmnet":
a:
listen_address: 10.64.16.97
data_file_directories:
- - data_0
- - data_1
+ - /srv/cassandra-a/data_0
+ - /srv/cassandra-a/data_1
jmx_exporter_enabled: true
b:
listen_address: 10.64.16.98
data_file_directories:
- - data_0
- - data_1
+ - /srv/cassandra-b/data_0
+ - /srv/cassandra-b/data_1
jmx_exporter_enabled: true
"restbase-dev1006.eqiad.wmnet":
a:
listen_address: 10.64.48.168
data_file_directories:
- - data_0
- - data_1
+ - /srv/cassandra-a/data_0
+ - /srv/cassandra-a/data_1
jmx_exporter_enabled: true
b:
listen_address: 10.64.48.169
data_file_directories:
- - data_0
- - data_1
+ - /srv/cassandra-b/data_0
+ - /srv/cassandra-b/data_1
jmx_exporter_enabled: true
profile::cassandra::settings:
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 72e5241..afc3836 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -65,10 +65,28 @@
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
+ data_file_directories:
+ - /srv/sda4/cassandra-a/data
+ - /srv/sdb4/cassandra-a/data
+ - /srv/sdc4/cassandra-a/data
+ - /srv/sdd4/cassandra-a/data
+ - /srv/sde4/cassandra-a/data
b:
listen_address: 10.192.16.163
+ data_file_directories:
+ - /srv/sda4/cassandra-b/data
+ - /srv/sdb4/cassandra-b/data
+ - /srv/sdc4/cassandra-b/data
+ - /srv/sdd4/cassandra-b/data
+ - /srv/sde4/cassandra-b/data
c:
listen_address: 10.192.16.164
+ data_file_directories:
+ - /srv/sda4/cassanrda-c/data
+ - /srv/sdb4/cassanrda-c/data
+ - /srv/sdc4/cassanrda-c/data
+ - /srv/sdd4/cassanrda-c/data
+ - /srv/sde4/cassanrda-c/data
# "restbase2003.codfw.wmnet":
# a:
# listen_address: 10.192.32.134
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index f1e5bb0..34b5a53 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -76,8 +76,7 @@
$tls_hostname = "${::hostname}-${instance_name}"
$pid_file =
"/var/run/cassandra/cassandra-${instance_name}.pid"
$instance_id = "${::hostname}-${instance_name}"
- $data_directories = pick($this_instance['data_file_directories'],
['data'])
- $data_file_directories = prefix($data_directories,
"${data_directory_base}/")
+ $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
--
To view, visit https://gerrit.wikimedia.org/r/372469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89c8db6cc4a3a7399c45974a906670789fd3aa75
Gerrit-PatchSet: 6
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: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
