From 2346e9a8b531d621c1adc167d8117474f69638bc Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 9 Feb 2018 12:49:22 +1100 Subject: [PATCH] Run swift-container-sync under run_process All the evidence from [1] suggests that on opensuse swift-init is not detaching the daemon process correctly. It's possible there's a pipe still in play that somehow holds our ansible-streamer open. This is a minimal fix to avoid swift-init. Although it's possible in non-default paths to still use swift-init (and hence possibly hit another variant of this issue), after discussions with swift developers it was decided the intersection of tests running under our current ansible, on suse, that would enable these services is sufficiently small that this is the best course for now. [1] https://storyboard.openstack.org/#!/story/2001528 Change-Id: I1b68c08c07cf6653ea58506f738cbe0054b38f3a --- lib/swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/swift b/lib/swift index 1601e2b1f8..1187846dfc 100644 --- a/lib/swift +++ b/lib/swift @@ -827,7 +827,8 @@ function start_swift { else # The container-sync daemon is strictly needed to pass the container # sync Tempest tests. - swift-init --run-dir=${SWIFT_DATA_DIR}/run container-sync start + enable_service s-container-sync + run_process s-container-sync "$SWIFT_BIN_DIR/swift-container-sync ${SWIFT_CONF_DIR}/container-server/1.conf" fi else swift-init --run-dir=${SWIFT_DATA_DIR}/run all restart || true