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 Update_media[] = "CatReq Job=%127s UpdateMedia VolName=%s"
" VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%lld VolMounts=%u"
" VolErrors=%u VolWrites=%u MaxVolBytes=%lld EndTime=%lld VolStatus=%10s"
- " Slot=%d relabel=%d InChanger=%d VolReadTime=%s VolWriteTime=%s"
+ " Slot=%d relabel=%d InChanger=%d VolReadTime=%lld VolWriteTime=%lld"
" VolFirstWritten=%lld VolParts=%u\n";
static char Create_job_media[] = "CatReq Job=%127s CreateJobMedia "
jcr->MediaId = mr->MediaId;
pm_strcpy(jcr->VolumeName, mr->VolumeName);
bash_spaces(mr->VolumeName);
- stat = bnet_fsend(sd, OK_media, mr->VolumeName, mr->VolJobs,
+ stat = sd->fsend(OK_media, mr->VolumeName, mr->VolJobs,
mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
mr->VolMounts, mr->VolErrors, mr->VolWrites,
edit_uint64(mr->MaxVolBytes, ed2),
void catalog_request(JCR *jcr, BSOCK *bs)
{
- char ed_vrt[50], ed_vwt[50];
MEDIA_DBR mr, sdmr;
JOBMEDIA_DBR jm;
char Job[MAX_NAME_LENGTH];
memset(&mr, 0, sizeof(mr));
memset(&sdmr, 0, sizeof(sdmr));
memset(&jm, 0, sizeof(jm));
- Dsm_check(1);
+ Dsm_check(100);
/*
* Request to find next appendable Volume for this Job
if (ok) {
mr.PoolId = pr.PoolId;
mr.StorageId = jcr->wstore->StorageId;
+ mr.ScratchPoolId = pr.ScratchPoolId;
ok = find_next_volume_for_append(jcr, &mr, index, fnv_create_vol, fnv_prune);
Dmsg3(050, "find_media ok=%d idx=%d vol=%s\n", ok, index, mr.VolumeName);
}
&sdmr.VolJobs, &sdmr.VolFiles, &sdmr.VolBlocks, &sdmr.VolBytes,
&sdmr.VolMounts, &sdmr.VolErrors, &sdmr.VolWrites, &sdmr.MaxVolBytes,
&VolLastWritten, &sdmr.VolStatus, &sdmr.Slot, &label, &sdmr.InChanger,
- ed_vrt, ed_vwt, &VolFirstWritten,
+ &sdmr.VolReadTime, &sdmr.VolWriteTime, &VolFirstWritten,
&sdmr.VolParts) == 19) {
- sdmr.VolReadTime = str_to_int64(ed_vrt);
- sdmr.VolWriteTime = str_to_int64(ed_vwt);
-
db_lock(jcr->db);
Dmsg3(400, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
mr.VolStatus, sdmr.VolStatus);
}
}
Dmsg2(400, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
+
/*
* Check if the volume has been written by the job,
* and update the LastWritten field if needed.
if (mr.VolBlocks != sdmr.VolBlocks && VolLastWritten != 0) {
mr.LastWritten = VolLastWritten;
}
+
+ /*
+ * Update to point to the last device used to write the Volume.
+ * However, do so only if we are writing the tape, i.e.
+ * the number of VolWrites has increased.
+ */
+ if (jcr->wstore && jcr->wstore->StorageId && sdmr.VolWrites > mr.VolWrites) {
+ mr.StorageId = jcr->wstore->StorageId;
+ }
+
/* Copy updated values to original media record */
mr.VolJobs = sdmr.VolJobs;
mr.VolFiles = sdmr.VolFiles;
mr.VolWrites = sdmr.VolWrites;
mr.Slot = sdmr.Slot;
mr.InChanger = sdmr.InChanger;
- mr.VolReadTime = sdmr.VolReadTime;
- mr.VolWriteTime = sdmr.VolWriteTime;
mr.VolParts = sdmr.VolParts;
bstrncpy(mr.VolStatus, sdmr.VolStatus, sizeof(mr.VolStatus));
- /*
- * Update to point to the last device used to write the Volume.
- * However, do so only if we are writing the tape, i.e.
- * the number of VolBlocks has increased.
- */
- if (jcr->wstore && jcr->wstore->StorageId && mr.VolBlocks != sdmr.VolBlocks) {
- mr.StorageId = jcr->wstore->StorageId;
+ if (sdmr.VolReadTime >= 0) {
+ mr.VolReadTime = sdmr.VolReadTime;
+ }
+ if (sdmr.VolWriteTime >= 0) {
+ mr.VolWriteTime = sdmr.VolWriteTime;
}
Dmsg2(400, "db_update_media_record. Stat=%s Vol=%s\n", mr.VolStatus, mr.VolumeName);
if (!db_create_jobmedia_record(jcr, jcr->db, &jm)) {
Jmsg(jcr, M_FATAL, 0, _("Catalog error creating JobMedia record. %s"),
db_strerror(jcr->db));
- bs->fsend(_("1991 Update JobMedia error\n"));
+ bs->fsend(_("1992 Create JobMedia error\n"));
} else {
Dmsg0(400, "JobMedia record created\n");
bs->fsend(OK_create);
}
/*
- * Update File Attributes in the catalog with data
- * sent by the Storage daemon. Note, we receive the whole
- * attribute record, but we select out only the stat packet,
- * VolSessionId, VolSessionTime, FileIndex, file type, and
- * file name to store in the catalog.
+ * Note, we receive the whole attribute record, but we select out only the stat
+ * packet, VolSessionId, VolSessionTime, FileIndex, file type, and file name to
+ * store in the catalog.
*/
-void catalog_update(JCR *jcr, BSOCK *bs)
+static void update_attribute(JCR *jcr, char *msg, int32_t msglen)
{
unser_declare;
uint32_t VolSessionId, VolSessionTime;
int len;
char *fname, *attr;
ATTR_DBR *ar = NULL;
- POOLMEM *omsg;
-
- Dsm_check(1);
- if (job_canceled(jcr) || !jcr->pool->catalog_files) {
- goto bail_out; /* user disabled cataloging */
- }
- if (!jcr->db) {
- omsg = get_memory(bs->msglen+1);
- pm_strcpy(omsg, bs->msg);
- bs->fsend(_("1991 Invalid Catalog Update: %s"), omsg);
- Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog Update; DB not open: %s"), omsg);
- free_memory(omsg);
- goto bail_out;
- }
/* Start transaction allocates jcr->attr and jcr->ar if needed */
db_start_transaction(jcr, jcr->db); /* start transaction if not already open */
* there may be a cached attr so we cannot yet write into
* jcr->attr or jcr->ar
*/
- p = bs->msg;
+ p = msg;
skip_nonspaces(&p); /* UpdCat */
skip_spaces(&p);
skip_nonspaces(&p); /* Job=nnn */
unser_uint32(data_len);
p += unser_length(p);
- Dmsg1(400, "UpdCat msg=%s\n", bs->msg);
+ Dmsg1(400, "UpdCat msg=%s\n", msg);
Dmsg5(400, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n",
VolSessionId, VolSessionTime, FileIndex, Stream, data_len);
}
}
/* Any cached attr is flushed so we can reuse jcr->attr and jcr->ar */
- jcr->attr = check_pool_memory_size(jcr->attr, bs->msglen);
- memcpy(jcr->attr, bs->msg, bs->msglen);
- p = jcr->attr - bs->msg + p; /* point p into jcr->attr */
+ jcr->attr = check_pool_memory_size(jcr->attr, msglen);
+ memcpy(jcr->attr, msg, msglen);
+ p = jcr->attr - msg + p; /* point p into jcr->attr */
skip_nonspaces(&p); /* skip FileIndex */
skip_spaces(&p);
filetype = str_to_int32(p); /* TODO: choose between unserialize and str_to_int32 */
}
}
}
+}
+
+/*
+ * Update File Attributes in the catalog with data
+ * sent by the Storage daemon.
+ */
+void catalog_update(JCR *jcr, BSOCK *bs)
+{
+ POOLMEM *omsg;
+
+ if (job_canceled(jcr) || !jcr->pool->catalog_files) {
+ goto bail_out; /* user disabled cataloging */
+ }
+ if (!jcr->db) {
+ omsg = get_memory(bs->msglen+1);
+ pm_strcpy(omsg, bs->msg);
+ bs->fsend(_("1994 Invalid Catalog Update: %s"), omsg);
+ Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog Update; DB not open: %s"), omsg);
+ free_memory(omsg);
+ goto bail_out;
+
+ }
+
+ update_attribute(jcr, bs->msg, bs->msglen);
+
+bail_out:
+ if (job_canceled(jcr)) {
+ cancel_storage_daemon_job(jcr);
+ }
+}
+
+/*
+ * Update File Attributes in the catalog with data read from
+ * the storage daemon spool file. We receive the filename and
+ * we try to read it.
+ */
+bool despool_attributes_from_file(JCR *jcr, const char *file)
+{
+ bool ret=false;
+ int32_t pktsiz;
+ size_t nbytes;
+ ssize_t last = 0, size = 0;
+ int count = 0;
+ int32_t msglen; /* message length */
+ POOLMEM *msg = get_pool_memory(PM_MESSAGE);
+ FILE *spool_fd=NULL;
+
+ Dmsg0(100, "Begin despool_attributes_from_file\n");
+
+ if (job_canceled(jcr) || !jcr->pool->catalog_files || !jcr->db) {
+ goto bail_out; /* user disabled cataloging */
+ }
+
+ spool_fd = fopen(file, "rb");
+ if (!spool_fd) {
+ Dmsg0(100, "cancel despool_attributes_from_file\n");
+ /* send an error message */
+ goto bail_out;
+ }
+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
+ posix_fadvise(fileno(spool_fd), 0, 0, POSIX_FADV_WILLNEED);
+#endif
+
+ while (fread((char *)&pktsiz, 1, sizeof(int32_t), spool_fd) ==
+ sizeof(int32_t)) {
+ size += sizeof(int32_t);
+ msglen = ntohl(pktsiz);
+ if (msglen > 0) {
+ if (msglen > (int32_t) sizeof_pool_memory(msg)) {
+ msg = realloc_pool_memory(msg, msglen + 1);
+ }
+ nbytes = fread(msg, 1, msglen, spool_fd);
+ if (nbytes != (size_t) msglen) {
+ berrno be;
+ Dmsg2(400, "nbytes=%d msglen=%d\n", nbytes, msglen);
+ Qmsg1(jcr, M_FATAL, 0, _("fread attr spool error. ERR=%s\n"),
+ be.bstrerror());
+ goto bail_out;
+ }
+ size += nbytes;
+ if ((++count & 0x3F) == 0) {
+ last = size;
+ }
+ }
+ update_attribute(jcr, msg, msglen);
+ }
+ if (ferror(spool_fd)) {
+ berrno be;
+ Qmsg1(jcr, M_FATAL, 0, _("fread attr spool error. ERR=%s\n"),
+ be.bstrerror());
+ goto bail_out;
+ }
+ ret = true;
+
bail_out:
+ if (spool_fd) {
+ fclose(spool_fd);
+ }
+
if (job_canceled(jcr)) {
cancel_storage_daemon_job(jcr);
}
+
+ free_pool_memory(msg);
+ Dmsg1(100, "End despool_attributes_from_file ret=%i\n", ret);
+ return ret;
}
projects / bacula / bacula / blobdiff