dird: fix calls to start_storage_daemon_job() after introducing Storage Manager

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index 625492945da27347bdbef38b5f8391cc7f35a73a..d6983450f631853809fc08ed99072e58a8227eae 100644 (file)
--- 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 1e0c0a30248d8d41658d19f8e4a7d5e5f70b8f9d..9e7d192e37238482d81305171af1db1064b5c623 100644 (file)
--- 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");