/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
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.
return VOL_IO_ERROR;
}
}
-#ifdef xxx
- if (dev->is_labeled()) { /* did we already read label? */
- /* Compare Volume Names allow special wild card */
- if (VolName && *VolName && *VolName != '*' && strcmp(dev->VolHdr.VolumeName, VolName) != 0) {
- Mmsg(jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"),
- dev->print_name(), VolName, dev->VolHdr.VolumeName);
- /*
- * Cancel Job if too many label errors
- * => we are in a loop
- */
- if (!dev->poll && jcr->label_errors++ > 100) {
- Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg);
- }
- Dmsg0(150, "return VOL_NAME_ERROR\n");
- stat = VOL_NAME_ERROR;
- goto bail_out;
- }
- Dmsg0(130, "Leave read_volume_label() VOL_OK\n");
- return VOL_OK; /* label already read */
- }
-#endif
dev->clear_labeled();
dev->clear_append();
if (reserve_volume(dcr, dev->VolHdr.VolumeName) == NULL) {
Mmsg2(jcr->errmsg, _("Could not reserve volume %s on %s\n"),
dev->VolHdr.VolumeName, dev->print_name());
+ Dmsg2(150, "Could not reserve volume %s on %s\n", dev->VolHdr.VolumeName, dev->print_name());
stat = VOL_NAME_ERROR;
goto bail_out;
}
}
/* Set the new filename for open, ... */
- bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName));
- bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName));
+ dev->setVolCatName(VolName);
+ dcr->setVolCatName(VolName);
Dmsg1(150, "New VolName=%s\n", VolName);
if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
/* If device is not tape, attempt to create it */
if (reserve_volume(dcr, VolName) == NULL) {
Mmsg2(dcr->jcr->errmsg, _("Could not reserve volume %s on %s\n"),
dev->VolHdr.VolumeName, dev->print_name());
+ Dmsg1(100, "%s", dcr->jcr->errmsg);
goto bail_out;
}
dev = dcr->dev; /* may have changed in reserve_volume */
/*
* Write a volume label. This is ONLY called if we have a valid Bacula
- * label of type PRE_LABEL;
+ * label of type PRE_LABEL or we are recyling an existing Volume.
+ *
* Returns: true if OK
* false if unable to write it
*/
}
Dmsg1(150, "wrote vol label to block. Vol=%s\n", dcr->VolumeName);
+ dev->setVolCatInfo(false);
dev->VolCatInfo.VolCatBytes = 0; /* reset byte count */
/*
if (recycle) {
dev->VolCatInfo.VolCatMounts++;
dev->VolCatInfo.VolCatRecycles++;
+ dir_create_jobmedia_record(dcr, true);
} else {
dev->VolCatInfo.VolCatMounts = 1;
dev->VolCatInfo.VolCatRecycles = 0;
}
Dmsg1(150, "dir_update_vol_info. Set Append vol=%s\n", dcr->VolumeName);
bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus));
- bstrncpy(dev->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dev->VolCatInfo.VolCatName));
+ dev->setVolCatName(dcr->VolumeName);
if (!dir_update_volume_info(dcr, true, true)) { /* indicate doing relabel */
return false;
}
/* Added in VerNum 10 */
ser_string(jcr->Job); /* Unique name of this Job */
ser_string(jcr->fileset_name);
- ser_uint32(jcr->JobType);
- ser_uint32(jcr->JobLevel);
+ ser_uint32(jcr->getJobType());
+ ser_uint32(jcr->getJobLevel());
/* Added in VerNum 11 */
ser_string(jcr->fileset_md5);
if (dev->VolHdr.VerNum >= 11) {
char dt[50];
- bstrftime(dt, sizeof(dt), btime_to_unix(dev->VolHdr.label_btime));
+ bstrftime(dt, sizeof(dt), btime_to_utime(dev->VolHdr.label_btime));
Pmsg1(-1, _("Date label written: %s\n"), dt);
} else {
- dt.julian_day_number = dev->VolHdr.label_date;
- dt.julian_day_fraction = dev->VolHdr.label_time;
- tm_decode(&dt, &tm);
- Pmsg5(-1,
-_("Date label written: %04d-%02d-%02d at %02d:%02d\n"),
- tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min);
+ dt.julian_day_number = dev->VolHdr.label_date;
+ dt.julian_day_fraction = dev->VolHdr.label_time;
+ tm_decode(&dt, &tm);
+ Pmsg5(-1,
+ _("Date label written: %04d-%02d-%02d at %02d:%02d\n"),
+ tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min);
}
bail_out:
}
if (label.VerNum >= 11) {
char dt[50];
- bstrftime(dt, sizeof(dt), btime_to_unix(label.write_btime));
+ bstrftime(dt, sizeof(dt), btime_to_utime(label.write_btime));
Pmsg1(-1, _("Date written : %s\n"), dt);
} else {
dt.julian_day_number = label.write_date;
switch (rec->FileIndex) {
case SOS_LABEL:
unser_session_label(&label, rec);
- bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime));
+ bstrftimes(dt, sizeof(dt), btime_to_utime(label.write_btime));
Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"),
type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId);
Pmsg4(-1, _(" Job=%s Date=%s Level=%c Type=%c\n"),
case EOS_LABEL:
char ed1[30], ed2[30];
unser_session_label(&label, rec);
- bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime));
+ bstrftimes(dt, sizeof(dt), btime_to_utime(label.write_btime));
Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"),
type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId);
Pmsg7(-1, _(" Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"),
projects / bacula / bacula / blobdiff