From cec08fbb2f16b1684444f1e53b4b027f328e4e32 Mon Sep 17 00:00:00 2001 From: Michal Rakowski Date: Thu, 1 Apr 2021 13:25:18 +0200 Subject: [PATCH] dird: fix calls to start_storage_daemon_job() after introducing Storage Manager --- bacula/src/dird/mac.c | 4 ++-- bacula/src/dird/vbackup.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c index 625492945..d6983450f 100644 --- a/bacula/src/dird/mac.c +++ b/bacula/src/dird/mac.c @@ -460,7 +460,7 @@ bool do_mac(JCR *jcr) * This call returns the sd_auth_key */ Dmsg1(200, "Start job with read (jcr) storage daemon. Jid=%d\n", jcr->JobId); - if (!start_storage_daemon_job(jcr, jcr->store_mngr->get_rstore_list(), NULL, /*send_bsr*/true)) { + if (!start_storage_daemon_job(jcr, jcr->store_mngr->get_rstore_list(), NULL, true /* wait */, /*send_bsr*/true)) { goto bail_out; } Dmsg0(150, "Read storage daemon connection OK\n"); @@ -477,7 +477,7 @@ bool do_mac(JCR *jcr) * Now start a job with the write Storage daemon sending. */ Dmsg1(200, "Start Job with write (wjcr) storage daemon. Jid=%d\n", jcr->JobId); - if (!start_storage_daemon_job(wjcr, NULL, wjcr->store_mngr->get_wstore_list(), /*no_send_bsr*/false)) { + if (!start_storage_daemon_job(wjcr, NULL, wjcr->store_mngr->get_wstore_list(), true /* wait */, /*no_send_bsr*/false)) { goto bail_out; } Dmsg0(150, "Write storage daemon connection OK\n"); diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c index 1e0c0a302..9e7d192e3 100644 --- a/bacula/src/dird/vbackup.c +++ b/bacula/src/dird/vbackup.c @@ -308,7 +308,8 @@ _("This Job is not an Accurate backup so is not equivalent to a Full backup.\n") /* * Now start a job with the Storage daemon */ - if (!start_storage_daemon_job(jcr, jcr->store_mngr->get_rstore_list(), jcr->store_mngr->get_wstore_list(), /*send_bsr*/true)) { + if (!start_storage_daemon_job(jcr, jcr->store_mngr->get_rstore_list(), jcr->store_mngr->get_wstore_list(), + true /* wait */, true /* send_bsr */)) { return false; } Dmsg0(100, "Storage daemon connection OK\n"); -- 2.47.3