Massive SD calling sequence reorganization

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

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 9e3d2354eaa9a2dbaef51ae6f4ef8363fb67ec8c..9f7d07c7a90dc9bd8842c92638546229742dc19c 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -15,7 +15,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -67,57 +67,21 @@ int do_backup(JCR *jcr)
    BSOCK   *fd;
    POOL_DBR pr;
    FILESET_DBR fsr;
+   STORE *store;
 
    since[0] = 0;
 
    if (!get_or_create_client_record(jcr)) {
-      Jmsg(jcr, M_ERROR, 0, _("Could not get/create Client record. ERR=%s\n"), 
-        db_strerror(jcr->db));
       goto bail_out;
    }
 
-   /*
-    * Get or Create FileSet record
-    */
-   memset(&fsr, 0, sizeof(fsr));
-   bstrncpy(fsr.FileSet, jcr->fileset->hdr.name, sizeof(fsr.FileSet));
-   if (jcr->fileset->have_MD5) {
-      struct MD5Context md5c;
-      unsigned char signature[16];
-      memcpy(&md5c, &jcr->fileset->md5c, sizeof(md5c));
-      MD5Final(signature, &md5c);
-      bin_to_base64(fsr.MD5, (char *)signature, 16); /* encode 16 bytes */
-      bstrncpy(jcr->fileset->MD5, fsr.MD5, sizeof(jcr->fileset->MD5));
-   } else {
-      Jmsg(jcr, M_WARNING, 0, _("FileSet MD5 signature not found.\n"));
-   }
-   if (!db_create_fileset_record(jcr, jcr->db, &fsr)) {
-      Jmsg(jcr, M_ERROR, 0, _("Could not create FileSet \"%s\" record. ERR=%s\n"), 
-        fsr.FileSet, db_strerror(jcr->db));
+   if (!get_or_create_fileset_record(jcr, &fsr)) {
       goto bail_out;
-   }   
-   jcr->jr.FileSetId = fsr.FileSetId;
-   if (fsr.created) {
-      Jmsg(jcr, M_INFO, 0, _("Created new FileSet record \"%s\" %s\n"), 
-        fsr.FileSet, fsr.cCreateTime);
    }
-   Dmsg2(119, "Created FileSet %s record %u\n", jcr->fileset->hdr.name, 
-      jcr->jr.FileSetId);
 
    get_level_since_time(jcr, since, sizeof(since));
 
-   jcr->jr.JobId = jcr->JobId;
-   jcr->jr.StartTime = jcr->start_time;
-   if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
-      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
-      goto bail_out;
-   }
-
-   jcr->fname = (char *) get_pool_memory(PM_FNAME);
-
-   /* Print Job Start message */
-   Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %u, Job=%s\n"),
-       jcr->JobId, jcr->Job);
+   jcr->fname = get_pool_memory(PM_FNAME);
 
    /* 
     * Get the Pool record -- first apply any level defined pools  
@@ -155,6 +119,19 @@ int do_backup(JCR *jcr)
    jcr->PoolId = pr.PoolId;              /****FIXME**** this can go away */
    jcr->jr.PoolId = pr.PoolId;
 
+
+   /* Print Job Start message */
+   Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %u, Job=%s\n"),
+       jcr->JobId, jcr->Job);
+
+   set_jcr_job_status(jcr, JS_Running);
+   Dmsg2(100, "JobId=%d JobLevel=%c\n", jcr->jr.JobId, jcr->jr.JobLevel);
+   if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
+      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+      goto bail_out;
+   }
+
+
    /*
     * Open a message channel connection with the Storage
     * daemon. This is to let him know that our client
@@ -199,23 +176,24 @@ int do_backup(JCR *jcr)
       goto bail_out;
    }
 
+   if (!send_level_command(jcr)) {
+      goto bail_out;
+   }
+
    /* 
     * send Storage daemon address to the File daemon
     */
-   if (jcr->store->SDDport == 0) {
-      jcr->store->SDDport = jcr->store->SDport;
+   store = (STORE *)jcr->storage[0]->first();
+   if (store->SDDport == 0) {
+      store->SDDport = store->SDport;
    }
-   bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport,
-             jcr->store->enable_ssl);
+   bnet_fsend(fd, storaddr, store->address, store->SDDport,
+             store->enable_ssl);
    if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
       goto bail_out;
    }
 
 
-   if (!send_level_command(jcr)) {
-      goto bail_out;
-   }
-
    if (!send_run_before_and_after_commands(jcr)) {
       goto bail_out;
    }
@@ -310,13 +288,14 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
    char sdt[50], edt[50];
    char ec1[30], ec2[30], ec3[30], ec4[30], ec5[30], compress[50];
    char term_code[100], fd_term_msg[100], sd_term_msg[100];
-   char *term_msg;
+   const char *term_msg;
    int msg_type;
    MEDIA_DBR mr;
    double kbps, compression;
    utime_t RunTime;
 
    Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode);
+   dequeue_messages(jcr);            /* display any queued messages */
    memset(&mr, 0, sizeof(mr));
    set_jcr_job_status(jcr, TermCode);
 
@@ -386,8 +365,9 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
            fclose(fd);
         }
       } else {
+        berrno be;
          Jmsg(jcr, M_ERROR, 0, _("Could not open WriteBootstrap file:\n"
-              "%s: ERR=%s\n"), fname, strerror(errno));
+              "%s: ERR=%s\n"), fname, be.strerror());
         set_jcr_job_status(jcr, JS_ErrorTerminated);
       }
    }
@@ -395,7 +375,11 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
    msg_type = M_INFO;                /* by default INFO message */
    switch (jcr->JobStatus) {
       case JS_Terminated:
-         term_msg = _("Backup OK");
+        if (jcr->Errors || jcr->SDErrors) {
+            term_msg = _("Backup OK -- with warnings");
+        } else {
+            term_msg = _("Backup OK");
+        }
         break;
       case JS_FatalError:
       case JS_ErrorTerminated:
@@ -456,7 +440,7 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
    jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
    jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
 
-// bmicrosleep(40, 0);               /* for debugging SIGHUP */
+// bmicrosleep(15, 0);               /* for debugging SIGHUP */
 
    Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n\
 JobId:                  %d\n\
@@ -464,6 +448,7 @@ Job:                    %s\n\
 Backup Level:           %s%s\n\
 Client:                 %s\n\
 FileSet:                \"%s\" %s\n\
+Pool:                   \"%s\"\n\
 Start time:             %s\n\
 End time:               %s\n\
 FD Files Written:       %s\n\
@@ -487,6 +472,7 @@ Termination:            %s\n\n"),
        level_to_str(jcr->JobLevel), since,
        jcr->client->hdr.name,
        jcr->fileset->hdr.name, fsr->cCreateTime,
+       jcr->pool->hdr.name,
        sdt,
        edt,
        edit_uint64_with_commas(jcr->jr.JobFiles, ec1),