* 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
/* Requests sent to the Director */
static char Find_media[] = "CatReq Job=%s FindMedia=%d\n";
-static char Get_Vol_Info[] = "CatReq Job=%s GetVolInfo VolName=%s\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 ";
/* 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";
jcr->VolumeName[0] = 0; /* No volume */
if (bnet_recv(dir) <= 0) {
- Dmsg0(30, "getvolname error bnet_recv\n");
+ 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) {
- Dmsg1(30, "Bad response from Dir: %s\n", dir->msg);
+ &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(030, "do_reqest_vol_info got slot=%d Volume=%s\n",
- vol->Slot, vol->VolCatName);
+ Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n",
+ vol->Slot, vol->VolCatName);
return 1;
}
*
* Volume information returned in jcr
*/
-int dir_get_volume_info(JCR *jcr)
+int dir_get_volume_info(JCR *jcr, int writing)
{
BSOCK *dir = jcr->dir_bsock;
strcpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName);
Dmsg1(200, "dir_get_volume_info=%s\n", jcr->VolCatInfo.VolCatName);
bash_spaces(jcr->VolCatInfo.VolCatName);
- bnet_fsend(dir, Get_Vol_Info, jcr->Job, jcr->VolCatInfo.VolCatName);
+ bnet_fsend(dir, Get_Vol_Info, jcr->Job, jcr->VolCatInfo.VolCatName, writing);
return do_request_volume_info(jcr);
}
{
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);
- Dmsg1(20, "update_volume_data(): %s", dir->msg);
+ 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(90, "updateVolCatInfo error bnet_recv\n");
+ Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
+ Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"),
+ bnet_strerror(dir));
return 0;
}
- Dmsg1(20, "Updatevol: %s", dir->msg);
+ Dmsg1(120, "Updatevol: %s", dir->msg);
if (strcmp(dir->msg, OK_update) != 0) {
- Dmsg1(30, "Bad response from Dir: %s\n", dir->msg);
+ Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"), dir->msg);
return 0;
}
/*
* After writing a Volume, create the JobMedia record.
*/
-int dir_create_job_media_record(JCR *jcr)
+int dir_create_jobmedia_record(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
bnet_fsend(dir, Create_job_media, jcr->Job,
jcr->VolFirstFile, jcr->JobFiles,
- jcr->start_file, jcr->end_file,
- jcr->start_block, jcr->end_block);
- Dmsg1(20, "create_job_media(): %s", dir->msg);
+ jcr->StartFile, jcr->EndFile,
+ jcr->StartBlock, jcr->EndBlock);
+ Dmsg1(100, "create_jobmedia(): %s", dir->msg);
if (bnet_recv(dir) <= 0) {
- Dmsg0(90, "create_jobmedia error bnet_recv\n");
+ 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(20, "Create_jobmedia: %s", dir->msg);
+ Dmsg1(120, "Create_jobmedia: %s", dir->msg);
if (strcmp(dir->msg, OK_update) != 0) {
- Dmsg1(30, "Bad response from Dir: %s\n", dir->msg);
+ Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: %s\n"), dir->msg);
return 0;
}
int wait_sec;
int num_wait = 0;
int dev_blocked;
- char *msg;
- Dmsg0(30, "enter dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "enter dir_ask_sysop_to_mount_next_volume\n");
ASSERT(dev->dev_blocked);
wait_sec = min_wait;
for ( ;; ) {
- if (job_cancelled(jcr)) {
- Mmsg(&dev->errmsg, _("Job %s cancelled while waiting for mount on Storage Device \"%s\".\n"),
+ if (job_canceled(jcr)) {
+ Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"),
jcr->Job, jcr->dev_name);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
return 0;
* 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) {
- Dmsg0(90, "Return 1 from mount without wait.\n");
+ 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"),
- msg, jcr->VolumeName, jcr->dev_name, jcr->Job);
- Dmsg3(90, "Mount %s on %s for Job %s\n",
+ Jmsg(jcr, M_MOUNT, 0, _(
+"Please mount Volume \"%s\" on Storage Device \"%s\" for Job %s\n"
+"Use \"mount\" command to release Job.\n"),
+ 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 {
jstat = JS_WaitMedia;
Jmsg(jcr, M_MOUNT, 0, _(
"Job %s waiting. Cannot find any appendable volumes.\n\
-Please use the \"label\" command to create new Volumes for:\n\
- Storage Device \"%s\" with Pool \"%s\" and Media type \"%s\".\n\
-Use \"mount\" to resume the job.\n"),
- jcr->Job, jcr->dev_name, jcr->pool_name, jcr->media_type);
+Please use the \"label\" command to create a new Volume for:\n\
+ Storage: %s\n\
+ Media type: %s\n\
+ Pool: %s\n"),
+ jcr->Job,
+ jcr->dev_name,
+ jcr->media_type,
+ jcr->pool_name);
}
/*
* Wait then send message again
jcr->JobStatus = jstat;
dir_send_job_status(jcr);
- for ( ;!job_cancelled(jcr); ) {
- Dmsg1(90, "I'm going to sleep on device %s\n", dev->dev_name);
+ for ( ;!job_canceled(jcr); ) {
+ Dmsg1(190, "I'm going to sleep on device %s\n", dev->dev_name);
stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
break;
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
jcr->dev_name, jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(90, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
return 0; /* exceeded maximum waits */
}
continue;
Jmsg(jcr, M_WARNING, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat,
strerror(stat));
}
- Dmsg1(90, "Someone woke me for device %s\n", dev->dev_name);
+ Dmsg1(190, "Someone woke me for device %s\n", dev->dev_name);
/* Restart wait counters */
wait_sec = min_wait;
}
break;
}
- jcr->JobStatus = JS_Running;
+ set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
- Dmsg0(30, "leave dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
return 1;
}
struct timezone tz;
struct timespec timeout;
- Dmsg0(30, "enter dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "enter dir_ask_sysop_to_mount_next_volume\n");
if (!jcr->VolumeName[0]) {
Mmsg0(&dev->errmsg, _("Cannot request another volume: no volume name given.\n"));
return 0;
ASSERT(dev->dev_blocked);
wait_sec = min_wait;
for ( ;; ) {
- if (job_cancelled(jcr)) {
- Mmsg(&dev->errmsg, _("Job %s cancelled while waiting for mount on Storage Device \"%s\".\n"),
+ if (job_canceled(jcr)) {
+ Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"),
jcr->Job, jcr->dev_name);
return 0;
}
msg = _("Please mount");
Jmsg(jcr, M_MOUNT, 0, _("%s Volume \"%s\" on Storage Device \"%s\" for Job %s\n"),
msg, jcr->VolumeName, jcr->dev_name, jcr->Job);
- Dmsg3(90, "Mount %s on %s for Job %s\n",
+ Dmsg3(190, "Mount %s on %s for Job %s\n",
jcr->VolumeName, jcr->dev_name, jcr->Job);
/*
jcr->JobStatus = JS_WaitMount;
dir_send_job_status(jcr);
- for ( ;!job_cancelled(jcr); ) {
- Dmsg1(90, "I'm going to sleep on device %s\n", dev->dev_name);
+ for ( ;!job_canceled(jcr); ) {
+ Dmsg1(190, "I'm going to sleep on device %s\n", dev->dev_name);
stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
break;
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
jcr->dev_name, jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(90, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
return 0; /* exceeded maximum waits */
}
continue;
Jmsg(jcr, M_ERROR, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat,
strerror(stat));
}
- Dmsg1(90, "Someone woke me for device %s\n", dev->dev_name);
+ Dmsg1(190, "Someone woke me for device %s\n", dev->dev_name);
/* Restart wait counters */
wait_sec = min_wait;
num_wait = 0;
break;
}
- jcr->JobStatus = JS_Running;
+ set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
- Dmsg0(30, "leave dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
return 1;
}
projects / bacula / bacula / blobdiff