You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2019/03/19 11:05:11 UTC
[pulsar] branch master updated: Use `PULSAR_PREFIX_` for appending
new keys (#3858)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 77e4619 Use `PULSAR_PREFIX_` for appending new keys (#3858)
77e4619 is described below
commit 77e4619895bbbcd553d4c83b11b9b2e41eabfb04
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Tue Mar 19 19:05:03 2019 +0800
Use `PULSAR_PREFIX_` for appending new keys (#3858)
*Motivation*
Currently integration tests are broken due to #3827
`PULSAR_` is used almost everywhere in our scripts. If we are using
`PULSAR_` for appending new keys, then we are potentially appending
a wrong key into the config file.
Currently this happens on presto. We are appending `PULSAR_ROOT_LOGGER`
into presto's config file and cause presto fail to load the config.
*Modifications*
Use `PULSAR_PREFIX_` instead of `PULSAR_`
---
docker/pulsar/scripts/apply-config-from-env.py | 3 +--
.../org/apache/pulsar/tests/integration/topologies/PulsarCluster.java | 2 ++
tests/scripts/pre-integ-tests.sh | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/pulsar/scripts/apply-config-from-env.py b/docker/pulsar/scripts/apply-config-from-env.py
index 94a8b4b..3d0e5ee 100755
--- a/docker/pulsar/scripts/apply-config-from-env.py
+++ b/docker/pulsar/scripts/apply-config-from-env.py
@@ -34,8 +34,7 @@ if len(sys.argv) < 2:
# Always apply env config to env scripts as well
conf_files = ['conf/pulsar_env.sh', 'conf/bkenv.sh'] + sys.argv[1:]
-PF_ENV_PREFIX = 'PULSAR_'
-
+PF_ENV_PREFIX = 'PULSAR_PREFIX_'
for conf_filename in conf_files:
lines = [] # List of config file lines
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
index 7c99de2..1356898 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
@@ -97,6 +97,7 @@ public class PulsarCluster {
.withNetworkAliases(PrestoWorkerContainer.NAME)
.withEnv("clusterName", clusterName)
.withEnv("zkServers", ZKContainer.NAME)
+ .withEnv("zookeeperServers", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
.withEnv("pulsar.zookeeper-uri", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
.withEnv("pulsar.broker-service-url", "http://pulsar-broker-0:8080");
} else {
@@ -314,6 +315,7 @@ public class PulsarCluster {
.withNetworkAliases(PrestoWorkerContainer.NAME)
.withEnv("clusterName", clusterName)
.withEnv("zkServers", ZKContainer.NAME)
+ .withEnv("zookeeperServers", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
.withEnv("pulsar.zookeeper-uri", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
.withEnv("pulsar.broker-service-url", "http://pulsar-broker-0:8080");
}
diff --git a/tests/scripts/pre-integ-tests.sh b/tests/scripts/pre-integ-tests.sh
index 62b12b5..9f564a3 100755
--- a/tests/scripts/pre-integ-tests.sh
+++ b/tests/scripts/pre-integ-tests.sh
@@ -30,4 +30,5 @@ docker pull apachepulsar/s3mock:latest
docker pull alpine/socat:latest
docker pull cassandra:3
docker pull confluentinc/cp-kafka:4.0.0
+docker pull debezium/example-mysql:0.8
docker pull mysql:5.7.22