File fix-start-task.patch of Package openstack-barbican
From ea1584830bd6491201f042fa50402d73892cff07 Mon Sep 17 00:00:00 2001
From: Adam Spiers <aspiers@suse.com>
Date: Thu, 20 Jul 2017 18:38:24 +0100
Subject: [PATCH] Start task RPC service before waiting
If the TaskServer RPC service is not started before the launcher waits
for its completion, then on shutdown it could result in a hang:
WARNING oslo_messaging.server Possible hang: stop is waiting for start to complete
This is a port of the fix for Sahara bug #1546119.
Change-Id: I083a85c2ff53364535ac8658677ffa69f4318593
Closes-bug: #1705543
---
diff --git a/barbican/cmd/worker.py b/barbican/cmd/worker.py
index 77ec256..8592bf8 100644
--- a/barbican/cmd/worker.py
+++ b/barbican/cmd/worker.py
@@ -64,11 +64,14 @@
# Queuing initialization
queue.init(CONF)
- service.launch(
+ taskserver = server.TaskServer()
+ launcher = service.launch(
CONF,
- server.TaskServer(),
+ taskserver,
workers=CONF.queue.asynchronous_workers
- ).wait()
+ )
+ taskserver.start()
+ launcher.wait()
except RuntimeError as e:
fail(1, e)