- Back port changes to 1.38.5

[bacula/bacula] / bacula / src / dird / msgchan.c

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 9da9150771622c76305603fcbdca15b57bf555cd..faaaceb3e7284f9d39f5051ff6f73e7cd21fbcf4 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -16,7 +16,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -49,7 +49,7 @@ static char OK_device[]  = "3000 OK use device device=%s\n";
 /* Storage Daemon requests */
 static char Job_start[]  = "3010 Job %127s start\n";
 static char Job_end[]    =
-   "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%" lld "\n";
+   "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%lld\n";
 
 /* Forward referenced functions */
 extern "C" void *msg_thread(void *arg);
@@ -119,14 +119,13 @@ bool update_device_res(JCR *jcr, DEVICE *dev)
 /*
  * Start a job with the Storage daemon
  */
-int start_storage_daemon_job(JCR *jcr, alist *store, int append)
+bool start_storage_daemon_job(JCR *jcr, alist *rstore, alist *wstore)
 {
-   bool ok = false;
+   bool ok = true;
    STORE *storage;
    BSOCK *sd;
    char auth_key[100];
    POOL_MEM store_name, device_name, pool_name, pool_type, media_type;
-   char PoolId[50];
    int copy = 0;
    int stripe = 0;
 
@@ -170,7 +169,6 @@ int start_storage_daemon_job(JCR *jcr, alist *store, int append)
    pm_strcpy(pool_name, jcr->pool->hdr.name);
    bash_spaces(pool_type);
    bash_spaces(pool_name);
-   edit_int64(jcr->PoolId, PoolId);
 
    /*
     * We have two loops here. The first comes from the 
@@ -180,26 +178,27 @@ int start_storage_daemon_job(JCR *jcr, alist *store, int append)
     *  associated with each Storage. It selects the first
     *  available one.
     *
-    * Note, the outer loop is not yet implemented.
     */
-   foreach_alist(storage, store) {
-//    storage = (STORE *)store->first();
-      pm_strcpy(store_name, storage->hdr.name);
-      bash_spaces(store_name);
-      pm_strcpy(media_type, storage->media_type);
-      bash_spaces(media_type);
-      bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(), 
-                 pool_name.c_str(), pool_type.c_str(), append, copy, stripe);
-
-      DEVICE *dev;
-      /* Loop over alternative storage Devices until one is OK */
-      foreach_alist(dev, storage->device) {
-         pm_strcpy(device_name, dev->hdr.name);
-         bash_spaces(device_name);
-         bnet_fsend(sd, use_device, device_name.c_str());
-         Dmsg1(100, ">stored: %s", sd->msg);
+   /* Do read side of storage daemon */
+   if (ok && rstore) {
+      foreach_alist(storage, rstore) {
+         pm_strcpy(store_name, storage->hdr.name);
+         bash_spaces(store_name);
+         pm_strcpy(media_type, storage->media_type);
+         bash_spaces(media_type);
+         bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(), 
+                    pool_name.c_str(), pool_type.c_str(), 0, copy, stripe);
+
+         DEVICE *dev;
+         /* Loop over alternative storage Devices until one is OK */
+         foreach_alist(dev, storage->device) {
+            pm_strcpy(device_name, dev->hdr.name);
+            bash_spaces(device_name);
+            bnet_fsend(sd, use_device, device_name.c_str());
+            Dmsg1(100, ">stored: %s", sd->msg);
+         }
+         bnet_sig(sd, BNET_EOD);            /* end of Devices */
       }
-      bnet_sig(sd, BNET_EOD);            /* end of Devices */
       bnet_sig(sd, BNET_EOD);            /* end of Storages */
       if (bget_dirmsg(sd) > 0) {
          Dmsg1(100, "<stored: %s", sd->msg);
@@ -211,12 +210,43 @@ int start_storage_daemon_job(JCR *jcr, alist *store, int append)
          Jmsg(jcr, M_FATAL, 0, _("\n"
             "     Storage daemon didn't accept Device \"%s\" because:\n     %s"),
             device_name.c_str(), err_msg.c_str()/* sd->msg */);
+         ok = false;
       }
-      break;
    }
-   if (ok) {
-      ok = bnet_fsend(sd, "run");
-      Dmsg1(100, ">stored: %s\n", sd->msg);
+
+   /* Do write side of storage daemon */
+   if (ok && wstore) {
+      foreach_alist(storage, wstore) {
+         pm_strcpy(store_name, storage->hdr.name);
+         bash_spaces(store_name);
+         pm_strcpy(media_type, storage->media_type);
+         bash_spaces(media_type);
+         bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(), 
+                    pool_name.c_str(), pool_type.c_str(), 1, copy, stripe);
+
+         DEVICE *dev;
+         /* Loop over alternative storage Devices until one is OK */
+         foreach_alist(dev, storage->device) {
+            pm_strcpy(device_name, dev->hdr.name);
+            bash_spaces(device_name);
+            bnet_fsend(sd, use_device, device_name.c_str());
+            Dmsg1(100, ">stored: %s", sd->msg);
+         }
+         bnet_sig(sd, BNET_EOD);            /* end of Devices */
+      }
+      bnet_sig(sd, BNET_EOD);            /* end of Storages */
+      if (bget_dirmsg(sd) > 0) {
+         Dmsg1(100, "<stored: %s", sd->msg);
+         /* ****FIXME**** save actual device name */
+         ok = sscanf(sd->msg, OK_device, device_name.c_str()) == 1;
+      } else {
+         POOL_MEM err_msg;
+         pm_strcpy(err_msg, sd->msg); /* save message */
+         Jmsg(jcr, M_FATAL, 0, _("\n"
+            "     Storage daemon didn't accept Device \"%s\" because:\n     %s"),
+            device_name.c_str(), err_msg.c_str()/* sd->msg */);
+         ok = false;
+      }
    }
    return ok;
 }
@@ -285,12 +315,13 @@ extern "C" void *msg_thread(void *arg)
     */
    Dmsg0(100, "Start msg_thread loop\n");
    while ((stat=bget_dirmsg(sd)) >= 0) {
-      Dmsg1(200, "<stored: %s", sd->msg);
-      if (sscanf(sd->msg, Job_start, &Job) == 1) {
+      int stat;
+      Dmsg1(3400, "<stored: %s", sd->msg);
+      if (sscanf(sd->msg, Job_start, Job) == 1) {
          continue;
       }
-      if (sscanf(sd->msg, Job_end, &Job, &JobStatus, &JobFiles,
-                 &JobBytes) == 4) {
+      if ((stat=sscanf(sd->msg, Job_end, Job, &JobStatus, &JobFiles,
+                 &JobBytes)) == 4) {
          jcr->SDJobStatus = JobStatus; /* termination status */
          jcr->SDJobFiles = JobFiles;
          jcr->SDJobBytes = JobBytes;