Permalink
Browse files

Merge branch 'bareos-17.2'

  • Loading branch information...
pstorz committed Dec 20, 2017
2 parents c54d64e + 6ee6c8d commit 9c24f2476773fba7387b058045306bdc7392edc6
Showing with 6 additions and 6 deletions.
  1. +1 −1 src/stored/backends/droplet_device.c
  2. +3 −3 src/stored/mac.c
  3. +1 −1 src/stored/status.c
  4. +1 −1 src/stored/vol_mgr.c
@@ -788,7 +788,6 @@ int droplet_device::d_ioctl(int fd, ioctl_req_t request, char *op)
*/
ssize_t droplet_device::chunked_remote_volume_size()
{
dpl_status_t status;
ssize_t volumesize = 0;
dpl_sysmd_t *sysmd = NULL;
POOL_MEM chunk_dir(PM_FNAME);
@@ -804,6 +803,7 @@ ssize_t droplet_device::chunked_remote_volume_size()
*/
#if 0
dpl_status_t status;
/*
* First make sure that the chunkdir exists otherwise it makes little sense to scan it.
*/
View
@@ -150,7 +150,6 @@ static bool clone_record_internally(DCR *dcr, DEV_RECORD *rec)
/*
* set job info from first SOS label
*/
jcr->JobId = label->JobId;
jcr->setJobType(label->JobType);
jcr->setJobLevel(label->JobLevel);
Dmsg1(200, "joblevel from SOS_LABEL is now %c\n", label->JobLevel);
@@ -163,6 +162,7 @@ static bool clone_record_internally(DCR *dcr, DEV_RECORD *rec)
dt.julian_day_number = label->write_date;
dt.julian_day_fraction = label->write_time;
tm_decode(&dt, &tm);
tm.tm_isdst = 0;
jcr->sched_time = mktime(&tm);
}
jcr->start_time = jcr->sched_time;
@@ -650,8 +650,8 @@ bool do_mac_run(JCR *jcr)
sd->signal(BNET_TERMINATE);
} else {
if (!jcr->read_dcr || !jcr->dcr) {
Jmsg(jcr, M_FATAL, 0, _("Read and write devices not properly initialized.\n"));
if (!jcr->read_dcr) {
Jmsg(jcr, M_FATAL, 0, _("Read device not properly initialized.\n"));
goto bail_out;
}
View
@@ -457,7 +457,7 @@ static void list_volumes(STATUS_PKT *sp, const char *devicenames)
vol->is_in_use(), vol->get_jobid());
sendit(msg.c_str(), len, sp);
} else {
len = Mmsg(msg, "Volume: %s no device. volinuse= %d\n",
len = Mmsg(msg, "Read Volume: %s no device. volinuse= %d\n",
vol->vol_name, vol->is_in_use());
sendit(msg.c_str(), len, sp);
}
View
@@ -177,7 +177,7 @@ void add_read_volume(JCR *jcr, const char *VolumeName)
free_read_vol_item(nvol);
Dmsg2(dbglvl, "read_vol=%s JobId=%d already in list.\n", VolumeName, jcr->JobId);
} else {
Dmsg2(dbglvl, "add read_vol=%s JobId=%d\n", VolumeName, jcr->JobId);
Dmsg2(dbglvl, "add_read_vol=%s JobId=%d\n", VolumeName, jcr->JobId);
}
unlock_read_volumes();
}

0 comments on commit 9c24f24

Please sign in to comment.