/*
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.
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.
break;
}
bstrncpy(lastVolume, dcr->VolumeName, sizeof(lastVolume));
- if (dcr->can_i_use_volume()) {
+ if (dcr->can_i_write_volume()) {
Dmsg1(100, "Call reserve_volume. Vol=%s\n", dcr->VolumeName);
if (reserve_volume(dcr, dcr->VolumeName) == NULL) {
Dmsg2(100, "Could not reserve volume %s on %s\n", dcr->VolumeName,
POOL_MEM VolumeName;
/* If system job, do not update catalog */
- if (jcr->JobType == JT_SYSTEM) {
+ if (jcr->get_JobType() == JT_SYSTEM) {
return true;
}
/*
* After writing a Volume, create the JobMedia record.
*/
-bool dir_create_jobmedia_record(DCR *dcr)
+bool dir_create_jobmedia_record(DCR *dcr, bool zero)
{
JCR *jcr = dcr->jcr;
BSOCK *dir = jcr->dir_bsock;
char ed1[50];
/* If system job, do not update catalog */
- if (jcr->JobType == JT_SYSTEM) {
+ if (jcr->get_JobType() == JT_SYSTEM) {
+ return true;
+ }
+
+ /* Throw out records where FI is zero -- i.e. nothing done */
+ if (!zero && dcr->VolFirstIndex == 0 &&
+ (dcr->StartBlock != 0 || dcr->EndBlock != 0)) {
+ Dmsg0(100, "JobMedia FI=0 StartBlock!=0 record suppressed\n");
return true;
}
}
dcr->WroteVol = false;
- dir->fsend(Create_job_media, jcr->Job,
- dcr->VolFirstIndex, dcr->VolLastIndex,
- dcr->StartFile, dcr->EndFile,
- dcr->StartBlock, dcr->EndBlock,
- dcr->Copy, dcr->Stripe,
- edit_uint64(dcr->VolMediaId, ed1));
- Dmsg1(100, ">dird %s", dir->msg);
+ if (zero) {
+ /* Send dummy place holder to avoid purging */
+ dir->fsend(Create_job_media, jcr->Job,
+ 0 , 0, 0, 0, 0, 0, 0, 0, edit_uint64(dcr->VolMediaId, ed1));
+ } else {
+ dir->fsend(Create_job_media, jcr->Job,
+ dcr->VolFirstIndex, dcr->VolLastIndex,
+ dcr->StartFile, dcr->EndFile,
+ dcr->StartBlock, dcr->EndBlock,
+ dcr->Copy, dcr->Stripe,
+ edit_uint64(dcr->VolMediaId, ed1));
+ }
+ Dmsg1(100, ">dird %s", dir->msg);
if (dir->recv() <= 0) {
Dmsg0(190, "create_jobmedia error bnet_recv\n");
Jmsg(jcr, M_FATAL, 0, _("Error creating JobMedia record: ERR=%s\n"),
ser_bytes(rec->data, rec->data_len);
dir->msglen = ser_length(dir->msg);
Dmsg1(1800, ">dird %s\n", dir->msg); /* Attributes */
+ if (rec->Stream == STREAM_UNIX_ATTRIBUTES ||
+ rec->Stream == STREAM_UNIX_ATTRIBUTES_EX) {
+ dir->set_data_end(); /* set offset of last valid data */
+ }
return dir->send();
}
JCR *jcr = dcr->jcr;
bool got_vol = false;
+ if (job_canceled(jcr)) {
+ return false;
+ }
Dmsg0(400, "enter dir_ask_sysop_to_create_appendable_volume\n");
ASSERT(dev->blocked());
for ( ;; ) {
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) {
Mmsg(dev->errmsg, _(
dev->print_name(),
dcr->pool_name,
dcr->media_type);
+ Jmsg(jcr, M_MOUNT, 0, "%s", dev->errmsg);
+ Dmsg1(100, "%s", dev->errmsg);
}
- Jmsg(jcr, M_MOUNT, 0, "%s", dev->errmsg);
- Dmsg1(100, "%s", dev->errmsg);
}
set_jcr_job_status(jcr, JS_WaitMedia);
}
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");