* Version $Id$
*/
/*
- 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
/* 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 write=%d\n";
-static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%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=%u LastIndex=%u StartFile=%u EndFile=%u \
- StartBlock=%u EndBlock=%u\n";
+static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%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 InChanger=%d VolReadTime=%s VolWriteTime=%s\n";
+static char Create_job_media[] = "CatReq Job=%s CreateJobMedia"
+ " FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u"
+ " StartBlock=%u EndBlock=%u\n";
static char FileAttributes[] = "UpdCat Job=%s FileAttributes ";
static char Job_status[] = "3012 Job %s jobstatus %d\n";
/* Responses received from the Director */
-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";
+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 InChanger=%d"
+ " VolReadTime=%" lld " VolWriteTime=%" lld;
+
+
+static char OK_create[] = "1000 OK CreateJobMedia\n";
/* Forward referenced functions */
-static int wait_for_sysop(JCR *jcr, DEVICE *dev, int wait_sec);
+static int wait_for_sysop(JCR *jcr, DEVICE *dev);
/*
* Send current JobStatus to Director
* dir_get_volume_info()
* and
* dir_find_next_appendable_volume()
+ *
+ * Returns: 1 on success and vol info in jcr->VolCatInfo
+ * 0 on failure
*/
-static int do_request_volume_info(JCR *jcr)
+static int do_get_volume_info(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- VOLUME_CAT_INFO *vol = &jcr->VolCatInfo;
+ DCR *dcr = jcr->dcr;
+ VOLUME_CAT_INFO vol;
+ int n;
jcr->VolumeName[0] = 0; /* No volume */
+ dcr->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->VolCatMounts, &vol->VolCatErrors,
- &vol->VolCatWrites, &vol->VolCatMaxBytes,
- &vol->VolCatCapacityBytes, vol->VolCatStatus,
- &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);
+ memset(&vol, 0, sizeof(vol));
+ Dmsg1(200, "Get vol info=%s\n", dir->msg);
+ n = sscanf(dir->msg, OK_media, vol.VolCatName,
+ &vol.VolCatJobs, &vol.VolCatFiles,
+ &vol.VolCatBlocks, &vol.VolCatBytes,
+ &vol.VolCatMounts, &vol.VolCatErrors,
+ &vol.VolCatWrites, &vol.VolCatMaxBytes,
+ &vol.VolCatCapacityBytes, vol.VolCatStatus,
+ &vol.Slot, &vol.VolCatMaxJobs, &vol.VolCatMaxFiles,
+ &vol.InChanger, &vol.VolReadTime, &vol.VolWriteTime);
+ if (n != 17) {
+ Dmsg2(100, "Bad response from Dir fields=%d: %s\n", n, dir->msg);
+ Mmsg(&jcr->errmsg, _("Error getting Volume info: %s\n"), dir->msg);
return 0;
}
- unbash_spaces(vol->VolCatName);
- pm_strcpy(&jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
+ unbash_spaces(vol.VolCatName);
+ pm_strcpy(&jcr->VolumeName, vol.VolCatName); /* set desired VolumeName */
+ bstrncpy(dcr->VolumeName, vol.VolCatName, sizeof(dcr->VolumeName));
+ memcpy(&jcr->VolCatInfo, &vol, sizeof(jcr->VolCatInfo));
+ memcpy(&dcr->VolCatInfo, &vol, sizeof(dcr->VolCatInfo));
Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n",
- vol->Slot, vol->VolCatName);
+ vol.Slot, vol.VolCatName);
return 1;
}
*
* Volume information returned in jcr
*/
-int dir_get_volume_info(JCR *jcr, int writing)
+int dir_get_volume_info(JCR *jcr, enum get_vol_info_rw writing)
{
BSOCK *dir = jcr->dir_bsock;
- strcpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName);
+ bstrncpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName, sizeof(jcr->VolCatInfo.VolCatName));
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, writing);
- return do_request_volume_info(jcr);
+ bnet_fsend(dir, Get_Vol_Info, jcr->Job, jcr->VolCatInfo.VolCatName,
+ writing==GET_VOL_INFO_FOR_WRITE?1:0);
+ return do_get_volume_info(jcr);
}
Dmsg0(200, "dir_find_next_appendable_volume\n");
bnet_fsend(dir, Find_media, jcr->Job, 1);
- return do_request_volume_info(jcr);
+ return do_get_volume_info(jcr);
}
* After writing a Volume, send the updated statistics
* back to the director.
*/
-int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
+int dir_update_volume_info(JCR *jcr, DEVICE *dev, int label)
{
BSOCK *dir = jcr->dir_bsock;
- time_t EndTime = time(NULL);
- char ed1[50], ed2[50];
+ time_t LastWritten = time(NULL);
+ char ed1[50], ed2[50], ed3[50], ed4[50];
+ VOLUME_CAT_INFO *vol = &dev->VolCatInfo;
if (vol->VolCatName[0] == 0) {
Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
return 0;
}
+ if (dev_state(dev, ST_READ)) {
+ Jmsg0(jcr, M_ERROR, 0, _("Attempt to update_volume_info in read mode!!!\n"));
+ return 0;
+ }
+ if (!dev_state(dev, ST_LABEL)) {
+ Jmsg0(jcr, M_ERROR, 0, _("Attempt to update_volume_info on non-labeled Volume!!!\n"));
+ return 0;
+ }
+
+ Dmsg1(100, "Update cat VolFiles=%d\n", dev->file);
+ /* Just labeled or relabeled the tape */
+ if (label) {
+ bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus));
+ vol->VolCatBytes = 1; /* indicates tape labeled */
+ }
bash_spaces(vol->VolCatName);
bnet_fsend(dir, Update_media, jcr->Job,
vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
vol->VolCatMounts, vol->VolCatErrors,
vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2),
- EndTime, vol->VolCatStatus, vol->Slot, relabel);
- Dmsg1(120, "update_volume_data(): %s", dir->msg);
+ LastWritten, vol->VolCatStatus, vol->Slot, label,
+ vol->InChanger,
+ edit_uint64(vol->VolReadTime, ed3),
+ edit_uint64(vol->VolWriteTime, ed4) );
+
+ Dmsg1(120, "update_volume_info(): %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);
- if (strcmp(dir->msg, OK_update) != 0) {
- Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
- Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"), dir->msg);
+
+ if (!do_get_volume_info(jcr)) {
+ Jmsg(jcr, M_ERROR, 0, "%s", jcr->errmsg);
return 0;
}
+ Dmsg1(120, "get_volume_info(): %s", dir->msg);
+ /* Update dev Volume info in case something changed (e.g. expired) */
+ memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
return 1;
}
int dir_create_jobmedia_record(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
+ DCR *dcr = jcr->dcr;
+ if (!dcr->WroteVol) {
+ return 1; /* nothing written to tape */
+ }
+
+ dcr->WroteVol = false;
bnet_fsend(dir, Create_job_media, jcr->Job,
- jcr->VolFirstFile, jcr->JobFiles,
- jcr->StartFile, jcr->EndFile,
- jcr->StartBlock, jcr->EndBlock);
+ dcr->VolFirstIndex, dcr->VolLastIndex,
+ dcr->StartFile, dcr->EndFile,
+ dcr->StartBlock, dcr->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"),
+ Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: ERR=%s\n"),
bnet_strerror(dir));
return 0;
}
Dmsg1(120, "Create_jobmedia: %s", dir->msg);
- if (strcmp(dir->msg, OK_update) != 0) {
+ if (strcmp(dir->msg, OK_create) != 0) {
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;
/*
- *
+ * Request the sysop to create an appendable volume
+ *
* Entered with device blocked.
* Leaves with device blocked.
*
* actually be mounted. The calling routine must read it and
* verify the label.
*/
-int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
+int dir_ask_sysop_to_create_appendable_volume(JCR *jcr, DEVICE *dev)
{
int stat = 0, jstat;
- /* ******FIXME******* put these on config variable */
- int min_wait = 60 * 60;
- int max_wait = 24 * 60 * 60;
- int max_num_wait = 9; /* 5 waits =~ 1 day, then 1 day at a time */
-
- int wait_sec;
- int num_wait = 0;
+ bool unmounted;
+ bool first = true;
- Dmsg0(130, "enter dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "enter dir_ask_sysop_to_create_appendable_volume\n");
ASSERT(dev->dev_blocked);
- wait_sec = min_wait;
for ( ;; ) {
if (job_canceled(jcr)) {
- Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"),
+ 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);
+ Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
return 0;
}
- if (dir_find_next_appendable_volume(jcr)) { /* get suggested volume */
+ /* First pass, we *know* there are no appendable volumes, so no need to call */
+ if (!first && dir_find_next_appendable_volume(jcr)) { /* get suggested volume */
jstat = JS_WaitMount;
+ unmounted = (dev->dev_blocked == BST_UNMOUNTED) ||
+ (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP);
/*
* If we have a valid volume name and we are not
- * removable media, return now, otherwise wait
- * for the operator to mount the media.
+ * removable media, return now, or if we have a
+ * Slot for an autochanger, otherwise wait
+ * for the operator to mount the media.
*/
- if (jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) {
- Dmsg0(190, "Return 1 from mount without wait.\n");
+ if (!unmounted && ((jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) &&
+ dev_cap(dev, CAP_LABEL)) ||
+ (jcr->VolumeName[0] && jcr->VolCatInfo.Slot))) {
+ Dmsg0(100, "Return 1 from mount without wait.\n");
return 1;
}
- Jmsg(jcr, M_MOUNT, 0, _(
+ if (!dev->poll) {
+ 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);
+ 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, _(
+ if (!dev->poll) {
+ Jmsg(jcr, M_MOUNT, 0, _(
"Job %s waiting. Cannot find any appendable volumes.\n\
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);
+ jcr->Job,
+ jcr->dev_name,
+ jcr->media_type,
+ jcr->pool_name);
+ }
}
+ first = false;
jcr->JobStatus = jstat;
dir_send_job_status(jcr);
- stat = wait_for_sysop(jcr, dev, wait_sec);
+ stat = wait_for_sysop(jcr, dev);
+ if (dev->poll) {
+ Dmsg1(200, "Poll timeout in create append vol on device %s\n", dev_name(dev));
+ continue;
+ }
if (stat == ETIMEDOUT) {
- wait_sec *= 2; /* double wait time */
- if (wait_sec > max_wait) { /* but not longer than maxtime */
- wait_sec = max_wait;
- }
- num_wait++;
- if (num_wait >= max_num_wait) {
+ if (!double_dev_wait_time(dev)) {
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
- jcr->dev_name, jcr->Job);
+ dev_name(dev), jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev_name(dev));
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(190, "Someone woke me for device %s\n", dev->dev_name);
+ Dmsg1(190, "Someone woke me for device %s\n", dev_name(dev));
- /* Restart wait counters */
- wait_sec = min_wait;
- num_wait = 0;
/* If no VolumeName, and cannot get one, try again */
- if (jcr->VolumeName[0] == 0 &&
+ if (jcr->VolumeName[0] == 0 && !job_canceled(jcr) &&
!dir_find_next_appendable_volume(jcr)) {
Jmsg(jcr, M_MOUNT, 0, _(
"Someone woke me up, but I cannot find any appendable\n\
volumes for Job=%s.\n"), jcr->Job);
+ /* Restart wait counters after user interaction */
+ init_dev_wait_timers(dev);
continue;
}
+ unmounted = (dev->dev_blocked == BST_UNMOUNTED) ||
+ (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP);
+ if (unmounted) {
+ continue; /* continue to wait */
+ }
+
+ /*
+ * Device mounted, we have a volume, break and return
+ */
break;
}
set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
- Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "leave dir_ask_sysop_to_mount_create_appendable_volume\n");
return 1;
}
/*
- *
+ * Request to mount specific Volume
+ *
* Entered with device blocked and jcr->VolumeName is desired
* volume.
* Leaves with device blocked.
int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
{
int stat = 0;
- /* ******FIXME******* put these on config variable */
- int min_wait = 60 * 60;
- int max_wait = 24 * 60 * 60;
- int max_num_wait = 9; /* 5 waits =~ 1 day, then 1 day at a time */
- int wait_sec;
- int num_wait = 0;
char *msg;
- Dmsg0(130, "enter dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "enter dir_ask_sysop_to_mount_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_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(190, "Mount %s on %s for Job %s\n",
- jcr->VolumeName, jcr->dev_name, jcr->Job);
+
+ /*
+ * If we have a valid volume name and we are not
+ * removable media, return now, or if we have a
+ * Slot for an autochanger, otherwise wait
+ * for the operator to mount the media.
+ */
+ if ((jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) ||
+ (jcr->VolumeName[0] && jcr->VolCatInfo.Slot)) {
+ Dmsg0(100, "Return 1 from mount without wait.\n");
+ return 1;
+ }
+
+ if (!dev->poll) {
+ 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(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);
- stat = wait_for_sysop(jcr, dev, wait_sec); /* wait on device */
+ stat = wait_for_sysop(jcr, dev); /* wait on device */
+ if (dev->poll) {
+ Dmsg1(200, "Poll timeout in mount vol on device %s\n", dev_name(dev));
+ Dmsg1(200, "Blocked=%d\n", dev->dev_blocked);
+ return 1;
+ }
if (stat == ETIMEDOUT) {
- wait_sec *= 2; /* double wait time */
- if (wait_sec > max_wait) { /* but not longer than maxtime */
- wait_sec = max_wait;
- }
- num_wait++;
- if (num_wait >= max_num_wait) {
+ if (!double_dev_wait_time(dev)) {
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
- jcr->dev_name, jcr->Job);
+ dev_name(dev), jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev_name(dev));
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(190, "Someone woke me for device %s\n", dev->dev_name);
-
- /* Restart wait counters */
- wait_sec = min_wait;
- num_wait = 0;
+ Dmsg1(190, "Someone woke me for device %s\n", dev_name(dev));
break;
}
set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
- Dmsg0(130, "leave dir_ask_sysop_to_mount_next_volume\n");
+ Dmsg0(130, "leave dir_ask_sysop_to_mount_volume\n");
return 1;
}
/*
* Wait for SysOp to mount a tape
*/
-static int wait_for_sysop(JCR *jcr, DEVICE *dev, int wait_sec)
+static int wait_for_sysop(JCR *jcr, DEVICE *dev)
{
struct timeval tv;
struct timezone tz;
struct timespec timeout;
- int dev_blocked;
- time_t start = time(NULL);
time_t last_heartbeat = 0;
+ time_t first_start = time(NULL);
int stat = 0;
+ int add_wait;
+ bool unmounted;
+ P(dev->mutex);
+ unmounted = (dev->dev_blocked == BST_UNMOUNTED) ||
+ (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP);
+
+ dev->poll = false;
/*
- * Wait requested time (wait_sec). However, we also wake up every
+ * Wait requested time (dev->rem_wait_sec). However, we also wake up every
* HB_TIME seconds and send a heartbeat to the FD and the Director
* to keep stateful firewalls from closing them down while waiting
* for the operator.
*/
+ add_wait = dev->rem_wait_sec;
+ if (me->heartbeat_interval && add_wait > me->heartbeat_interval) {
+ add_wait = me->heartbeat_interval;
+ }
+ if (!unmounted && dev->vol_poll_interval && add_wait > dev->vol_poll_interval) {
+ add_wait = dev->vol_poll_interval;
+ }
gettimeofday(&tv, &tz);
timeout.tv_nsec = tv.tv_usec * 1000;
- if (me->heartbeat_interval) {
- utime_t hb = me->heartbeat_interval;
- timeout.tv_sec = tv.tv_sec + (wait_sec > hb ? hb : wait_sec);
- } else {
- timeout.tv_sec = tv.tv_sec + wait_sec;
- }
+ timeout.tv_sec = tv.tv_sec + add_wait;
- P(dev->mutex);
- dev_blocked = dev->dev_blocked;
- dev->dev_blocked = BST_WAITING_FOR_SYSOP; /* indicate waiting for mount */
+ if (!unmounted) {
+ dev->dev_prev_blocked = dev->dev_blocked;
+ dev->dev_blocked = BST_WAITING_FOR_SYSOP; /* indicate waiting for mount */
+ }
for ( ; !job_canceled(jcr); ) {
- int add_wait;
- time_t now;
+ time_t now, start;
- Dmsg1(190, "I'm going to sleep on device %s\n", dev->dev_name);
+ Dmsg3(100, "I'm going to sleep on device %s. HB=%d wait=%d\n", dev_name(dev),
+ (int)me->heartbeat_interval, dev->wait_sec);
+ start = time(NULL);
stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
+ Dmsg1(100, "Wokeup from sleep on device stat=%d\n", stat);
now = time(NULL);
+ dev->rem_wait_sec -= (now - start);
/* Note, this always triggers the first time. We want that. */
if (me->heartbeat_interval) {
/* send heartbeats */
if (jcr->file_bsock) {
bnet_sig(jcr->file_bsock, BNET_HEARTBEAT);
- Dmsg0(000, "Send heartbeat to FD.\n");
+ Dmsg0(100, "Send heartbeat to FD.\n");
}
if (jcr->dir_bsock) {
bnet_sig(jcr->dir_bsock, BNET_HEARTBEAT);
}
}
- /* Check if we blocked the device */
- if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
- if (stat != ETIMEDOUT) { /* we blocked the device */
- break; /* on error return */
- }
- if (now - start >= wait_sec) { /* on exceeding wait time return */
- break;
- }
- add_wait = wait_sec - (now - start);
- if (me->heartbeat_interval && add_wait > me->heartbeat_interval) {
- add_wait = me->heartbeat_interval;
- }
- } else { /* Oops someone else has it blocked now */
- add_wait = 10; /* hang around until he releases it */
+ /*
+ * Check if user unmounted the device while we were waiting
+ */
+ unmounted = (dev->dev_blocked == BST_UNMOUNTED) ||
+ (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP);
+
+ if (stat != ETIMEDOUT) { /* we blocked the device */
+ break; /* on error return */
}
- /*
- * Note, if dev_blocked is not BST_WAITING FOR_SYSOP,
- * someone other than us has blocked the device (probably the
- * user via the Console program), so we continue waiting
- * until he releases the device back to us.
+ if (dev->rem_wait_sec <= 0) { /* on exceeding wait time return */
+ Dmsg0(100, "Exceed wait time.\n");
+ break;
+ }
+
+ if (!unmounted && dev->vol_poll_interval &&
+ (now - first_start >= dev->vol_poll_interval)) {
+ Dmsg1(200, "In wait blocked=%d\n", dev->dev_blocked);
+ dev->poll = true;
+ break;
+ }
+ /*
+ * Check if user mounted the device while we were waiting
*/
+ if (dev->dev_blocked == BST_MOUNT) { /* mount request ? */
+ stat = 0;
+ break;
+ }
+
+ add_wait = dev->wait_sec - (now - start);
+ if (add_wait < 0) {
+ add_wait = 0;
+ }
+ if (me->heartbeat_interval && add_wait > me->heartbeat_interval) {
+ add_wait = me->heartbeat_interval;
+ }
gettimeofday(&tv, &tz);
timeout.tv_nsec = tv.tv_usec * 1000;
timeout.tv_sec = tv.tv_sec + add_wait; /* additional wait */
+ Dmsg1(100, "Additional wait %d sec.\n", add_wait);
}
- dev->dev_blocked = dev_blocked;
+ if (!unmounted) {
+ dev->dev_blocked = dev->dev_prev_blocked; /* restore entry state */
+ }
V(dev->mutex);
return stat;
}
projects / bacula / bacula / blobdiff