openstack/oslo.messaging
Code Issues Proposed changes

[zmq] Fix non voting gate jobs

Browse Source 
Fix proxy configuration and create a valid transport_url.

Change-Id: I35f22376b8eb75c2cb2175f19435a806f3dca1c1
This commit is contained in:
Oleksii Zamiatin 2016-11-30 17:01:28 +02:00
parent 9d55749c05
commit 7cb0683dc6
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/tests/functional/test_functional.py
View File

@ -258,7 +258,7 @@ class NotifyTestCase(utils.SkipIfNoTransportURL):
def test_multiple_servers(self): def test_multiple_servers(self):
if self.url.startswith("amqp:"): if self.url.startswith("amqp:"):
self.skipTest("QPID-6307") self.skipTest("QPID-6307")
if self.url.startswith("zmq:"): if self.url.startswith("zmq"):
self.skipTest("ZeroMQ-PUB-SUB") self.skipTest("ZeroMQ-PUB-SUB")
listener_a = self.useFixture( listener_a = self.useFixture(

7
setup-test-env-zmq-proxy.sh
View File

@ -6,13 +6,13 @@ set -e
DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX) DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
trap "clean_exit $DATADIR" EXIT trap "clean_exit $DATADIR" EXIT
export TRANSPORT_URL=zmq://
export ZMQ_MATCHMAKER=redis export ZMQ_MATCHMAKER=redis
export ZMQ_REDIS_PORT=65123 export ZMQ_REDIS_PORT=65123
export ZMQ_IPC_DIR=${DATADIR} export ZMQ_IPC_DIR=${DATADIR}
export ZMQ_USE_PUB_SUB=false export ZMQ_USE_PUB_SUB=false
export ZMQ_USE_ROUTER_PROXY=true export ZMQ_USE_ROUTER_PROXY=true
export ZMQ_USE_ACKS=false export ZMQ_USE_ACKS=false
export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
export ZMQ_PROXY_HOST=127.0.0.1 export ZMQ_PROXY_HOST=127.0.0.1
@ -20,13 +20,10 @@ cat > ${DATADIR}/zmq.conf <<EOF
[DEFAULT] [DEFAULT]
transport_url=${TRANSPORT_URL} transport_url=${TRANSPORT_URL}
[oslo_messaging_zmq] [oslo_messaging_zmq]
rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
rpc_zmq_ipc_dir=${ZMQ_IPC_DIR} rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
use_pub_sub=${ZMQ_USE_PUB_SUB} use_pub_sub=${ZMQ_USE_PUB_SUB}
use_router_proxy=${ZMQ_USE_ROUTER_PROXY} use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
rpc_use_acks=${ZMQ_USE_ACKS} rpc_use_acks=${ZMQ_USE_ACKS}
[matchmaker_redis]
port=${ZMQ_REDIS_PORT}
[zmq_proxy_opts] [zmq_proxy_opts]
host=${ZMQ_PROXY_HOST} host=${ZMQ_PROXY_HOST}
@ -34,6 +31,6 @@ EOF
redis-server --port $ZMQ_REDIS_PORT & redis-server --port $ZMQ_REDIS_PORT &
oslo-messaging-zmq-proxy --debug --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 & oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
$* $*

7
setup-test-env-zmq-pub-sub.sh
View File

@ -6,13 +6,13 @@ set -e
DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX) DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
trap "clean_exit $DATADIR" EXIT trap "clean_exit $DATADIR" EXIT
export TRANSPORT_URL=zmq://
export ZMQ_MATCHMAKER=redis export ZMQ_MATCHMAKER=redis
export ZMQ_REDIS_PORT=65123 export ZMQ_REDIS_PORT=65123
export ZMQ_IPC_DIR=${DATADIR} export ZMQ_IPC_DIR=${DATADIR}
export ZMQ_USE_PUB_SUB=true export ZMQ_USE_PUB_SUB=true
export ZMQ_USE_ROUTER_PROXY=true export ZMQ_USE_ROUTER_PROXY=true
export ZMQ_USE_ACKS=false export ZMQ_USE_ACKS=false
export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
export ZMQ_PROXY_HOST=127.0.0.1 export ZMQ_PROXY_HOST=127.0.0.1
@ -20,13 +20,10 @@ cat > ${DATADIR}/zmq.conf <<EOF
[DEFAULT] [DEFAULT]
transport_url=${TRANSPORT_URL} transport_url=${TRANSPORT_URL}
[oslo_messaging_zmq] [oslo_messaging_zmq]
rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
rpc_zmq_ipc_dir=${ZMQ_IPC_DIR} rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
use_pub_sub=${ZMQ_USE_PUB_SUB} use_pub_sub=${ZMQ_USE_PUB_SUB}
use_router_proxy=${ZMQ_USE_ROUTER_PROXY} use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
rpc_use_acks=${ZMQ_USE_ACKS} rpc_use_acks=${ZMQ_USE_ACKS}
[matchmaker_redis]
port=${ZMQ_REDIS_PORT}
[zmq_proxy_opts] [zmq_proxy_opts]
host=${ZMQ_PROXY_HOST} host=${ZMQ_PROXY_HOST}
@ -34,6 +31,6 @@ EOF
redis-server --port $ZMQ_REDIS_PORT & redis-server --port $ZMQ_REDIS_PORT &
oslo-messaging-zmq-proxy --debug --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 & oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
$* $*

8
setup-test-env-zmq.sh
View File

@ -6,27 +6,25 @@ set -e
DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX) DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
trap "clean_exit $DATADIR" EXIT trap "clean_exit $DATADIR" EXIT
export TRANSPORT_URL=zmq://
export ZMQ_MATCHMAKER=redis export ZMQ_MATCHMAKER=redis
export ZMQ_REDIS_PORT=65123 export ZMQ_REDIS_PORT=65123
export ZMQ_IPC_DIR=${DATADIR} export ZMQ_IPC_DIR=${DATADIR}
export ZMQ_USE_PUB_SUB=false export ZMQ_USE_PUB_SUB=false
export ZMQ_USE_ROUTER_PROXY=false export ZMQ_USE_ROUTER_PROXY=false
export ZMQ_USE_ACKS=false
export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
cat > ${DATADIR}/zmq.conf <<EOF cat > ${DATADIR}/zmq.conf <<EOF
[DEFAULT] [DEFAULT]
transport_url=${TRANSPORT_URL} transport_url=${TRANSPORT_URL}
[oslo_messaging_zmq] [oslo_messaging_zmq]
rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
rpc_zmq_ipc_dir=${ZMQ_IPC_DIR} rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
use_pub_sub=${ZMQ_USE_PUB_SUB} use_pub_sub=${ZMQ_USE_PUB_SUB}
use_router_proxy=${ZMQ_USE_ROUTER_PROXY} use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
[matchmaker_redis]
port=${ZMQ_REDIS_PORT}
EOF EOF
redis-server --port $ZMQ_REDIS_PORT & redis-server --port $ZMQ_REDIS_PORT &
oslo-messaging-zmq-proxy --debug True --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 & oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
$* $*