/*
Bacula® - The Network Backup Solution
- Copyright (C) 2006-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2006-2010 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.
*
* Kern Sibbald, January MMVI
*
- * Version $Id$
*/
#include "bacula.h"
char ec1[50];
DEVICE *dev;
- switch(jcr->get_JobType()) {
+ switch(jcr->getJobType()) {
case JT_MIGRATE:
Type = "Migration";
break;
}
Dmsg2(100, "read_dcr=%p write_dcr=%p\n", jcr->read_dcr, jcr->dcr);
-
- create_restore_volume_list(jcr);
if (jcr->NumReadVolumes == 0) {
Jmsg(jcr, M_FATAL, 0, _("No Volume names found for %s.\n"), Type);
goto bail_out;
if (!ok) {
discard_data_spool(jcr->dcr);
} else {
- /* Note: if commit is OK, the device will remain locked */
+ /* Note: if commit is OK, the device will remain blocked */
commit_data_spool(jcr->dcr);
}
}
}
- free_restore_volume_list(jcr);
-
dir_send_job_status(jcr); /* update director */
-
Dmsg0(30, "Done reading.\n");
jcr->end_time = time(NULL);
dequeue_messages(jcr); /* send any queued messages */
}
generate_daemon_event(jcr, "JobEnd");
dir->fsend(Job_end, jcr->Job, jcr->JobStatus, jcr->JobFiles,
- edit_uint64(jcr->JobBytes, ec1));
+ edit_uint64(jcr->JobBytes, ec1), jcr->JobErrors);
Dmsg4(100, Job_end, jcr->Job, jcr->JobStatus, jcr->JobFiles, ec1);
dir->signal(BNET_EOD); /* send EOD to Director daemon */
case EOM_LABEL:
return true; /* don't write vol labels */
}
-// if (jcr->get_JobType() == JT_BACKUP) {
+// if (jcr->getJobType() == JT_BACKUP) {
/*
* For normal migration jobs, FileIndex values are sequential because
* we are dealing with one job. However, for Vbackup (consolidation),
/* Send attributes and digest to Director for Catalog */
stream = rec->Stream;
- if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX ||
+ if (stream == STREAM_UNIX_ATTRIBUTES ||
+ stream == STREAM_UNIX_ATTRIBUTES_EX ||
+ stream == STREAM_RESTORE_OBJECT ||
crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) {
if (!jcr->no_attributes) {
BSOCK *dir = jcr->dir_bsock;