X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbackup.c;h=d570e274eedfebdc39fb090ee4a5066efc514dba;hb=b9ac1b6c82fd69ecf139edce98585a889906db8b;hp=7b746c0521c207adc0dd9de3548b8bc6941d0af5;hpb=c7d894ed8e27505ba86255131eaf22658ffaa574;p=bacula%2Fbacula

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 7b746c0521..d570e274ee 100644
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -41,18 +41,16 @@
 /* Commands sent to File daemon */
 static char backupcmd[] = "backup\n";
 static char storaddr[]  = "storage address=%s port=%d ssl=%d\n";
-static char levelcmd[]  = "level = %s%s\n";
 
 /* Responses received from File daemon */
-static char OKbackup[]  = "2000 OK backup\n";
-static char OKstore[]   = "2000 OK storage\n";
-static char OKlevel[]   = "2000 OK level\n";
-static char EndBackup[] = "2801 End Backup Job TermCode=%d JobFiles=%u ReadBytes=%" lld " JobBytes=%" lld " Errors=%u\n";
+static char OKbackup[]   = "2000 OK backup\n";
+static char OKstore[]    = "2000 OK storage\n";
+static char EndJob[]     = "2800 End Job TermCode=%d JobFiles=%u "
+                           "ReadBytes=%" lld " JobBytes=%" lld " Errors=%u\n";
 
 
 /* Forward referenced functions */
-static void backup_cleanup(JCR *jcr, int TermCode, char *since);
-static int wait_for_job_termination(JCR *jcr);		     
+static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr);
 
 /* External functions */
 
@@ -82,48 +80,31 @@ int do_backup(JCR *jcr)
     * Get or Create FileSet record
     */
    memset(&fsr, 0, sizeof(fsr));
-   strcpy(fsr.FileSet, jcr->fileset->hdr.name);
+   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 */
-      strcpy(jcr->fileset->MD5, fsr.MD5);
+      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 record. ERR=%s\n"), 
-	 db_strerror(jcr->db));
+      Jmsg(jcr, M_ERROR, 0, _("Could not create FileSet \"%s\" record. ERR=%s\n"), 
+	 fsr.FileSet, db_strerror(jcr->db));
       goto bail_out;
    }   
    jcr->jr.FileSetId = fsr.FileSetId;
-   Dmsg2(119, "Created FileSet %s record %d\n", jcr->fileset->hdr.name, 
+   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);
 
-   /* Look up the last
-    * FULL backup job to get the time/date for a 
-    * differential or incremental save.
-    */
-   jcr->stime = get_pool_memory(PM_MESSAGE);
-   jcr->stime[0] = 0;
-   since[0] = 0;
-   switch (jcr->JobLevel) {
-      case L_DIFFERENTIAL:
-      case L_INCREMENTAL:
-	 /* Look up start time of last job */
-	 jcr->jr.JobId = 0;
-	 if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) {
-            Jmsg(jcr, M_INFO, 0, _("No prior or suitable FULL backup found. Doing FULL backup.\n"));
-	    jcr->JobLevel = jcr->jr.Level = L_FULL;
-	 } else {
-            strcpy(since, ", since=");
-	    bstrncat(since, jcr->stime, sizeof(since));
-	 }
-         Dmsg1(115, "Last start time = %s\n", jcr->stime);
-	 break;
-   }
+   get_level_since_time(jcr, since, sizeof(since));
 
    jcr->jr.JobId = jcr->JobId;
    jcr->jr.StartTime = jcr->start_time;
@@ -135,17 +116,35 @@ int do_backup(JCR *jcr)
    jcr->fname = (char *) get_pool_memory(PM_FNAME);
 
    /* Print Job Start message */
-   Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %d, Job=%s\n"),
+   Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %u, Job=%s\n"),
 	jcr->JobId, jcr->Job);
 
    /* 
-    * Get the Pool record  
+    * Get the Pool record -- first apply any level defined pools  
     */
+   switch (jcr->JobLevel) {
+   case L_FULL:
+      if (jcr->full_pool) {
+	 jcr->pool = jcr->full_pool;   
+      }
+      break;
+   case L_INCREMENTAL:
+      if (jcr->inc_pool) {
+	 jcr->pool = jcr->inc_pool;   
+      }
+      break;
+   case L_DIFFERENTIAL:
+      if (jcr->dif_pool) {
+	 jcr->pool = jcr->dif_pool;   
+      }
+      break;
+   }
    memset(&pr, 0, sizeof(pr));
-   strcpy(pr.Name, jcr->pool->hdr.name);
+   bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
+
    while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
       /* Try to create the pool */
-      if (create_pool(jcr, jcr->db, jcr->pool, 1) < 0) {
+      if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
          Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, 
 	    db_strerror(jcr->db));
 	 goto bail_out;
@@ -208,96 +207,97 @@ int do_backup(JCR *jcr)
    }
    bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport,
 	      jcr->store->enable_ssl);
-   if (!response(fd, OKstore, "Storage", 1)) {
+   if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
       goto bail_out;
    }
 
-   /* 
-    * Send Level command to File daemon
-    */
-   switch (jcr->JobLevel) {
-      case L_BASE:
-         bnet_fsend(fd, levelcmd, "base", " ");
-	 break;
-      case L_FULL:
-         bnet_fsend(fd, levelcmd, "full", " ");
-	 break;
-      case L_DIFFERENTIAL:
-      case L_INCREMENTAL:
-         bnet_fsend(fd, levelcmd, "since ", jcr->stime);
-	 free_pool_memory(jcr->stime);
-	 jcr->stime = NULL;
-	 break;
-      case L_SINCE:
-      default:
-         Jmsg2(jcr, M_FATAL, 0, _("Unimplemented backup level %d %c\n"), 
-	    jcr->JobLevel, jcr->JobLevel);
-	 goto bail_out;
+
+   if (!send_level_command(jcr)) {
+      goto bail_out;
    }
-   Dmsg1(120, ">filed: %s", fd->msg);
-   if (!response(fd, OKlevel, "Level", 1)) {
+
+   if (!send_run_before_and_after_commands(jcr)) {
       goto bail_out;
    }
 
    /* Send backup command */
    bnet_fsend(fd, backupcmd);
-   if (!response(fd, OKbackup, "backup", 1)) {
+   if (!response(jcr, fd, OKbackup, "backup", DISPLAY_ERROR)) {
       goto bail_out;
    }
 
    /* Pickup Job termination data */	    
    stat = wait_for_job_termination(jcr);
-   backup_cleanup(jcr, stat, since);
+   backup_cleanup(jcr, stat, since, &fsr);
    return 1;
 
 bail_out:
-   if (jcr->stime) {
-      free_pool_memory(jcr->stime);
-      jcr->stime = NULL;
-   }
-   backup_cleanup(jcr, JS_ErrorTerminated, since);
+   backup_cleanup(jcr, JS_ErrorTerminated, since, &fsr);
    return 0;
-
 }
 
 /*
  * Here we wait for the File daemon to signal termination,
  *   then we wait for the Storage daemon.  When both
  *   are done, we return the job status.
+ * Also used by restore.c 
  */
-static int wait_for_job_termination(JCR *jcr)
+int wait_for_job_termination(JCR *jcr)
 {
    int32_t n = 0;
    BSOCK *fd = jcr->file_bsock;
-   int fd_ok = FALSE;
+   bool fd_ok = false;
+   uint32_t JobFiles, Errors;
+   uint64_t ReadBytes, JobBytes;
 
    set_jcr_job_status(jcr, JS_Running);
    /* Wait for Client to terminate */
    while ((n = bget_dirmsg(fd)) >= 0) {
-      if (sscanf(fd->msg, EndBackup, &jcr->FDJobStatus, &jcr->JobFiles,
-	  &jcr->ReadBytes, &jcr->JobBytes, &jcr->Errors) == 5) {
-	 fd_ok = TRUE;
+      if (!fd_ok && sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles,
+	  &ReadBytes, &JobBytes, &Errors) == 5) {
+	 fd_ok = true;
 	 set_jcr_job_status(jcr, jcr->FDJobStatus);
          Dmsg1(100, "FDStatus=%c\n", (char)jcr->JobStatus);
+      } else {
+         Jmsg(jcr, M_WARNING, 0, _("Unexpected Client Job message: %s\n"),
+	    fd->msg);
       }
       if (job_canceled(jcr)) {
 	 break;
       }
    }
    if (is_bnet_error(fd)) {
-      Jmsg(jcr, M_FATAL, 0, _("Network error with FD during BACKUP: ERR=%s\n"),
-	  bnet_strerror(fd));
+      Jmsg(jcr, M_FATAL, 0, _("Network error with FD during %s: ERR=%s\n"),
+	  job_type_to_str(jcr->JobType), bnet_strerror(fd));
    }
    bnet_sig(fd, BNET_TERMINATE);   /* tell Client we are terminating */
 
+   /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */
    wait_for_storage_daemon_termination(jcr);
 
-   /* Return the first error status we find FD or SD */
-   if (fd_ok && jcr->JobStatus != JS_Terminated) {
-      return jcr->JobStatus;
+
+   /* Return values from FD */
+   if (fd_ok) {
+      jcr->JobFiles = JobFiles;
+      jcr->Errors = Errors;
+      jcr->ReadBytes = ReadBytes;
+      jcr->JobBytes = JobBytes;
+   } else {
+      Jmsg(jcr, M_FATAL, 0, _("No Job status returned from FD.\n"));
    }
+
+// Dmsg4(100, "fd_ok=%d FDJS=%d JS=%d SDJS=%d\n", fd_ok, jcr->FDJobStatus,
+//   jcr->JobStatus, jcr->SDJobStatus);
+
+   /* Return the first error status we find Dir, FD, or SD */
    if (!fd_ok || is_bnet_error(fd)) {			       
-      return JS_ErrorTerminated;
+      jcr->FDJobStatus = JS_ErrorTerminated;
+   }
+   if (jcr->JobStatus != JS_Terminated) {
+      return jcr->JobStatus;
+   }
+   if (jcr->FDJobStatus != JS_Terminated) {
+      return jcr->FDJobStatus;
    }
    return jcr->SDJobStatus;
 }
@@ -305,10 +305,10 @@ static int wait_for_job_termination(JCR *jcr)
 /*
  * Release resources allocated during backup.
  */
-static void backup_cleanup(JCR *jcr, int TermCode, char *since)
+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], compress[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;
    int msg_type;
@@ -316,7 +316,7 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
    double kbps, compression;
    utime_t RunTime;
 
-   Dmsg0(100, "Enter backup_cleanup()\n");
+   Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode);
    memset(&mr, 0, sizeof(mr));
    set_jcr_job_status(jcr, TermCode);
 
@@ -328,7 +328,7 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
       set_jcr_job_status(jcr, JS_ErrorTerminated);
    }
 
-   strcpy(mr.VolumeName, jcr->VolumeName);
+   bstrncpy(mr.VolumeName, jcr->VolumeName, sizeof(mr.VolumeName));
    if (!db_get_media_record(jcr, jcr->db, &mr)) {
       Jmsg(jcr, M_WARNING, 0, _("Error getting Media record for Volume \"%s\": ERR=%s"), 
 	 mr.VolumeName, db_strerror(jcr->db));
@@ -336,7 +336,8 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
    }
 
    /* Now update the bootstrap file if any */
-   if (jcr->JobStatus == JS_Terminated && jcr->jr.JobBytes &&jcr->job->WriteBootstrap) {
+   if (jcr->JobStatus == JS_Terminated && jcr->jr.JobBytes && 
+       jcr->job->WriteBootstrap) {
       FILE *fd;
       BPIPE *bpipe = NULL;
       int got_pipe = 0;
@@ -357,8 +358,12 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
 	 VolCount = db_get_job_volume_parameters(jcr, jcr->db, jcr->JobId,
 		    &VolParams);
 	 if (VolCount == 0) {
-            Jmsg(jcr, M_ERROR, 0, _("Could not get Job Volume Parameters. ERR=%s\n"),
-		 db_strerror(jcr->db));
+            Jmsg(jcr, M_ERROR, 0, _("Could not get Job Volume Parameters to "      
+                 "update Bootstrap file. ERR=%s\n"), db_strerror(jcr->db));
+	     if (jcr->SDJobFiles != 0) {
+		set_jcr_job_status(jcr, JS_ErrorTerminated);
+	     }
+
 	 }
 	 for (int i=0; i < VolCount; i++) {
 	    /* Write the record */
@@ -398,14 +403,18 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
 	 msg_type = M_ERROR;	      /* Generate error message */
 	 if (jcr->store_bsock) {
 	    bnet_sig(jcr->store_bsock, BNET_TERMINATE);
-	    pthread_cancel(jcr->SD_msg_chan);
+	    if (jcr->SD_msg_chan) {
+	       pthread_cancel(jcr->SD_msg_chan);
+	    }
 	 }
 	 break;
       case JS_Canceled:
          term_msg = _("Backup Canceled");
 	 if (jcr->store_bsock) {
 	    bnet_sig(jcr->store_bsock, BNET_TERMINATE);
-	    pthread_cancel(jcr->SD_msg_chan);
+	    if (jcr->SD_msg_chan) {
+	       pthread_cancel(jcr->SD_msg_chan);
+	    }
 	 }
 	 break;
       default:
@@ -435,13 +444,13 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
    }
 
    if (jcr->ReadBytes == 0) {
-      strcpy(compress, "None");
+      bstrncpy(compress, "None", sizeof(compress));
    } else {
       compression = (double)100 - 100.0 * ((double)jcr->JobBytes / (double)jcr->ReadBytes);
       if (compression < 0.5) {
-         strcpy(compress, "None");
+         bstrncpy(compress, "None", sizeof(compress));
       } else {
-         sprintf(compress, "%.1f %%", (float)compression);
+         bsnprintf(compress, sizeof(compress), "%.1f %%", (float)compression);
       }
    }
    jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
@@ -450,33 +459,38 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since)
    Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n\
 JobId:                  %d\n\
 Job:                    %s\n\
-FileSet:                %s\n\
 Backup Level:           %s%s\n\
 Client:                 %s\n\
+FileSet:                \"%s\" %s\n\
 Start time:             %s\n\
 End time:               %s\n\
-Files Written:          %s\n\
-Bytes Written:          %s\n\
+FD Files Written:       %s\n\
+SD Files Written:       %s\n\
+FD Bytes Written:       %s\n\
+SD Bytes Written:       %s\n\
 Rate:                   %.1f KB/s\n\
 Software Compression:   %s\n\
-Volume names(s):        %s\n\
+Volume name(s):         %s\n\
 Volume Session Id:      %d\n\
 Volume Session Time:    %d\n\
 Last Volume Bytes:      %s\n\
 Non-fatal FD errors:    %d\n\
+SD Errors:              %d\n\
 FD termination status:  %s\n\
 SD termination status:  %s\n\
 Termination:            %s\n\n"),
 	edt,
 	jcr->jr.JobId,
 	jcr->jr.Job,
-	jcr->fileset->hdr.name,
 	level_to_str(jcr->JobLevel), since,
 	jcr->client->hdr.name,
+	jcr->fileset->hdr.name, fsr->cCreateTime,
 	sdt,
 	edt,
 	edit_uint64_with_commas(jcr->jr.JobFiles, ec1),
+	edit_uint64_with_commas(jcr->SDJobFiles, ec4),
 	edit_uint64_with_commas(jcr->jr.JobBytes, ec2),
+	edit_uint64_with_commas(jcr->SDJobBytes, ec5),
 	(float)kbps,
 	compress,
 	jcr->VolumeName,
@@ -484,6 +498,7 @@ Termination:            %s\n\n"),
 	jcr->VolSessionTime,
 	edit_uint64_with_commas(mr.VolBytes, ec3),
 	jcr->Errors,
+	jcr->SDErrors,
 	fd_term_msg,
 	sd_term_msg,
 	term_msg);