Skip to content

Commit 38630a4

Browse files
andresgomezfrrandresgomezfrr
authored
WIZZIE-3467 Update druid docker to 0.13.0-incubating (#17)
1 parent 9449299 commit 38630a4

File tree

11 files changed

+49
-23
lines changed

11 files changed

+49
-23
lines changed

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM openjdk:8-jdk
1+
FROM openjdk:8-jre-slim
22

3-
ARG DRUID_VERSION=0.12.1
3+
ARG DRUID_VERSION=0.13.0-incubating
44
ENV DRUID_VERSION ${DRUID_VERSION}
55
ENV LOG_LEVEL info
66
RUN apt-get update
77
RUN apt-get install -y curl gettext-base
8-
RUN curl http://static.druid.io/artifacts/releases/druid-${DRUID_VERSION}-bin.tar.gz > /opt/druid-${DRUID_VERSION}-bin.tar.gz
8+
RUN curl http://apache.rediris.es/incubator/druid/${DRUID_VERSION}/apache-druid-${DRUID_VERSION}-bin.tar.gz > /opt/druid-${DRUID_VERSION}-bin.tar.gz
99
RUN tar -xvf /opt/druid-${DRUID_VERSION}-bin.tar.gz -C /opt/ && rm -f /opt/druid-${DRUID_VERSION}-bin.tar.gz
10-
RUN mv /opt/druid-${DRUID_VERSION} /opt/druid && mkdir -p /var/log/druid && mkdir -p /opt/druid/data
10+
RUN mv /opt/apache-druid-${DRUID_VERSION} /opt/druid && mkdir -p /var/log/druid && mkdir -p /opt/druid/data
1111
RUN rm -f -r /opt/druid/conf /opt/druid/conf-quickstart
1212

1313
COPY conf /opt/druid/conf/

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ The JVM arguments to execute the druid services.
4040
* **DRUID_PULL_EXTENSION**
4141
The druid extension to download, this download is performed at running time. You need to pass the extension with whitespace: `extension1:extension1:version extension2:extension2:version`
4242

43+
* **AWS_REGION**
44+
AWS region this is needed to work with AWS S3 extension.
45+
4346
## Examples
4447

4548
* **Coordinator**

‎conf/_common/common.runtime.properties_env

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,33 @@ druid.zk.service.host=${ZOOKEEPER_SERVER}
1414
# Logging
1515
druid.emitter=logging
1616
druid.emitter.logging.logLevel=${LOG_LEVEL}
17+
druid.startup.logging.logProperties=true
1718

1819
# Metadata Storage
1920
druid.metadata.storage.type=derby
2021
druid.metadata.storage.connector.connectURI=jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
2122
druid.metadata.storage.connector.host=localhost
2223
druid.metadata.storage.connector.port=1527
2324

25+
# Service discovery
26+
druid.selectors.indexing.serviceName=druid/overlord
27+
druid.selectors.coordinator.serviceName=druid/coordinator
28+
29+
# Indexing service logs
30+
druid.indexer.logs.type=file
31+
druid.indexer.logs.directory=var/druid/indexing-logs
32+
33+
# Monitoring
34+
druid.monitoring.monitors=["org.apache.druid.java.util.metrics.JvmMonitor"]
35+
druid.emitter=logging
36+
druid.emitter.logging.logLevel=info
37+
2438
# Deep Storage
2539
druid.storage.type=local
2640
druid.storage.storageDirectory=var/druid/segments
41+
42+
# Security
43+
druid.server.hiddenProperties=["druid.s3.accessKey","druid.s3.secretKey","druid.metadata.storage.connector.password"]
44+
45+
# SQL
46+
druid.sql.enable=true

‎conf/_common/jets3t.properties_env

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎conf/broker/runtime.properties_env

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
# General
22
druid.service=${DRUID_SERVICE}
33
druid.host=${DRUID_HOST}
4-
druid.port=${DRUID_SERVICE_PORT}
4+
druid.plaintextPort=${DRUID_SERVICE_PORT}
55

66
# HTTP
77
druid.broker.http.numConnections=5
88
druid.server.http.numThreads=9
99

10-
druid.broker.cache.useCache=true
11-
druid.broker.cache.populateCache=true
12-
druid.cache.type=local
13-
druid.cache.sizeInBytes=10000000
14-
1510
# Logging
1611
druid.monitoring.monitors=["io.druid.client.cache.CacheMonitor", "com.metamx.metrics.JvmMonitor"]
1712

@@ -22,3 +17,8 @@ druid.processing.buffer.sizeBytes=256000000
2217
# Queries
2318
druid.query.groupBy.singleThreaded=false
2419
druid.query.topN.minTopNThreshold=100
20+
21+
druid.broker.cache.useCache=true
22+
druid.broker.cache.populateCache=true
23+
druid.cache.type=local
24+
druid.cache.sizeInBytes=10000000

‎conf/coordinator/runtime.properties_env

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# General
22
druid.service=${DRUID_SERVICE}
33
druid.host=${DRUID_HOST}
4-
druid.port=${DRUID_SERVICE_PORT}
5-
druid.coordinator.startDelay=PT60S
4+
druid.plaintextPort=${DRUID_SERVICE_PORT}
5+
6+
druid.coordinator.startDelay=PT10S
7+
druid.coordinator.period=PT5S

‎conf/historical/runtime.properties_env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# General
22
druid.service=${DRUID_SERVICE}
33
druid.host=${DRUID_HOST}
4-
druid.port=${DRUID_SERVICE_PORT}
4+
druid.plaintextPort=${DRUID_SERVICE_PORT}
5+
56
druid.server.http.numThreads=9
67

78
druid.server.maxSize=5368709120
@@ -13,4 +14,3 @@ druid.monitoring.monitors=["io.druid.client.cache.CacheMonitor", "com.metamx.met
1314
# Processing
1415
druid.processing.buffer.sizeBytes=256000000
1516
druid.processing.numThreads=2
16-
druid.query.topN.minTopNThreshold=100

‎conf/middleManager/runtime.properties_env

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
druid.service=${DRUID_SERVICE}
33
druid.host=${DRUID_HOST}
44
druid.worker.ip=${DRUID_HOST}
5-
druid.port=${DRUID_SERVICE_PORT}
5+
druid.plaintextPort=${DRUID_SERVICE_PORT}
6+
7+
# HTTP server threads
8+
druid.server.http.numThreads=9
69

710
# Indexing
811
druid.worker.capacity=2
912
druid.indexer.runner.startPort=7081
1013

1114
# Processing
12-
druid.indexer.fork.property.druid.server.http.numThreads=20
13-
druid.indexer.fork.property.druid.processing.buffer.sizeBytes=536870912
15+
druid.indexer.fork.property.druid.processing.buffer.sizeBytes=256000000
1416
druid.indexer.fork.property.druid.processing.numThreads=2
1517

1618
# Logging

‎conf/overlord/runtime.properties_env

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# General
22
druid.service=${DRUID_SERVICE}
33
druid.host=${DRUID_HOST}
4-
druid.port=${DRUID_SERVICE_PORT}
4+
druid.plaintextPort=${DRUID_SERVICE_PORT}
5+
6+
druid.indexer.queue.startDelay=PT5S
57

68
# Indexing
79
druid.indexer.runner.type=remote

‎druid-pull-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
pushd /opt/druid
33
if [[ ! -z "${DRUID_PULL_EXTENSION}" ]]; then
4-
java -cp "lib/*" -Ddruid.extensions.directory="extensions" -Ddruid.extensions.hadoopDependenciesDir="hadoop-dependencies" io.druid.cli.Main tools pull-deps --no-default-hadoop `for n in $(echo ${DRUID_PULL_EXTENSION} ); do echo -n "-c $n "; done`
4+
java -cp "lib/*" -Ddruid.extensions.directory="extensions" -Ddruid.extensions.hadoopDependenciesDir="hadoop-dependencies" org.apache.druid.cli.Main tools pull-deps --no-default-hadoop `for n in $(echo ${DRUID_PULL_EXTENSION} ); do echo -n "-c $n "; done`
55
fi
66
popd

‎druid-start.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
envsubst < /opt/druid/conf/_common/common.runtime.properties_env > /opt/druid/conf/_common/common.runtime.properties
55
envsubst < /opt/druid/conf/_common/log4j2.xml_env > /opt/druid/conf/_common/log4j2.xml
6-
envsubst < /opt/druid/conf/_common/jets3t.properties_env > /opt/druid/conf/_common/jets3t.properties
76
envsubst < /opt/druid/conf/${DRUID_SERVICE}/runtime.properties_env > /opt/druid/conf/${DRUID_SERVICE}/runtime.properties
8-
java ${DRUID_JVM_ARGS} -cp /opt/druid/conf/_common:/opt/druid/conf/${DRUID_SERVICE}:/opt/druid/lib/* io.druid.cli.Main server ${DRUID_SERVICE}
7+
java ${DRUID_JVM_ARGS} -cp /opt/druid/conf/_common:/opt/druid/conf/${DRUID_SERVICE}:/opt/druid/lib/* org.apache.druid.cli.Main server ${DRUID_SERVICE}

0 commit comments

Comments
 (0)