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.
* Here we ask the SD to send us the info for a
* particular device resource.
*/
-#ifdef needed
+#ifdef xxx
bool update_device_res(JCR *jcr, DEVICE *dev)
{
POOL_MEM device_name;
}
sd->fsend(jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job,
job_name.c_str(), client_name.c_str(),
- jcr->JobType, jcr->JobLevel,
+ jcr->get_JobType(), jcr->get_JobLevel(),
fileset_name.c_str(), !jcr->pool->catalog_files,
jcr->job->SpoolAttributes, jcr->fileset->MD5, jcr->spool_data,
jcr->write_part_after_job, jcr->job->PreferMountedVolumes,
edit_int64(jcr->spool_size, ed2));
- Dmsg1(100, ">stored: %s\n", sd->msg);
+ Dmsg1(100, ">stored: %s", sd->msg);
if (bget_dirmsg(sd) > 0) {
Dmsg1(100, "<stored: %s", sd->msg);
if (sscanf(sd->msg, OKjob, &jcr->VolSessionId,
*/
/* Do read side of storage daemon */
if (ok && rstore) {
- /* For the moment, only migrate and copy have rpool */
- if (jcr->JobType == JT_MIGRATE || jcr->JobType == JT_COPY) {
+ /* For the moment, only migrate, copy and vbackup have rpool */
+ if (jcr->get_JobType() == JT_MIGRATE || jcr->get_JobType() == JT_COPY ||
+ (jcr->get_JobType() == JT_BACKUP && jcr->get_JobLevel() == L_VIRTUAL_FULL)) {
pm_strcpy(pool_type, jcr->rpool->pool_type);
pm_strcpy(pool_name, jcr->rpool->name());
} else {
bash_spaces(pool_name);
foreach_alist(storage, rstore) {
Dmsg1(100, "Rstore=%s\n", storage->name());
+ pm_strcpy(store_name, storage->name());
bash_spaces(store_name);
pm_strcpy(media_type, storage->media_type);
bash_spaces(media_type);
jcr->sd_msg_thread_done = true;
jcr->SD_msg_chan = 0;
pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
- Dmsg1(100, "=== End msg_thread. use=%d\n", jcr->use_count());
+ Dmsg2(100, "=== End msg_thread. JobId=%d usecnt=%d\n", jcr->JobId, jcr->use_count());
free_jcr(jcr); /* release jcr */
db_thread_cleanup(); /* remove thread specific data */
}