Add optional type= argument to .jobs command. You can list only Backup, Restore,...

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

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 6d809b01baaee8b7a657ffb337ef487e023b3dd0..eb8e9f121751002b5fcf7bb4414b431a5993c143 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -166,8 +166,9 @@ static int accurate_list_handler(void *ctx, int num_fields, char **row)
    return 0;
 }
 
-/* In this procedure, we check if the current fileset is using
+/* In this procedure, we check if the current fileset is using checksum
  * FileSet-> Include-> Options-> Accurate/Verify/BaseJob=checksum
+ * This procedure uses jcr->HasBase, so it must be call after the initialization
  */
 static bool is_checksum_needed_by_fileset(JCR *jcr)
 {
@@ -175,35 +176,37 @@ static bool is_checksum_needed_by_fileset(JCR *jcr)
    INCEXE *inc;
    FOPTS *fopts;
    bool in_block=false;
+   bool have_basejob_option=false;
    if (!jcr->job || !jcr->job->fileset) {
       return false;
    }
 
    f = jcr->job->fileset;
    
-   for (int i=0; i < f->num_includes; i++) {
+   for (int i=0; i < f->num_includes; i++) { /* Parse all Include {} */
       inc = f->include_items[i];
       
-      for (int j=0; j < inc->num_opts; j++) {
+      for (int j=0; j < inc->num_opts; j++) { /* Parse all Options {} */
          fopts = inc->opts_list[j];
          
-         for (char *k=fopts->opts; *k ; k++) {
+         for (char *k=fopts->opts; *k ; k++) { /* Try to find one request */
             switch (*k) {
             case 'V':           /* verify */
-               in_block = (jcr->get_JobType() == JT_VERIFY);
+               in_block = (jcr->get_JobType() == JT_VERIFY); /* not used now */
                break;
-            case 'J':           /* Basejob */
-               in_block = (jcr->get_JobLevel() == L_FULL);
+            case 'J':           /* Basejob keyword */
+               have_basejob_option = in_block = jcr->HasBase;
                break;
-            case 'C':           /* Accurate */
+            case 'C':           /* Accurate keyword */
                in_block = (jcr->get_JobLevel() != L_FULL);
                break;
-            case ':':
+            case ':':           /* End of keyword */
                in_block = false;
                break;
             case '5':           /* MD5  */
             case '1':           /* SHA1 */
                if (in_block) {
+                  Dmsg0(50, "Checksum will be sent to FD\n");
                   return true;
                }
                break;
@@ -213,6 +216,13 @@ static bool is_checksum_needed_by_fileset(JCR *jcr)
          }
       }
    }
+
+   /* By default for BaseJobs, we send the checksum */
+   if (!have_basejob_option && jcr->HasBase) {
+      return true;
+   }
+   
+   Dmsg0(50, "Checksum will be sent to FD\n");
    return false;
 }
 
@@ -239,9 +249,6 @@ bool send_accurate_current_files(JCR *jcr)
       return true;
    }
    
-   /* Don't send and store the checksum if fileset doesn't require it */
-   jcr->use_accurate_chksum = is_checksum_needed_by_fileset(jcr);
-
    if (jcr->get_JobLevel() == L_FULL) {
       /* On Full mode, if no previous base job, no accurate things */
       if (!get_base_jobids(jcr, &jobids)) {
@@ -262,6 +269,9 @@ bool send_accurate_current_files(JCR *jcr)
       }
    }
 
+   /* Don't send and store the checksum if fileset doesn't require it */
+   jcr->use_accurate_chksum = is_checksum_needed_by_fileset(jcr);
+
    if (jcr->JobId) {            /* display the message only for real jobs */
       Jmsg(jcr, M_INFO, 0, _("Sending Accurate information.\n"));
    }
@@ -575,6 +585,7 @@ void backup_cleanup(JCR *jcr, int TermCode)
    CLIENT_DBR cr;
    double kbps, compression;
    utime_t RunTime;
+   POOL_MEM base_info;
 
    if (jcr->get_JobLevel() == L_VIRTUAL_FULL) {
       vbackup_cleanup(jcr, TermCode);
@@ -680,9 +691,10 @@ void backup_cleanup(JCR *jcr, int TermCode)
    jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
 
    if (jcr->HasBase) {
-      Dmsg3(0, "Base files/Used files %lld/%lld=%.2f%%\n", jcr->nb_base_files, 
-            jcr->nb_base_files_used, 
-            jcr->nb_base_files_used*100.0/jcr->nb_base_files);
+      Mmsg(base_info, "  Base files/Used files:  %lld/%lld (%.2f%%)\n",
+           jcr->nb_base_files, 
+           jcr->nb_base_files_used, 
+           jcr->nb_base_files_used*100.0/jcr->nb_base_files);
    }
 // bmicrosleep(15, 0);                /* for debugging SIGHUP */
 
@@ -707,6 +719,7 @@ void backup_cleanup(JCR *jcr, int TermCode)
 "  SD Bytes Written:       %s (%sB)\n"
 "  Rate:                   %.1f KB/s\n"
 "  Software Compression:   %s\n"
+"%s"                                         /* Basefile info */
 "  VSS:                    %s\n"
 "  Encryption:             %s\n"
 "  Accurate:               %s\n"
@@ -742,6 +755,7 @@ void backup_cleanup(JCR *jcr, int TermCode)
         edit_uint64_with_suffix(jcr->SDJobBytes, ec6),
         kbps,
         compress,
+        base_info.c_str(),
         jcr->VSS?_("yes"):_("no"),
         jcr->Encrypt?_("yes"):_("no"),
         jcr->accurate?_("yes"):_("no"),