Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
* Returns: true on success dcr->VolumeName is volume
* reserve_volume() called on Volume name
* false on failure dcr->VolumeName[0] == 0
- * also sets dcr->volume_in_use if at least one
+ * also sets dcr->found_in_use if at least one
* in use volume was found.
*
* Volume information returned in dcr
JCR *jcr = dcr->jcr;
BSOCK *dir = jcr->dir_bsock;
bool rtn;
+ char lastVolume[MAX_NAME_LENGTH];
Dmsg2(200, "dir_find_next_appendable_volume: reserved=%d Vol=%s\n",
- dcr->reserved_device, dcr->VolumeName);
+ dcr->is_reserved(), dcr->VolumeName);
/*
- * Try the forty oldest or most available volumes. Note,
+ * Try the twenty oldest or most available volumes. Note,
* the most available could already be mounted on another
* drive, so we continue looking for a not in use Volume.
*/
lock_volumes();
P(vol_info_mutex);
- dcr->volume_in_use = false;
- for (int vol_index=1; vol_index < 40; vol_index++) {
+ dcr->clear_found_in_use();
+ lastVolume[0] = 0;
+ for (int vol_index=1; vol_index < 20; vol_index++) {
bash_spaces(dcr->media_type);
bash_spaces(dcr->pool_name);
dir->fsend(Find_media, jcr->Job, vol_index, dcr->pool_name, dcr->media_type);
unbash_spaces(dcr->pool_name);
Dmsg1(100, ">dird %s", dir->msg);
if (do_get_volume_info(dcr)) {
- if (!is_volume_in_use(dcr)) {
+ /* Give up if we get the same volume name twice */
+ if (lastVolume[0] && strcmp(lastVolume, dcr->VolumeName) == 0) {
+ Dmsg1(100, "Got same vol = %s\n", lastVolume);
+ break;
+ }
+ bstrncpy(lastVolume, dcr->VolumeName, sizeof(lastVolume));
+ if (dcr->can_i_use_volume()) {
Dmsg1(100, "Call reserve_volume. Vol=%s\n", dcr->VolumeName);
- if (reserve_volume(dcr, dcr->VolumeName) == 0) {
+ if (reserve_volume(dcr, dcr->VolumeName) == NULL) {
Dmsg2(100, "Could not reserve volume %s on %s\n", dcr->VolumeName,
dcr->dev->print_name());
continue;
goto get_out;
} else {
Dmsg1(100, "Volume %s is in use.\n", dcr->VolumeName);
- dcr->volume_in_use = true;
+ /* If volume is not usable, it is in use by someone else */
+ dcr->set_found_in_use();
continue;
}
}
Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
return false;
}
- dev->dlock();
got_vol = dir_find_next_appendable_volume(dcr); /* get suggested volume */
- dev->dunlock();
if (got_vol) {
- return true;
+ goto get_out;
} else {
if (stat == W_TIMEOUT || stat == W_MOUNT) {
- Jmsg(jcr, M_MOUNT, 0, _(
+ Mmsg(dev->errmsg, _(
"Job %s waiting. Cannot find any appendable volumes.\n"
"Please use the \"label\" command to create a new Volume for:\n"
" Storage: %s\n"
dev->print_name(),
dcr->pool_name,
dcr->media_type);
+ Jmsg(jcr, M_MOUNT, 0, "%s", dev->errmsg);
+ Dmsg1(100, "%s", dev->errmsg);
}
}
}
Dmsg1(100, "Someone woke me for device %s\n", dev->print_name());
}
+
+get_out:
set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
Dmsg0(100, "leave dir_ask_sysop_to_mount_create_appendable_volume\n");
if (dev->poll) {
Dmsg1(400, "Poll timeout in mount vol on device %s\n", dev->print_name());
Dmsg1(400, "Blocked=%s\n", dev->print_blocked());
- goto bail_out;
+ goto get_out;
}
if (stat == W_TIMEOUT) {
break;
}
-bail_out:
+get_out:
set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr);
Dmsg0(400, "leave dir_ask_sysop_to_mount_volume\n");