Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343803 )
Change subject: Add Blazegraph options for proxy config
......................................................................
Add Blazegraph options for proxy config
Also add back ExitOnOutOfMemoryError option which appears to work,
but now added in a more flexible way and not hardcoded.
Bug: T160969
Change-Id: Ib6c98664a2bab5b1b5d31e4de5633b1c21641149
---
M hieradata/role/codfw/wdqs.yaml
M hieradata/role/eqiad/wdqs.yaml
M modules/wdqs/manifests/init.pp
M modules/wdqs/templates/blazegraph-default.erb
4 files changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/343803/1
diff --git a/hieradata/role/codfw/wdqs.yaml b/hieradata/role/codfw/wdqs.yaml
index c3e4fa3..9083c4b 100644
--- a/hieradata/role/codfw/wdqs.yaml
+++ b/hieradata/role/codfw/wdqs.yaml
@@ -1,2 +1,3 @@
lvs::realserver::realserver_ips:
- '10.2.1.32' # wdqs.svc.codfw.wmnet
+wdqs::blazegraph_options: '-Dhttp.proxyHost=webproxy.codfw.wmnet
-Dhttp.proxyPort=8080 -XX:+ExitOnOutOfMemoryError'
diff --git a/hieradata/role/eqiad/wdqs.yaml b/hieradata/role/eqiad/wdqs.yaml
index d5e3267..d29e53f 100644
--- a/hieradata/role/eqiad/wdqs.yaml
+++ b/hieradata/role/eqiad/wdqs.yaml
@@ -1,2 +1,3 @@
lvs::realserver::realserver_ips:
- '10.2.2.32' # wdqs.svc.eqiad.wmnet
+wdqs::blazegraph_options: '-Dhttp.proxyHost=webproxy.eqiad.wmnet
-Dhttp.proxyPort=8080 -XX:+ExitOnOutOfMemoryError'
diff --git a/modules/wdqs/manifests/init.pp b/modules/wdqs/manifests/init.pp
index 73fbf78..fcf4396 100644
--- a/modules/wdqs/manifests/init.pp
+++ b/modules/wdqs/manifests/init.pp
@@ -10,6 +10,7 @@
# - $log_dir: Directory where the logs go
# - $endpoint: External endpoint name
# - $blazegraph_heap_size: heapsize for blazegraph
+# - $blazegraph_options: options for Blazegraph statrup script
class wdqs(
$use_git_deploy = true,
$username = 'blazegraph',
@@ -18,6 +19,7 @@
$log_dir = '/var/log/wdqs',
$endpoint = '',
$blazegraph_heap_size = '16g',
+ $blazegraph_options = '',
) {
$deploy_user = 'deploy-service'
diff --git a/modules/wdqs/templates/blazegraph-default.erb
b/modules/wdqs/templates/blazegraph-default.erb
index 8d4fd83..4195e54 100644
--- a/modules/wdqs/templates/blazegraph-default.erb
+++ b/modules/wdqs/templates/blazegraph-default.erb
@@ -1 +1,2 @@
HEAP_SIZE=<%= @blazegraph_heap_size %>
+BLAZEGRAPH_OPTS=<%= @blazegraph_options %>
--
To view, visit https://gerrit.wikimedia.org/r/343803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6c98664a2bab5b1b5d31e4de5633b1c21641149
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
