Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291126
Change subject: Use quotes in some druid yaml values
......................................................................
Use quotes in some druid yaml values
Missing properties was not the problem. I think it is hyphens in string values
Change-Id: I5c0809ed345a69157fdd8410ef588979f3481ae9
---
M hieradata/eqiad/druid/broker.yaml
M hieradata/eqiad/druid/coordinator.yaml
M hieradata/eqiad/druid/historical.yaml
M hieradata/eqiad/druid/middlemanager.yaml
M hieradata/eqiad/druid/overlord.yaml
5 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/291126/1
diff --git a/hieradata/eqiad/druid/broker.yaml
b/hieradata/eqiad/druid/broker.yaml
index a9bec78..3a8156b 100644
--- a/hieradata/eqiad/druid/broker.yaml
+++ b/hieradata/eqiad/druid/broker.yaml
@@ -6,5 +6,5 @@
druid.broker.http.readTimeout: PT5M
env:
- DRUID_HEAP_OPTS: -Xmx25g -Xms25g
- DRUID_EXTRA_JVM_OPTS: -XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=64g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps
+ DRUID_HEAP_OPTS: "-Xmx25g -Xms25g"
+ DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=64g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/coordinator.yaml
b/hieradata/eqiad/druid/coordinator.yaml
index b87a67b..2135069 100644
--- a/hieradata/eqiad/druid/coordinator.yaml
+++ b/hieradata/eqiad/druid/coordinator.yaml
@@ -1,8 +1,3 @@
-# Not setting any properties here, but puppet errors with
-# 'Error from DataBinding 'hiera' while looking up
-# 'druid::coordinator::properties'' if it is not set.
-properties: {}
-
env:
- DRUID_HEAP_OPTS: -Xmx10g -Xms10g
- DRUID_EXTRA_JVM_OPTS:-XX:NewSize=512m -XX:MaxNewSize=512m -XX:+UseG1GC
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps
+ DRUID_HEAP_OPTS: "-Xmx10g -Xms10g"
+ DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=512m -XX:MaxNewSize=512m -XX:+UseG1GC
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/historical.yaml
b/hieradata/eqiad/druid/historical.yaml
index 833fc06..6e5de31 100644
--- a/hieradata/eqiad/druid/historical.yaml
+++ b/hieradata/eqiad/druid/historical.yaml
@@ -3,10 +3,10 @@
druid.processing.buffer.sizeBytes: 1073741824
druid.server.http.numThreads: 20
druid.server.maxSize: 2748779069440 # 2.5 TB
- druid.segmentCache.locations:
'[{"path":"/var/lib/druid/segment-cache","maxSize"\:2748779069440}]',
+ druid.segmentCache.locations:
'[{"path":"/var/lib/druid/segment-cache","maxSize"\:2748779069440}]'
druid.historical.cache.useCache: true,
druid.historical.cache.populateCache: true
env:
- DRUID_HEAP_OPTS: -Xmx12g -Xms12g
- DRUID_EXTRA_JVM_OPTS: -XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=32g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps
+ DRUID_HEAP_OPTS: "-Xmx12g -Xms12g"
+ DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=32g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/middlemanager.yaml
b/hieradata/eqiad/druid/middlemanager.yaml
index 38cc694..248642f 100644
--- a/hieradata/eqiad/druid/middlemanager.yaml
+++ b/hieradata/eqiad/druid/middlemanager.yaml
@@ -1,8 +1,8 @@
properties:
druid.worker.ip: ${::fqdn}
- druid.indexer.runner.javaOpts: -server -Xmx2g -XX:+UseG1GC
-XX:MaxGCPauseMillis=100 -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-Dhadoop.mapreduce.job.user.classpath.first=true
+ druid.indexer.runner.javaOpts: "-server -Xmx2g -XX:+UseG1GC
-XX:MaxGCPauseMillis=100 -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-Dhadoop.mapreduce.job.user.classpath.first=true"
druid.indexer.task.defaultHadoopCoordinates: cdh
env:
- DRUID_HEAP_OPTS: -Xmx64m -Xms64m
- DRUID_EXTRA_JVM_OPTS: -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps
+ DRUID_HEAP_OPTS: "-Xmx64m -Xms64m""
+ DRUID_EXTRA_JVM_OPTS: "-XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/overlord.yaml
b/hieradata/eqiad/druid/overlord.yaml
index f5aae7a..dbac08a 100644
--- a/hieradata/eqiad/druid/overlord.yaml
+++ b/hieradata/eqiad/druid/overlord.yaml
@@ -3,5 +3,5 @@
druid.indexer.storage.type: metadata
env:
- DRUID_HEAP_OPTS: -Xmx4g -Xms4g
- DRUID_EXTRA_JVM_OPTS: -XX:NewSize=256m -XX:MaxNewSize=256m
-XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
+ DRUID_HEAP_OPTS: "-Xmx4g -Xms4g"
+ DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=256m -XX:MaxNewSize=256m
-XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps"
--
To view, visit https://gerrit.wikimedia.org/r/291126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c0809ed345a69157fdd8410ef588979f3481ae9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
