Fix newvol.c

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

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 324e0d4389780b99cdb83d57b034b7f1eff81d32..deff677137dee8ddec6cbf0aaa506616d99d6825 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -40,7 +40,7 @@
 
 /* Commands sent to Storage daemon */
 static char jobcmd[]     = "JobId=%d job=%s job_name=%s client_name=%s \
-type=%d level=%d FileSet=%s Allow=%s Session=%s\n";
+type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s\n";
 static char use_device[] = "use device=%s media_type=%s pool_name=%s pool_type=%s\n";
 
 /* Response from Storage daemon */
@@ -93,8 +93,8 @@ int start_storage_daemon_job(JCR *jcr)
    int status;
    STORE *storage;
    BSOCK *sd;
-   char auth_key[100];               /* max 17 chars */
-   char *device_name, *pool_name, *pool_type, *media_type;
+   char auth_key[100];
+   POOLMEM *device_name, *pool_name, *pool_type, *media_type;
    int device_name_len, pool_name_len, pool_type_len, media_type_len;
 
    storage = jcr->store;
@@ -104,22 +104,28 @@ int start_storage_daemon_job(JCR *jcr)
     */
    bash_spaces(jcr->job->hdr.name);
    bash_spaces(jcr->client->hdr.name);
-   bash_spaces(jcr->client->hdr.name);
+   bash_spaces(jcr->fileset->hdr.name);
+   if (jcr->fileset->MD5[0] == 0) {
+      strcpy(jcr->fileset->MD5, "**Dummy**");
+   }
    bnet_fsend(sd, jobcmd, jcr->JobId, jcr->Job, jcr->job->hdr.name, 
              jcr->client->hdr.name, jcr->JobType, jcr->JobLevel, 
-              jcr->fileset->hdr.name, "append", "*");
+             jcr->fileset->hdr.name, !jcr->pool->catalog_files,
+             jcr->job->SpoolAttributes, jcr->fileset->MD5);
+   Dmsg1(200, "Jobcmd=%s\n", sd->msg);
    unbash_spaces(jcr->job->hdr.name);
    unbash_spaces(jcr->client->hdr.name);
    unbash_spaces(jcr->fileset->hdr.name);
    if (bnet_recv(sd) > 0) {
-       Dmsg1(10, "<stored: %s", sd->msg);
+       Dmsg1(110, "<stored: %s", sd->msg);
        if (sscanf(sd->msg, OKjob, &jcr->VolSessionId, 
                  &jcr->VolSessionTime, &auth_key) != 3) {
+          Dmsg1(100, "BadJob=%s\n", sd->msg);
           Jmsg(jcr, M_FATAL, 0, _("Storage daemon rejected Job command: %s\n"), sd->msg);
          return 0;
        } else {
          jcr->sd_auth_key = bstrdup(auth_key);
-          Dmsg1(50, "sd_auth_key=%s\n", jcr->sd_auth_key);
+          Dmsg1(150, "sd_auth_key=%s\n", jcr->sd_auth_key);
        }
    } else {
       Jmsg(jcr, M_FATAL, 0, _("<stored: bad response to Job command: %s\n"),
@@ -134,10 +140,10 @@ int start_storage_daemon_job(JCR *jcr)
    media_type_len = strlen(storage->media_type) + 1;
    pool_type_len = strlen(jcr->pool->pool_type) + 1;
    pool_name_len = strlen(jcr->pool->hdr.name) + 1;
-   device_name = (char *) get_memory(device_name_len);
-   pool_name = (char *) get_memory(pool_name_len);
-   pool_type = (char *) get_memory(pool_type_len);
-   media_type = (char *) get_memory(media_type_len);
+   device_name = get_memory(device_name_len);
+   pool_name = get_memory(pool_name_len);
+   pool_type = get_memory(pool_type_len);
+   media_type = get_memory(media_type_len);
    memcpy(device_name, storage->dev_name, device_name_len);
    memcpy(media_type, storage->media_type, media_type_len);
    memcpy(pool_type, jcr->pool->pool_type, pool_type_len);
@@ -146,10 +152,10 @@ int start_storage_daemon_job(JCR *jcr)
    bash_spaces(media_type);
    bash_spaces(pool_type);
    bash_spaces(pool_name);
-   sd->msg = (char *) check_pool_memory_size(sd->msg, sizeof(device_name) +
+   sd->msg = check_pool_memory_size(sd->msg, sizeof(device_name) +
       device_name_len + media_type_len + pool_type_len + pool_name_len);
    bnet_fsend(sd, use_device, device_name, media_type, pool_name, pool_type);
-   Dmsg1(10, ">stored: %s", sd->msg);
+   Dmsg1(110, ">stored: %s", sd->msg);
    status = response(sd, OK_device, "Use Device");
 
    free_memory(device_name);
@@ -173,7 +179,7 @@ int start_storage_daemon_message_thread(JCR *jcr)
    jcr->use_count++;                 /* mark in use by msg thread */
    V(jcr->mutex);
    if ((status=pthread_create(&thid, NULL, msg_thread, (void *)jcr)) != 0) {
-      Emsg1(M_ABORT, 0, _("Cannot create message thread: %s\n"), strerror(status));
+      Jmsg1(jcr, M_ABORT, 0, _("Cannot create message thread: %s\n"), strerror(status));
    }        
    jcr->SD_msg_chan = thid;
    return 1;
@@ -183,6 +189,7 @@ static void msg_thread_cleanup(void *arg)
 {
    JCR *jcr = (JCR *)arg;
    Dmsg0(200, "End msg_thread\n");
+   db_end_transaction(jcr->db);       /* terminate any open transaction */
    P(jcr->mutex);
    jcr->msg_thread_done = TRUE;
    pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
@@ -213,7 +220,7 @@ static void *msg_thread(void *arg)
    /* Read the Storage daemon's output.
     */
    Dmsg0(200, "Start msg_thread loop\n");
-   while ((stat=bget_msg(sd, 0)) > 0) {
+   while ((stat=bget_msg(sd, 0)) >= 0) {
       Dmsg1(200, "<stored: %s", sd->msg);
       if (sscanf(sd->msg, Job_start, &Job) == 1) {
         continue;
@@ -230,7 +237,7 @@ static void *msg_thread(void *arg)
         continue;
       }
    }
-   if (stat < 0) {                  
+   if (is_bnet_error(sd)) {                  
       jcr->SDJobStatus = JS_ErrorTerminated;
    }
    pthread_cleanup_pop(1);
@@ -254,4 +261,5 @@ void wait_for_storage_daemon_termination(JCR *jcr)
       pthread_cond_timedwait(&jcr->term_wait, &jcr->mutex, &timeout);
    }
    V(jcr->mutex);
+   jcr->JobStatus = jcr->SDJobStatus;
 }