/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 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.
static char Get_Vol_Info[] = "CatReq Job=%s GetVolInfo VolName=%s write=%d\n";
static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%s"
" VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%s VolMounts=%u"
- " VolErrors=%u VolWrites=%u MaxVolBytes=%s EndTime=%d VolStatus=%s"
+ " VolErrors=%u VolWrites=%u MaxVolBytes=%s EndTime=%s VolStatus=%s"
" Slot=%d relabel=%d InChanger=%d VolReadTime=%s VolWriteTime=%s"
" VolFirstWritten=%s VolParts=%u\n";
static char Create_job_media[] = "CatReq Job=%s CreateJobMedia"
} else {
pm_strcpy(ChangerName, "*");
}
- ok =dir->fsend(Device_update,
+ ok = dir->fsend(Device_update,
jcr->Job,
dev_name.c_str(),
dev->can_append()!=0,
*/
bool dir_send_job_status(JCR *jcr)
{
- return bnet_fsend(jcr->dir_bsock, Job_status, jcr->Job, jcr->JobStatus);
+ return jcr->dir_bsock->fsend(Job_status, jcr->Job, jcr->JobStatus);
}
/*
return false;
}
memset(&vol, 0, sizeof(vol));
- Dmsg2(100, "<dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ Dmsg1(100, "<dird %s", dir->msg);
n = sscanf(dir->msg, OK_media, vol.VolCatName,
&vol.VolCatJobs, &vol.VolCatFiles,
&vol.VolCatBlocks, &vol.VolCatBytes,
&vol.EndFile, &vol.EndBlock, &vol.VolCatParts,
&vol.LabelType, &vol.VolMediaId);
if (n != 22) {
- Dmsg4(100, "Bad response from Dir jid=%u fields=%d, len=%d: %s",
- (uint32_t)jcr->JobId, n, dir->msglen, dir->msg);
+ Dmsg3(100, "Bad response from Dir fields=%d, len=%d: %s",
+ n, dir->msglen, dir->msg);
Mmsg(jcr->errmsg, _("Error getting Volume info: %s"), dir->msg);
return false;
}
bstrncpy(dcr->VolumeName, vol.VolCatName, sizeof(dcr->VolumeName));
dcr->VolCatInfo = vol; /* structure assignment */
- Dmsg3(100, "do_reqest_vol_info return true jid=%u slot=%d Volume=%s\n",
- (uint32_t)jcr->JobId, vol.Slot, vol.VolCatName);
+ Dmsg2(100, "do_reqest_vol_info return true slot=%d Volume=%s\n",
+ vol.Slot, vol.VolCatName);
return true;
}
bash_spaces(dcr->VolCatInfo.VolCatName);
dir->fsend(Get_Vol_Info, jcr->Job, dcr->VolCatInfo.VolCatName,
writing==GET_VOL_INFO_FOR_WRITE?1:0);
- Dmsg2(100, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ Dmsg1(100, ">dird %s", dir->msg);
unbash_spaces(dcr->VolCatInfo.VolCatName);
bool ok = do_get_volume_info(dcr);
V(vol_info_mutex);
* Returns: true on success dcr->VolumeName is volume
* reserve_volume() called on Volume name
* false on failure dcr->VolumeName[0] == 0
- * also sets dcr->volume_in_use if at least one
+ * also sets dcr->found_in_use if at least one
* in use volume was found.
*
* Volume information returned in dcr
{
JCR *jcr = dcr->jcr;
BSOCK *dir = jcr->dir_bsock;
- bool found = false;
+ bool rtn;
+ char lastVolume[MAX_NAME_LENGTH];
Dmsg2(200, "dir_find_next_appendable_volume: reserved=%d Vol=%s\n",
- dcr->reserved_device, dcr->VolumeName);
+ dcr->is_reserved(), dcr->VolumeName);
/*
* Try the twenty oldest or most available volumes. Note,
* the most available could already be mounted on another
* drive, so we continue looking for a not in use Volume.
*/
- lock_reservations();
+ lock_volumes();
P(vol_info_mutex);
- dcr->volume_in_use = false;
+ dcr->clear_found_in_use();
+ lastVolume[0] = 0;
for (int vol_index=1; vol_index < 20; vol_index++) {
bash_spaces(dcr->media_type);
bash_spaces(dcr->pool_name);
dir->fsend(Find_media, jcr->Job, vol_index, dcr->pool_name, dcr->media_type);
unbash_spaces(dcr->media_type);
unbash_spaces(dcr->pool_name);
- Dmsg2(100, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
- bool ok = do_get_volume_info(dcr);
- if (ok) {
- if (!is_volume_in_use(dcr)) {
- found = true;
+ Dmsg1(100, ">dird %s", dir->msg);
+ if (do_get_volume_info(dcr)) {
+ /* Give up if we get the same volume name twice */
+ if (lastVolume[0] && strcmp(lastVolume, dcr->VolumeName) == 0) {
+ Dmsg1(100, "Got same vol = %s\n", lastVolume);
break;
+ }
+ bstrncpy(lastVolume, dcr->VolumeName, sizeof(lastVolume));
+ 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,
+ dcr->dev->print_name());
+ continue;
+ }
+ Dmsg1(100, "dir_find_next_appendable_volume return true. vol=%s\n",
+ dcr->VolumeName);
+ rtn = true;
+ goto get_out;
} else {
- Dmsg2(100, "jid=%u Volume %s is in use.\n", (uint32_t)jcr->JobId, dcr->VolumeName);
- dcr->volume_in_use = true;
+ Dmsg1(100, "Volume %s is in use.\n", dcr->VolumeName);
+ /* If volume is not usable, it is in use by someone else */
+ dcr->set_found_in_use();
continue;
}
- } else {
- Dmsg2(100, "No vol. index %d return false. dev=%s\n", vol_index,
- dcr->dev->print_name());
- found = false;
- break;
- }
- }
- if (found) {
- Dmsg0(400, "dir_find_next_appendable_volume return true\n");
- if (reserve_volume(dcr, dcr->VolumeName) == 0) {
- Dmsg2(100, "Could not reserve volume %s on %s\n", dcr->VolumeName,
- dcr->dev->print_name());
- goto bail_out;
}
- V(vol_info_mutex);
- unlock_reservations();
- return true;
+ Dmsg2(100, "No vol. index %d return false. dev=%s\n", vol_index,
+ dcr->dev->print_name());
+ break;
}
-
-bail_out:
+ rtn = false;
dcr->VolumeName[0] = 0;
+
+get_out:
V(vol_info_mutex);
- unlock_reservations();
- return false;
+ unlock_volumes();
+ return rtn;
}
* back to the director. The information comes from the
* dev record.
*/
-bool dir_update_volume_info(DCR *dcr, bool label)
+bool dir_update_volume_info(DCR *dcr, bool label, bool update_LastWritten)
{
JCR *jcr = dcr->jcr;
BSOCK *dir = jcr->dir_bsock;
DEVICE *dev = dcr->dev;
- time_t LastWritten = time(NULL);
VOLUME_CAT_INFO *vol = &dev->VolCatInfo;
- char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50];
+ char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50], ed6[50];
int InChanger;
bool ok = false;
POOL_MEM VolumeName;
/* If system job, do not update catalog */
- if (jcr->JobType == JT_SYSTEM) {
+ if (jcr->getJobType() == JT_SYSTEM) {
return true;
}
if (label) {
bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus));
}
+// if (update_LastWritten) {
+ vol->VolLastWritten = time(NULL);
+// }
pm_strcpy(VolumeName, vol->VolCatName);
bash_spaces(VolumeName);
InChanger = vol->InChanger;
vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
vol->VolCatMounts, vol->VolCatErrors,
vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2),
- LastWritten, vol->VolCatStatus, vol->Slot, label,
+ edit_uint64(vol->VolLastWritten, ed6),
+ vol->VolCatStatus, vol->Slot, label,
InChanger, /* bool in structure */
edit_int64(vol->VolReadTime, ed3),
edit_int64(vol->VolWriteTime, ed4),
edit_uint64(vol->VolFirstWritten, ed5),
vol->VolCatParts);
- Dmsg2(100, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ Dmsg1(100, ">dird %s", dir->msg);
/* Do not lock device here because it may be locked from label */
if (!do_get_volume_info(dcr)) {
vol->VolCatName, jcr->errmsg);
goto bail_out;
}
- Dmsg2(420, "get_volume_info() jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ Dmsg1(420, "get_volume_info() %s", dir->msg);
/* Update dev Volume info in case something changed (e.g. expired) */
dev->VolCatInfo = dcr->VolCatInfo;
ok = 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->getJobType() == 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));
- Dmsg2(100, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
- if (bnet_recv(dir) <= 0) {
+ 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"),
dir->bstrerror());
return false;
}
- Dmsg2(100, "<dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ Dmsg1(100, "<dird %s", dir->msg);
if (strcmp(dir->msg, OK_create) != 0) {
Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Error creating JobMedia record: %s\n"), dir->msg);
ser_uint32(rec->data_len);
ser_bytes(rec->data, rec->data_len);
dir->msglen = ser_length(dir->msg);
- Dmsg2(1800, ">dird jid=%u: %s\n", (uint32_t)jcr->JobId, dir->msg); /* Attributes */
+ 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) {
- Jmsg(jcr, M_MOUNT, 0, _(
-"Job %s waiting. Cannot find any appendable volumes.\n"
-"Please use the \"label\" command to create a new Volume for:\n"
+ Mmsg(dev->errmsg, _(
+"Job %s is waiting. Cannot find any appendable volumes.\n"
+"Please use the \"label\" command to create a new Volume for:\n"
" Storage: %s\n"
" Pool: %s\n"
" Media type: %s\n"),
dev->print_name(),
dcr->pool_name,
dcr->media_type);
+ Jmsg(jcr, M_MOUNT, 0, "%s", dev->errmsg);
+ Dmsg1(100, "%s", dev->errmsg);
}
}
}
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");
* Note, must create dev->errmsg on error return.
*
*/
-bool dir_ask_sysop_to_mount_volume(DCR *dcr)
+bool dir_ask_sysop_to_mount_volume(DCR *dcr, int mode)
{
int stat = W_TIMEOUT;
DEVICE *dev = dcr->dev;
* Otherwise skip it.
*/
if (!dev->poll && (stat == W_TIMEOUT || stat == W_MOUNT)) {
- Jmsg(jcr, M_MOUNT, 0, _("Please mount Volume \"%s\" or label a new one for:\n"
+ char *msg;
+ if (mode == ST_APPEND) {
+ msg = _("Please mount Volume \"%s\" or label a new one for:\n"
" Job: %s\n"
" Storage: %s\n"
" Pool: %s\n"
- " Media type: %s\n"),
+ " Media type: %s\n");
+ } else {
+ msg = _("Please mount Volume \"%s\" for:\n"
+ " Job: %s\n"
+ " Storage: %s\n"
+ " Pool: %s\n"
+ " Media type: %s\n");
+ }
+ Jmsg(jcr, M_MOUNT, 0, msg,
dcr->VolumeName,
jcr->Job,
dev->print_name(),
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");
projects / bacula / bacula / blobdiff