From 4a740b4a417afd8a6659fadab966a9075714b348 Mon Sep 17 00:00:00 2001 From: Eyal Date: Sun, 8 Mar 2020 09:04:38 +0200 Subject: [PATCH] oslo messaging removed the blocking option Use a threaded option with max size 1 Change-Id: I158fee200b828c4329af1b5e9cf2ef0c728ecf1d --- devstack/plugin.sh | 2 ++ vitrage/messaging.py | 3 +-- vitrage/rpc.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e80e19a74..221d4d29a 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -242,6 +242,8 @@ function configure_vitrage { elif is_service_enabled etcd3; then iniset $VITRAGE_CONF coordination backend_url "etcd3+http://${SERVICE_HOST}:$ETCD_PORT" fi + + iniset $VITRAGE_CONF DEFAULT "executor_thread_pool_size" 1 } # init_vitrage() - Initialize etc. diff --git a/vitrage/messaging.py b/vitrage/messaging.py index 589600fae..0675861dc 100644 --- a/vitrage/messaging.py +++ b/vitrage/messaging.py @@ -60,8 +60,7 @@ def get_notification_listener(transport, targets, endpoints, allow_requeue=False): """Return a configured oslo_messaging notification listener.""" return oslo_msg.get_notification_listener( - transport, targets, endpoints, executor='blocking', - allow_requeue=allow_requeue) + transport, targets, endpoints, allow_requeue=allow_requeue) class VitrageNotifier(object): diff --git a/vitrage/rpc.py b/vitrage/rpc.py index 49841a9e2..4d911d9a4 100644 --- a/vitrage/rpc.py +++ b/vitrage/rpc.py @@ -97,6 +97,5 @@ def get_server(target, endpoints, transport, serializer=None): return messaging.get_rpc_server(transport, target, endpoints, - executor='blocking', serializer=serializer, access_policy=access_policy)