You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2018/10/20 21:55:19 UTC
[incubator-druid] branch master updated: Fix integration test
service logging (#6479)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 9851921 Fix integration test service logging (#6479)
9851921 is described below
commit 9851921f437b5c7d11685254a94b331e90943bbf
Author: Jonathan Wei <jo...@users.noreply.github.com>
AuthorDate: Sat Oct 20 14:55:14 2018 -0700
Fix integration test service logging (#6479)
---
integration-tests/docker/broker.conf | 1 +
integration-tests/docker/coordinator.conf | 1 +
integration-tests/docker/historical.conf | 1 +
integration-tests/docker/middlemanager.conf | 3 ++-
integration-tests/docker/overlord.conf | 1 +
integration-tests/docker/router-no-client-auth-tls.conf | 1 +
integration-tests/docker/router-permissive-tls.conf | 1 +
integration-tests/docker/router.conf | 1 +
integration-tests/run_cluster.sh | 3 +++
9 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/integration-tests/docker/broker.conf b/integration-tests/docker/broker.conf
index a83eb1c..4f49dfa 100644
--- a/integration-tests/docker/broker.conf
+++ b/integration-tests/docker/broker.conf
@@ -56,6 +56,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server broker
redirect_stderr=true
diff --git a/integration-tests/docker/coordinator.conf b/integration-tests/docker/coordinator.conf
index d6b6b59..4fe113b 100644
--- a/integration-tests/docker/coordinator.conf
+++ b/integration-tests/docker/coordinator.conf
@@ -50,6 +50,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server coordinator
redirect_stderr=true
diff --git a/integration-tests/docker/historical.conf b/integration-tests/docker/historical.conf
index 5b3fd0e..1c4fb96 100644
--- a/integration-tests/docker/historical.conf
+++ b/integration-tests/docker/historical.conf
@@ -52,6 +52,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server historical
redirect_stderr=true
diff --git a/integration-tests/docker/middlemanager.conf b/integration-tests/docker/middlemanager.conf
index cf09ae8..50985d0 100644
--- a/integration-tests/docker/middlemanager.conf
+++ b/integration-tests/docker/middlemanager.conf
@@ -14,7 +14,7 @@ command=java
-Ddruid.worker.capacity=3
-Ddruid.indexer.logs.directory=/shared/tasklogs
-Ddruid.storage.storageDirectory=/shared/storage
- -Ddruid.indexer.runner.javaOpts="-server -Xmx256m -Xms256m -XX:NewSize=128m -XX:MaxNewSize=128m -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps"
+ -Ddruid.indexer.runner.javaOpts="-server -Xmx256m -Xms256m -XX:NewSize=128m -XX:MaxNewSize=128m -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml"
-Ddruid.indexer.fork.property.druid.processing.buffer.sizeBytes=25000000
-Ddruid.indexer.fork.property.druid.processing.numThreads=1
-Ddruid.indexer.fork.server.http.numThreads=100
@@ -57,6 +57,7 @@ command=java
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
-Ddruid.startup.logging.logProperties=true
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server middleManager
redirect_stderr=true
diff --git a/integration-tests/docker/overlord.conf b/integration-tests/docker/overlord.conf
index 293835a..304eb43 100644
--- a/integration-tests/docker/overlord.conf
+++ b/integration-tests/docker/overlord.conf
@@ -51,6 +51,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server overlord
redirect_stderr=true
diff --git a/integration-tests/docker/router-no-client-auth-tls.conf b/integration-tests/docker/router-no-client-auth-tls.conf
index f947aa3..804a355 100644
--- a/integration-tests/docker/router-no-client-auth-tls.conf
+++ b/integration-tests/docker/router-no-client-auth-tls.conf
@@ -46,6 +46,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server router
redirect_stderr=true
diff --git a/integration-tests/docker/router-permissive-tls.conf b/integration-tests/docker/router-permissive-tls.conf
index 1b6e159..1453c4b 100644
--- a/integration-tests/docker/router-permissive-tls.conf
+++ b/integration-tests/docker/router-permissive-tls.conf
@@ -46,6 +46,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server router
redirect_stderr=true
diff --git a/integration-tests/docker/router.conf b/integration-tests/docker/router.conf
index a65c25e..a4a604a 100644
--- a/integration-tests/docker/router.conf
+++ b/integration-tests/docker/router.conf
@@ -45,6 +45,7 @@ command=java
-Ddruid.client.https.certAlias=druid
-Ddruid.client.https.keyManagerPassword=druid123
-Ddruid.client.https.keyStorePassword=druid123
+ -Dlog4j.configurationFile=/shared/docker/lib/log4j2.xml
-cp /shared/docker/lib/*
org.apache.druid.cli.Main server router
redirect_stderr=true
diff --git a/integration-tests/run_cluster.sh b/integration-tests/run_cluster.sh
index a41a5b8..18a98d4 100755
--- a/integration-tests/run_cluster.sh
+++ b/integration-tests/run_cluster.sh
@@ -47,6 +47,9 @@ rm -rf $SHARED_DIR/docker
cp -R docker $SHARED_DIR/docker
mvn -B dependency:copy-dependencies -DoutputDirectory=$SHARED_DIR/docker/lib
+# install logging config
+cp src/main/resources/log4j2.xml $SHARED_DIR/docker/lib/log4j2.xml
+
docker network create --subnet=172.172.172.0/24 druid-it-net
# Build Druid Cluster Image
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org