Additional message plus exclusion fix

[bacula/bacula] / bacula / src / stored / askdir.c

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index c7eb7e43ab32856e12f2ed08702b444e6bb20c0b..e3a51fbc2da556043be8c972368758ec579b2e7b 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -7,7 +7,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 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
@@ -34,13 +34,13 @@ static char Find_media[]    = "CatReq Job=%s FindMedia=%d\n";
 static char Get_Vol_Info[] = "CatReq Job=%s GetVolInfo VolName=%s write=%d\n";
 
 static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%s\
- VolJobs=%d VolFiles=%d VolBlocks=%d VolBytes=%" lld " VolMounts=%d\
- VolErrors=%d VolWrites=%d VolMaxBytes=%" lld " EndTime=%d VolStatus=%s\
+ VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%s VolMounts=%u\
+ VolErrors=%u VolWrites=%u MaxVolBytes=%s EndTime=%d VolStatus=%s\
  Slot=%d relabel=%d\n";
 
 static char Create_job_media[] = "CatReq Job=%s CreateJobMedia \
- FirstIndex=%d LastIndex=%d StartFile=%d EndFile=%d \
- StartBlock=%d EndBlock=%d\n";
+ FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u \
+ StartBlock=%u EndBlock=%u\n";
 
 
 static char FileAttributes[] = "UpdCat Job=%s FileAttributes ";
@@ -49,10 +49,10 @@ static char Job_status[]   = "3012 Job %s jobstatus %d\n";
 
 
 /* Responses received from the Director */
-static char OK_media[] = "1000 OK VolName=%127s VolJobs=%d VolFiles=%d\
- VolBlocks=%d VolBytes=%" lld " VolMounts=%d VolErrors=%d VolWrites=%d\
- VolMaxBytes=%" lld " VolCapacityBytes=%" lld " VolStatus=%20s\
- Slot=%d\n";
+static char OK_media[] = "1000 OK VolName=%127s VolJobs=%u VolFiles=%u\
+ VolBlocks=%u VolBytes=%" lld " VolMounts=%u VolErrors=%u VolWrites=%u\
+ MaxVolBytes=%" lld " VolCapacityBytes=%" lld " VolStatus=%20s\
+ Slot=%d MaxVolJobs=%u MaxVolFiles=%u\n";
 
 static char OK_update[] = "1000 OK UpdateMedia\n";
 
@@ -79,23 +79,26 @@ static int do_request_volume_info(JCR *jcr)
     jcr->VolumeName[0] = 0;          /* No volume */
     if (bnet_recv(dir) <= 0) {
        Dmsg0(200, "getvolname error bnet_recv\n");
+       Mmsg(&jcr->errmsg, _("Network error on bnet_recv in req_vol_info.\n"));
        return 0;
     }
     if (sscanf(dir->msg, OK_media, vol->VolCatName, 
               &vol->VolCatJobs, &vol->VolCatFiles,
-              &vol->VolCatBlocks, &vol->VolCatBytes, 
+              &vol->VolCatBlocks, &vol->VolCatBytes,
               &vol->VolCatMounts, &vol->VolCatErrors,
-              &vol->VolCatWrites, &vol->VolCatMaxBytes, 
+              &vol->VolCatWrites, &vol->VolCatMaxBytes,
               &vol->VolCatCapacityBytes, vol->VolCatStatus,
-              &vol->Slot) != 12) {
+              &vol->Slot, &vol->VolCatMaxJobs, &vol->VolCatMaxFiles) != 14) {
+
        Dmsg1(200, "Bad response from Dir: %s\n", dir->msg);
+       Mmsg(&jcr->errmsg, _("Error scanning Dir response: %s\n"), dir->msg);
        return 0;
     }
     unbash_spaces(vol->VolCatName);
     strcpy(jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
     
     Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n", 
-       vol->Slot, vol->VolCatName);
+         vol->Slot, vol->VolCatName);
     return 1;
 }
 
@@ -149,20 +152,25 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
 {
    BSOCK *dir = jcr->dir_bsock;
    time_t EndTime = time(NULL);
+   char ed1[50], ed2[50];
 
    if (vol->VolCatName[0] == 0) {
       Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
       return 0;
    }
+   bash_spaces(vol->VolCatName);
    bnet_fsend(dir, Update_media, jcr->Job, 
       vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
-      vol->VolCatBlocks, vol->VolCatBytes, 
+      vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
       vol->VolCatMounts, vol->VolCatErrors,
-      vol->VolCatWrites, vol->VolCatMaxBytes, EndTime, 
-      vol->VolCatStatus, vol->Slot, relabel);
+      vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2), 
+      EndTime, vol->VolCatStatus, vol->Slot, relabel);
    Dmsg1(120, "update_volume_data(): %s", dir->msg);
+   unbash_spaces(vol->VolCatName);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
+      Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"), 
+          bnet_strerror(dir));
       return 0;
    }
    Dmsg1(120, "Updatevol: %s", dir->msg);
@@ -183,11 +191,13 @@ int dir_create_jobmedia_record(JCR *jcr)
 
    bnet_fsend(dir, Create_job_media, jcr->Job, 
       jcr->VolFirstFile, jcr->JobFiles,
-      jcr->start_file, jcr->end_file,
-      jcr->start_block, jcr->end_block);
+      jcr->StartFile, jcr->EndFile,
+      jcr->StartBlock, jcr->EndBlock);
    Dmsg1(100, "create_jobmedia(): %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
+      Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: %s\n"), 
+          bnet_strerror(dir));
       return 0;
    }
    Dmsg1(120, "Create_jobmedia: %s", dir->msg);
@@ -254,7 +264,6 @@ int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
    int wait_sec;
    int num_wait = 0;
    int dev_blocked;
-   char *msg;
 
    Dmsg0(130, "enter dir_ask_sysop_to_mount_next_volume\n");
    ASSERT(dev->dev_blocked);
@@ -273,20 +282,14 @@ int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
          * removable media, return now, otherwise wait
          * for the operator to mount the media.
          */
-        if (jcr->VolumeName[0] && !(dev->capabilities & CAP_REM) &&      
-             dev->capabilities & CAP_LABEL) {
+        if (jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) {
             Dmsg0(190, "Return 1 from mount without wait.\n");
            return 1;
         }
-        if (dev->capabilities & CAP_ANONVOLS) {
-            msg = "Suggest mounting";
-        } else {
-            msg = "Please mount";
-        }
         Jmsg(jcr, M_MOUNT, 0, _(
-"%s Volume \"%s\" on Storage Device \"%s\" for Job %s\n"
+"Please mount Volume \"%s\" on Storage Device \"%s\" for Job %s\n"
 "Use \"mount\" command to release Job.\n"),
-             msg, jcr->VolumeName, jcr->dev_name, jcr->Job);
+             jcr->VolumeName, jcr->dev_name, jcr->Job);
          Dmsg3(190, "Mount %s on %s for Job %s\n",
                jcr->VolumeName, jcr->dev_name, jcr->Job);
       } else {
@@ -373,7 +376,7 @@ volumes for Job=%s.\n"), jcr->Job);
       }       
       break;
    }
-   jcr->JobStatus = JS_Running;
+   set_jcr_job_status(jcr, JS_Running);
    dir_send_job_status(jcr);
    Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
    return 1;
@@ -487,7 +490,7 @@ int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
       num_wait = 0;
       break;
    }
-   jcr->JobStatus = JS_Running;
+   set_jcr_job_status(jcr, JS_Running);
    dir_send_job_status(jcr);
    Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
    return 1;