From 99b1f290d29507f4a739e77c0f78d69d7b04c3d6 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 7 May 2018 12:00:02 -0400 Subject: [PATCH] qa/workunits/rbd: don't override rbd-mirror logs if running under teuthology Signed-off-by: Jason Dillaman (cherry picked from commit 1bb6d4fd89c6434de9441581f125eb8ef55c6d07) --- qa/workunits/rbd/rbd_mirror_helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh index caa87aa02234a..351cdbbaf0c1c 100755 --- a/qa/workunits/rbd/rbd_mirror_helpers.sh +++ b/qa/workunits/rbd/rbd_mirror_helpers.sh @@ -223,6 +223,7 @@ setup_cluster() [client.${MIRROR_USER_ID_PREFIX}${instance}] admin socket = ${TEMPDIR}/rbd-mirror.\$cluster-\$name.asok pid file = ${TEMPDIR}/rbd-mirror.\$cluster-\$name.pid + log file = ${TEMPDIR}/rbd-mirror.${cluster}_daemon.${instance}.log EOF done } @@ -326,7 +327,6 @@ start_mirror() rbd-mirror \ --cluster ${cluster} \ --id ${MIRROR_USER_ID_PREFIX}${instance} \ - --log-file=${TEMPDIR}/rbd-mirror.${cluster}_daemon.${instance}.log \ --rbd-mirror-delete-retry-interval=5 \ --rbd-mirror-image-state-check-interval=5 \ --rbd-mirror-journal-poll-age=1 \ -- 2.39.5