Browse Source

Switch CI and vagrant to ports 9091-9095

Evan Huus 10 years ago
parent
commit
ef078327dd

+ 1 - 1
.travis.yml

@@ -6,7 +6,7 @@ go:
 
 
 env:
 env:
   global:
   global:
-  - KAFKA_PEERS=localhost:6667,localhost:6668,localhost:6669,localhost:6670,localhost:6671
+  - KAFKA_PEERS=localhost:9091,localhost:9092,localhost:9093,localhost:9094,localhost:9095
   - KAFKA_INSTALL_ROOT=/home/travis/kafka
   - KAFKA_INSTALL_ROOT=/home/travis/kafka
   - KAFKA_HOSTNAME=localhost
   - KAFKA_HOSTNAME=localhost
   matrix:
   matrix:

+ 1 - 1
functional_test.go

@@ -11,7 +11,7 @@ import (
 )
 )
 
 
 const (
 const (
-	VagrantKafkaPeers     = "192.168.100.67:6667,192.168.100.67:6668,192.168.100.67:6669,192.168.100.67:6670,192.168.100.67:6671"
+	VagrantKafkaPeers     = "192.168.100.67:9091,192.168.100.67:9092,192.168.100.67:9093,192.168.100.67:9094,192.168.100.67:9095"
 	VagrantZookeeperPeers = "192.168.100.67:2181,192.168.100.67:2182,192.168.100.67:2183,192.168.100.67:2184,192.168.100.67:2185"
 	VagrantZookeeperPeers = "192.168.100.67:2181,192.168.100.67:2182,192.168.100.67:2183,192.168.100.67:2184,192.168.100.67:2185"
 )
 )
 
 

+ 2 - 2
vagrant/boot_cluster.sh

@@ -5,11 +5,11 @@ set -ex
 vagrant/run_toxiproxy.sh &
 vagrant/run_toxiproxy.sh &
 
 
 for i in 1 2 3 4 5; do
 for i in 1 2 3 4 5; do
-    KAFKA_PORT=`expr $i + 6666`
+    KAFKA_PORT=`expr $i + 9090`
     cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/zookeeper-server-start.sh -daemon config/zookeeper.properties
     cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/zookeeper-server-start.sh -daemon config/zookeeper.properties
 done
 done
 
 
 for i in 1 2 3 4 5; do
 for i in 1 2 3 4 5; do
-    KAFKA_PORT=`expr $i + 6666`
+    KAFKA_PORT=`expr $i + 9090`
     cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/kafka-server-start.sh -daemon config/server.properties
     cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/kafka-server-start.sh -daemon config/server.properties
 done
 done

+ 1 - 1
vagrant/create_topics.sh

@@ -4,7 +4,7 @@ set -ex
 
 
 sleep 10
 sleep 10
 
 
-cd ${KAFKA_INSTALL_ROOT}/kafka-6667
+cd ${KAFKA_INSTALL_ROOT}/kafka-9092
 bin/kafka-topics.sh --create --partitions 1 --replication-factor 3 --topic single_partition --zookeeper localhost:2181
 bin/kafka-topics.sh --create --partitions 1 --replication-factor 3 --topic single_partition --zookeeper localhost:2181
 bin/kafka-topics.sh --create --partitions 2 --replication-factor 3 --topic multi_partition  --zookeeper localhost:2181
 bin/kafka-topics.sh --create --partitions 2 --replication-factor 3 --topic multi_partition  --zookeeper localhost:2181
 
 

+ 2 - 2
vagrant/install_cluster.sh

@@ -16,8 +16,8 @@ fi
 for i in 1 2 3 4 5; do
 for i in 1 2 3 4 5; do
     ZK_PORT=`expr $i + 2180`
     ZK_PORT=`expr $i + 2180`
     ZK_PORT_REAL=`expr $i + 21800`
     ZK_PORT_REAL=`expr $i + 21800`
-    KAFKA_PORT=`expr $i + 6666`
-    KAFKA_PORT_REAL=`expr $i + 26666`
+    KAFKA_PORT=`expr $i + 9090`
+    KAFKA_PORT_REAL=`expr $i + 29090`
 
 
     # unpack kafka
     # unpack kafka
     mkdir -p ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}
     mkdir -p ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}

+ 5 - 5
vagrant/run_toxiproxy.sh

@@ -13,10 +13,10 @@ wget -S --post-data='{"name":"zk3", "upstream":"localhost:21803", "listen":"0.0.
 wget -S --post-data='{"name":"zk4", "upstream":"localhost:21804", "listen":"0.0.0.0:2184"}' localhost:8474/proxies
 wget -S --post-data='{"name":"zk4", "upstream":"localhost:21804", "listen":"0.0.0.0:2184"}' localhost:8474/proxies
 wget -S --post-data='{"name":"zk5", "upstream":"localhost:21805", "listen":"0.0.0.0:2185"}' localhost:8474/proxies
 wget -S --post-data='{"name":"zk5", "upstream":"localhost:21805", "listen":"0.0.0.0:2185"}' localhost:8474/proxies
 
 
-wget -S --post-data='{"name":"kafka1", "upstream":"localhost:26667", "listen":"0.0.0.0:6667"}' localhost:8474/proxies
-wget -S --post-data='{"name":"kafka2", "upstream":"localhost:26668", "listen":"0.0.0.0:6668"}' localhost:8474/proxies
-wget -S --post-data='{"name":"kafka3", "upstream":"localhost:26669", "listen":"0.0.0.0:6669"}' localhost:8474/proxies
-wget -S --post-data='{"name":"kafka4", "upstream":"localhost:26670", "listen":"0.0.0.0:6670"}' localhost:8474/proxies
-wget -S --post-data='{"name":"kafka5", "upstream":"localhost:26671", "listen":"0.0.0.0:6671"}' localhost:8474/proxies
+wget -S --post-data='{"name":"kafka1", "upstream":"localhost:29091", "listen":"0.0.0.0:9091"}' localhost:8474/proxies
+wget -S --post-data='{"name":"kafka2", "upstream":"localhost:29092", "listen":"0.0.0.0:9092"}' localhost:8474/proxies
+wget -S --post-data='{"name":"kafka3", "upstream":"localhost:29093", "listen":"0.0.0.0:9093"}' localhost:8474/proxies
+wget -S --post-data='{"name":"kafka4", "upstream":"localhost:29094", "listen":"0.0.0.0:9094"}' localhost:8474/proxies
+wget -S --post-data='{"name":"kafka5", "upstream":"localhost:29095", "listen":"0.0.0.0:9095"}' localhost:8474/proxies
 
 
 wait $PID
 wait $PID

+ 1 - 1
vagrant/setup_services.sh

@@ -9,7 +9,7 @@ start toxiproxy
 
 
 for i in 1 2 3 4 5; do
 for i in 1 2 3 4 5; do
     ZK_PORT=`expr $i + 2180`
     ZK_PORT=`expr $i + 2180`
-    KAFKA_PORT=`expr $i + 6666`
+    KAFKA_PORT=`expr $i + 9090`
 
 
     stop zookeeper-${ZK_PORT} || true
     stop zookeeper-${ZK_PORT} || true