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/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 59c4a6f Use consistent naming for cluster envvar in integ test (#1909)
59c4a6f is described below
commit 59c4a6f3595e705b5c73a73e937fd1011c5ad874
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Tue Jun 5 20:03:00 2018 +0200
Use consistent naming for cluster envvar in integ test (#1909)
Previously we were using cluster in some places, and clusterName in
others. Settles on clusterName, as that's what the config files
expects. Also changes the znode wait to be cluster specific.
---
.../latest-version-image/scripts/init-cluster.sh | 4 ++--
.../docker-images/latest-version-image/scripts/run-bookie.sh | 2 +-
.../docker-images/latest-version-image/scripts/run-broker.sh | 2 +-
tests/docker-images/latest-version-image/scripts/run-proxy.sh | 2 +-
.../single-cluster-2-bookie-1-broker-unstarted-with-s3.yaml | 4 +++-
.../single-cluster-3-bookie-2-broker-unstarted.yaml | 11 +++++++----
.../cube-definitions/single-cluster-3-bookie-2-broker.yaml | 4 +++-
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/tests/docker-images/latest-version-image/scripts/init-cluster.sh
b/tests/docker-images/latest-version-image/scripts/init-cluster.sh
index 24aa0a3..926845d 100755
--- a/tests/docker-images/latest-version-image/scripts/init-cluster.sh
+++ b/tests/docker-images/latest-version-image/scripts/init-cluster.sh
@@ -20,7 +20,7 @@
set -x
-ZNODE="/initialized"
+ZNODE="/initialized-$clusterName"
bin/watch-znode.py -z $zkServers -p / -w
@@ -28,7 +28,7 @@ bin/watch-znode.py -z $zkServers -p $ZNODE -e
if [ $? != 0 ]; then
echo Initializing cluster
bin/apply-config-from-env.py conf/bookkeeper.conf &&
- bin/pulsar initialize-cluster-metadata --cluster $cluster --zookeeper
$zkServers \
+ bin/pulsar initialize-cluster-metadata --cluster $clusterName
--zookeeper $zkServers \
--configuration-store $configurationStore --web-service-url
http://$pulsarNode:8080/ \
--broker-service-url pulsar://$pulsarNode:6650/ &&
bin/watch-znode.py -z $zkServers -p $ZNODE -c
diff --git a/tests/docker-images/latest-version-image/scripts/run-bookie.sh
b/tests/docker-images/latest-version-image/scripts/run-bookie.sh
index adaaced..6e57a12 100755
--- a/tests/docker-images/latest-version-image/scripts/run-bookie.sh
+++ b/tests/docker-images/latest-version-image/scripts/run-bookie.sh
@@ -25,6 +25,6 @@ if [ -z "$NO_AUTOSTART" ]; then
sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/bookie.conf
fi
-bin/watch-znode.py -z $zkServers -p /initialized -w
+bin/watch-znode.py -z $zkServers -p /initialized-$clusterName -w
exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/tests/docker-images/latest-version-image/scripts/run-broker.sh
b/tests/docker-images/latest-version-image/scripts/run-broker.sh
index cef8b65..6ed5d60 100755
--- a/tests/docker-images/latest-version-image/scripts/run-broker.sh
+++ b/tests/docker-images/latest-version-image/scripts/run-broker.sh
@@ -25,6 +25,6 @@ if [ -z "$NO_AUTOSTART" ]; then
sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/broker.conf
fi
-bin/watch-znode.py -z $zookeeperServers -p /initialized -w
+bin/watch-znode.py -z $zookeeperServers -p /initialized-$clusterName -w
exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/tests/docker-images/latest-version-image/scripts/run-proxy.sh
b/tests/docker-images/latest-version-image/scripts/run-proxy.sh
index 05b38b0..8c0c5c3 100755
--- a/tests/docker-images/latest-version-image/scripts/run-proxy.sh
+++ b/tests/docker-images/latest-version-image/scripts/run-proxy.sh
@@ -25,6 +25,6 @@ if [ -z "$NO_AUTOSTART" ]; then
sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/proxy.conf
fi
-bin/watch-znode.py -z $zookeeperServers -p /initialized -w
+bin/watch-znode.py -z $zookeeperServers -p /initialized-$clusterName -w
exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-2-bookie-1-broker-unstarted-with-s3.yaml
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-2-bookie-1-broker-unstarted-with-s3.yaml
index b80ef7c..6a2e3e2 100644
---
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-2-bookie-1-broker-unstarted-with-s3.yaml
+++
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-2-bookie-1-broker-unstarted-with-s3.yaml
@@ -58,7 +58,7 @@ init*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
- - cluster=test
+ - clusterName=test
- zkServers=zookeeper
- configurationStore=configuration-store:2184
- pulsarNode=pulsar-broker1
@@ -76,6 +76,7 @@ bookkeeper1*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
+ - clusterName=test
- zkServers=zookeeper
- useHostNameAsBookieID=true
labels:
@@ -92,6 +93,7 @@ bookkeeper2*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
+ - clusterName=test
- zkServers=zookeeper
- useHostNameAsBookieID=true
labels:
diff --git
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker-unstarted.yaml
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker-unstarted.yaml
index d2c34cc..6fe4d98 100644
---
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker-unstarted.yaml
+++
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker-unstarted.yaml
@@ -58,7 +58,7 @@ init*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
- - cluster=test
+ - clusterName=test
- zkServers=zookeeper
- configurationStore=configuration-store:2184
- pulsarNode=pulsar-broker1
@@ -76,6 +76,7 @@ bookkeeper1*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
+ - clusterName=test
- zkServers=zookeeper
- useHostNameAsBookieID=true
labels:
@@ -92,6 +93,7 @@ bookkeeper2*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
+ - clusterName=test
- zkServers=zookeeper
- useHostNameAsBookieID=true
labels:
@@ -108,6 +110,7 @@ bookkeeper3*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
+ - clusterName=test
- zkServers=zookeeper
- useHostNameAsBookieID=true
labels:
@@ -126,9 +129,9 @@ pulsar-broker1*:
aliases:
- pulsar-broker1
env:
+ - clusterName=test
- zookeeperServers=zookeeper
- configurationStoreServers=configuration-store:2184
- - clusterName=test
- NO_AUTOSTART=true
labels:
cluster: test
@@ -146,9 +149,9 @@ pulsar-broker2*:
aliases:
- pulsar-broker2
env:
+ - clusterName=test
- zookeeperServers=zookeeper
- configurationStoreServers=configuration-store:2184
- - clusterName=test
- NO_AUTOSTART=true
labels:
cluster: test
@@ -166,9 +169,9 @@ pulsar-proxy*:
aliases:
- pulsar-broker2
env:
+ - clusterName=test
- zookeeperServers=zookeeper
- configurationStoreServers=configuration-store:2184
- - clusterName=test
- NO_AUTOSTART=true
labels:
cluster: test
diff --git
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker.yaml
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker.yaml
index 3695f2a..1a20574 100644
---
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker.yaml
+++
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/single-cluster-3-bookie-2-broker.yaml
@@ -58,7 +58,7 @@ init*:
await:
strategy: org.apache.pulsar.tests.NoopAwaitStrategy
env:
- - cluster=test
+ - clusterName=test
- zkServers=zookeeper
- configurationStore=configuration-store:2184
- pulsarNode=pulsar-broker1
@@ -78,6 +78,7 @@ bookkeeper1*:
env:
- zkServers=zookeeper
- useHostNameAsBookieID=true
+ - clusterName=test
labels:
cluster: test
service: bookie
@@ -110,6 +111,7 @@ bookkeeper3*:
env:
- zkServers=zookeeper
- useHostNameAsBookieID=true
+ - clusterName=test
labels:
cluster: test
service: bookie
--
To stop receiving notification emails like this one, please contact
si...@apache.org.
