* This routine runs as a thread and must be thread reentrant.
*
* Basic tasks done here:
- * Handle Catalog services.
+ * Handle Catalog services.
*
* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2001-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
static char Create_job_media[] = "CatReq Job=%127s CreateJobMedia "
" FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u "
- " StartBlock=%u EndBlock=%u\n";
+ " StartBlock=%u EndBlock=%u Copy=%d Strip=%d\n";
/* Responses sent to Storage daemon */
return stat;
}
-void catalog_request(JCR *jcr, BSOCK *bs, char *msg)
+void catalog_request(JCR *jcr, BSOCK *bs)
{
MEDIA_DBR mr, sdmr;
JOBMEDIA_DBR jm;
if (!jcr->db) {
omsg = get_memory(bs->msglen+1);
pm_strcpy(omsg, bs->msg);
- bnet_fsend(bs, "1990 Invalid Catalog Request: %s", omsg);
+ bnet_fsend(bs, _("1990 Invalid Catalog Request: %s"), omsg);
Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog request; DB not open: %s"), omsg);
free_memory(omsg);
return;
if (sscanf(bs->msg, Find_media, &Job, &index, &pool_name, &mr.MediaType) == 4) {
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, pool_name, sizeof(pr.Name));
+ unbash_spaces(pr.Name);
ok = db_get_pool_record(jcr, jcr->db, &pr);
if (ok) {
- mr.PoolId = pr.PoolId;
- ok = find_next_volume_for_append(jcr, &mr, true /*permit create new vol*/);
+ mr.PoolId = pr.PoolId;
+ mr.StorageId = jcr->store->StorageId;
+ ok = find_next_volume_for_append(jcr, &mr, index, true /*permit create new vol*/);
}
/*
* Send Find Media response to Storage daemon
*/
if (ok) {
- send_volume_info_to_storage_daemon(jcr, bs, &mr);
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
- bnet_fsend(bs, "1901 No Media.\n");
+ bnet_fsend(bs, _("1901 No Media.\n"));
+ Dmsg0(500, "1901 No Media.\n");
}
/*
* Request to find specific Volume information
*/
} else if (sscanf(bs->msg, Get_Vol_Info, &Job, &mr.VolumeName, &writing) == 3) {
- Dmsg1(400, "CatReq GetVolInfo Vol=%s\n", mr.VolumeName);
+ Dmsg1(100, "CatReq GetVolInfo Vol=%s\n", mr.VolumeName);
/*
* Find the Volume
*/
unbash_spaces(mr.VolumeName);
if (db_get_media_record(jcr, jcr->db, &mr)) {
- const char *reason = NULL; /* detailed reason for rejection */
- /*
- * If we are reading, accept any volume (reason == NULL)
- * If we are writing, check if the Volume is valid
- * for this job, and do a recycle if necessary
- */
- if (writing) {
- /*
- * SD wants to write this Volume, so make
- * sure it is suitable for this job, i.e.
- * Pool matches, and it is either Append or Recycle
- * and Media Type matches and Pool allows any volume.
- */
- if (mr.PoolId != jcr->PoolId) {
- reason = "not in Pool";
- } else if (strcmp(mr.MediaType, jcr->store->media_type) != 0) {
- reason = "not correct MediaType";
- } else {
- /*
- * ****FIXME***
- * This test (accept_any_volume) is turned off
- * because it doesn't properly check if the volume
- * really is out of sequence!
- *
- * } else if (!jcr->pool->accept_any_volume) {
- * reason = "Volume not in sequence";
- */
-
- /*
- * Now try recycling if necessary
- * reason set non-NULL if we cannot use it
- */
- check_if_volume_valid_or_recyclable(jcr, &mr, &reason);
- }
- }
- if (reason == NULL) {
- /*
- * Send Find Media response to Storage daemon
- */
- send_volume_info_to_storage_daemon(jcr, bs, &mr);
- } else {
- /* Not suitable volume */
- bnet_fsend(bs, "1998 Volume \"%s\" status is %s, %s.\n", mr.VolumeName,
- mr.VolStatus, reason);
- }
+ const char *reason = NULL; /* detailed reason for rejection */
+ /*
+ * If we are reading, accept any volume (reason == NULL)
+ * If we are writing, check if the Volume is valid
+ * for this job, and do a recycle if necessary
+ */
+ if (writing) {
+ /*
+ * SD wants to write this Volume, so make
+ * sure it is suitable for this job, i.e.
+ * Pool matches, and it is either Append or Recycle
+ * and Media Type matches and Pool allows any volume.
+ */
+ if (mr.PoolId != jcr->PoolId) {
+ reason = _("not in Pool");
+ } else if (strcmp(mr.MediaType, jcr->store->media_type) != 0) {
+ reason = _("not correct MediaType");
+ } else {
+ /*
+ * Now try recycling if necessary
+ * reason set non-NULL if we cannot use it
+ */
+ check_if_volume_valid_or_recyclable(jcr, &mr, &reason);
+ }
+ }
+ if (reason == NULL) {
+ /*
+ * Send Find Media response to Storage daemon
+ */
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
+ } else {
+ /* Not suitable volume */
+ bnet_fsend(bs, _("1998 Volume \"%s\" status is %s, %s.\n"), mr.VolumeName,
+ mr.VolStatus, reason);
+ }
} else {
- bnet_fsend(bs, "1997 Volume \"%s\" not in catalog.\n", mr.VolumeName);
+ bnet_fsend(bs, _("1997 Volume \"%s\" not in catalog.\n"), mr.VolumeName);
+ Dmsg1(100, "1997 Volume \"%s\" not in catalog.\n", mr.VolumeName);
}
/*
db_lock(jcr->db);
Dmsg3(400, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
- mr.VolStatus, sdmr.VolStatus);
+ mr.VolStatus, sdmr.VolStatus);
bstrncpy(mr.VolumeName, sdmr.VolumeName, sizeof(mr.VolumeName)); /* copy Volume name */
unbash_spaces(mr.VolumeName);
if (!db_get_media_record(jcr, jcr->db, &mr)) {
Jmsg(jcr, M_ERROR, 0, _("Unable to get Media record for Volume %s: ERR=%s\n"),
- mr.VolumeName, db_strerror(jcr->db));
- bnet_fsend(bs, "1991 Catalog Request for vol=%s failed: %s",
- mr.VolumeName, db_strerror(jcr->db));
- db_unlock(jcr->db);
- return;
+ mr.VolumeName, db_strerror(jcr->db));
+ bnet_fsend(bs, _("1991 Catalog Request for vol=%s failed: %s"),
+ mr.VolumeName, db_strerror(jcr->db));
+ db_unlock(jcr->db);
+ return;
}
/* Set first written time if this is first job */
if (mr.FirstWritten == 0) {
- mr.FirstWritten = jcr->start_time; /* use Job start time as first write */
- mr.set_first_written = true;
+ mr.FirstWritten = jcr->start_time; /* use Job start time as first write */
+ mr.set_first_written = true;
}
/* If we just labeled the tape set time */
if (label || mr.LabelDate == 0) {
- mr.LabelDate = jcr->start_time;
- mr.set_label_date = true;
+ mr.LabelDate = jcr->start_time;
+ mr.set_label_date = true;
Dmsg2(400, "label=%d labeldate=%d\n", label, mr.LabelDate);
} else {
- /*
- * Insanity check for VolFiles get set to a smaller value
- */
- if (sdmr.VolFiles < mr.VolFiles) {
+ /*
+ * Insanity check for VolFiles get set to a smaller value
+ */
+ if (sdmr.VolFiles < mr.VolFiles) {
Jmsg(jcr, M_FATAL, 0, _("Volume Files at %u being set to %u"
" for Volume \"%s\". This is incorrect.\n"),
- mr.VolFiles, sdmr.VolFiles, mr.VolumeName);
- bnet_fsend(bs, "1992 Update Media error\n");
- db_unlock(jcr->db);
- return;
- }
+ mr.VolFiles, sdmr.VolFiles, mr.VolumeName);
+ bnet_fsend(bs, _("1992 Update Media error. VolFiles=%u, CatFiles=%u\n"),
+ sdmr.VolFiles, mr.VolFiles);
+ db_unlock(jcr->db);
+ return;
+ }
}
Dmsg2(400, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
/* Copy updated values to original media record */
mr.VolErrors = sdmr.VolErrors;
mr.VolWrites = sdmr.VolWrites;
mr.LastWritten = sdmr.LastWritten;
- mr.Slot = sdmr.Slot;
+ 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));
+ if (jcr->store->StorageId) {
+ mr.StorageId = jcr->store->StorageId;
+ }
Dmsg2(400, "db_update_media_record. Stat=%s Vol=%s\n", mr.VolStatus, mr.VolumeName);
/*
- * Check if it has expired, and if not update the DB. Note, if
- * Volume has expired, has_volume_expired() will update the DB.
+ * Update the database, then before sending the response to the
+ * SD, check if the Volume has expired.
*/
- if (has_volume_expired(jcr, &mr) || db_update_media_record(jcr, jcr->db, &mr)) {
- send_volume_info_to_storage_daemon(jcr, bs, &mr);
- } else {
+ if (!db_update_media_record(jcr, jcr->db, &mr)) {
Jmsg(jcr, M_FATAL, 0, _("Catalog error updating Media record. %s"),
- db_strerror(jcr->db));
- bnet_fsend(bs, "1992 Update Media error\n");
+ db_strerror(jcr->db));
+ bnet_fsend(bs, _("1993 Update Media error\n"));
Dmsg0(400, "send error\n");
+ } else {
+ (void)has_volume_expired(jcr, &mr);
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
}
db_unlock(jcr->db);
*/
} else if (sscanf(bs->msg, Create_job_media, &Job,
&jm.FirstIndex, &jm.LastIndex, &jm.StartFile, &jm.EndFile,
- &jm.StartBlock, &jm.EndBlock) == 7) {
+ &jm.StartBlock, &jm.EndBlock, &jm.Copy, &jm.Stripe) == 9) {
jm.JobId = jcr->JobId;
jm.MediaId = jcr->MediaId;
Dmsg6(400, "create_jobmedia JobId=%d MediaId=%d SF=%d EF=%d FI=%d LI=%d\n",
- jm.JobId, jm.MediaId, jm.StartFile, jm.EndFile, jm.FirstIndex, jm.LastIndex);
+ jm.JobId, jm.MediaId, jm.StartFile, jm.EndFile, jm.FirstIndex, jm.LastIndex);
if (!db_create_jobmedia_record(jcr, jcr->db, &jm)) {
Jmsg(jcr, M_FATAL, 0, _("Catalog error creating JobMedia record. %s"),
- db_strerror(jcr->db));
- bnet_fsend(bs, "1991 Update JobMedia error\n");
+ db_strerror(jcr->db));
+ bnet_fsend(bs, _("1991 Update JobMedia error\n"));
} else {
Dmsg0(400, "JobMedia record created\n");
- bnet_fsend(bs, OK_create);
+ bnet_fsend(bs, OK_create);
}
} else {
omsg = get_memory(bs->msglen+1);
pm_strcpy(omsg, bs->msg);
- bnet_fsend(bs, "1990 Invalid Catalog Request: %s", omsg);
+ bnet_fsend(bs, _("1990 Invalid Catalog Request: %s"), omsg);
Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog request: %s"), omsg);
free_memory(omsg);
}
* VolSessionId, VolSessionTime, FileIndex, and file name
* to store in the catalog.
*/
-void catalog_update(JCR *jcr, BSOCK *bs, char *msg)
+void catalog_update(JCR *jcr, BSOCK *bs)
{
unser_declare;
uint32_t VolSessionId, VolSessionTime;
int32_t Stream;
uint32_t FileIndex;
uint32_t data_len;
- char *p = bs->msg;
+ char *p;
int len;
char *fname, *attr;
- ATTR_DBR ar;
+ ATTR_DBR *ar = NULL;
+ POOLMEM *omsg;
if (!jcr->pool->catalog_files) {
+ return; /* user disabled cataloging */
+ }
+ if (!jcr->db) {
+ omsg = get_memory(bs->msglen+1);
+ pm_strcpy(omsg, bs->msg);
+ bnet_fsend(bs, _("1991 Invalid Catalog Update: %s"), omsg);
+ Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog Update; DB not open: %s"), omsg);
+ free_memory(omsg);
return;
}
- db_start_transaction(jcr, jcr->db); /* start transaction if not already open */
- skip_nonspaces(&p); /* UpdCat */
+
+ /* Start transaction allocates jcr->attr and jcr->ar if needed */
+ db_start_transaction(jcr, jcr->db); /* start transaction if not already open */
+ ar = jcr->ar;
+
+ /* Start by scanning directly in the message buffer to get Stream
+ * there may be a cached attr so we cannot yet write into
+ * jcr->attr or jcr->ar
+ */
+ p = bs->msg;
+ skip_nonspaces(&p); /* UpdCat */
skip_spaces(&p);
- skip_nonspaces(&p); /* Job=nnn */
+ skip_nonspaces(&p); /* Job=nnn */
skip_spaces(&p);
- skip_nonspaces(&p); /* FileAttributes */
+ skip_nonspaces(&p); /* FileAttributes */
p += 1;
unser_begin(p, 0);
unser_uint32(VolSessionId);
VolSessionId, VolSessionTime, FileIndex, Stream, data_len);
if (Stream == STREAM_UNIX_ATTRIBUTES || Stream == STREAM_UNIX_ATTRIBUTES_EX) {
- skip_nonspaces(&p); /* skip FileIndex */
+ if (jcr->cached_attribute) {
+ Dmsg2(400, "Cached attr. Stream=%d fname=%s\n", ar->Stream, ar->fname);
+ if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
+ }
+ }
+ /* 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 */
+ skip_nonspaces(&p); /* skip FileIndex */
skip_spaces(&p);
- skip_nonspaces(&p); /* skip FileType */
+ skip_nonspaces(&p); /* skip FileType */
skip_spaces(&p);
fname = p;
- len = strlen(fname); /* length before attributes */
+ len = strlen(fname); /* length before attributes */
attr = &fname[len+1];
Dmsg2(400, "dird<stored: stream=%d %s\n", Stream, fname);
Dmsg1(400, "dird<stored: attr=%s\n", attr);
- ar.attr = attr;
- ar.fname = fname;
- ar.FileIndex = FileIndex;
- ar.Stream = Stream;
- ar.link = NULL;
- ar.JobId = jcr->JobId;
+ ar->attr = attr;
+ ar->fname = fname;
+ ar->FileIndex = FileIndex;
+ ar->Stream = Stream;
+ ar->link = NULL;
+ ar->JobId = jcr->JobId;
+ ar->Sig = NULL;
+ ar->SigType = 0;
+ jcr->cached_attribute = true;
Dmsg2(400, "dird<filed: stream=%d %s\n", Stream, fname);
Dmsg1(400, "dird<filed: attr=%s\n", attr);
- if (!db_create_file_attributes_record(jcr, jcr->db, &ar)) {
+#ifdef xxx_old_code
+ if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
}
- /* Save values for SIG update */
- jcr->FileId = ar.FileId;
- jcr->FileIndex = FileIndex;
+#endif
} else if (Stream == STREAM_MD5_SIGNATURE || Stream == STREAM_SHA1_SIGNATURE) {
fname = p;
- if (jcr->FileIndex != FileIndex) {
- Jmsg(jcr, M_WARNING, 0, "Got MD5/SHA1 but not same File as attributes\n");
+ if (ar->FileIndex != FileIndex) {
+ Jmsg(jcr, M_WARNING, 0, _("Got MD5/SHA1 but not same File as attributes\n"));
} else {
- /* Update signature in catalog */
- char SIGbuf[50]; /* 24 bytes should be enough */
- int len, type;
- if (Stream == STREAM_MD5_SIGNATURE) {
- len = 16;
- type = MD5_SIG;
- } else {
- len = 20;
- type = SHA1_SIG;
- }
- bin_to_base64(SIGbuf, fname, len);
+ /* Update signature in catalog */
+ char SIGbuf[50]; /* 24 bytes should be enough */
+ int len, type;
+ if (Stream == STREAM_MD5_SIGNATURE) {
+ len = 16;
+ type = MD5_SIG;
+ } else {
+ len = 20;
+ type = SHA1_SIG;
+ }
+ bin_to_base64(SIGbuf, fname, len);
Dmsg3(400, "SIGlen=%d SIG=%s type=%d\n", strlen(SIGbuf), SIGbuf, Stream);
- if (!db_add_SIG_to_file_record(jcr, jcr->db, jcr->FileId, SIGbuf, type)) {
- Jmsg(jcr, M_ERROR, 0, _("Catalog error updating MD5/SHA1. %s"),
- db_strerror(jcr->db));
- }
+ if (jcr->cached_attribute) {
+ ar->Sig = SIGbuf;
+ ar->SigType = type;
+ Dmsg2(400, "Cached attr with SIG. Stream=%d fname=%s\n", ar->Stream, ar->fname);
+ if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
+ }
+ jcr->cached_attribute = false;
+ } else {
+ if (!db_add_SIG_to_file_record(jcr, jcr->db, ar->FileId, SIGbuf, type)) {
+ Jmsg(jcr, M_ERROR, 0, _("Catalog error updating MD5/SHA1. %s"),
+ db_strerror(jcr->db));
+ }
+ }
}
}
}
projects / bacula / bacula / blobdiff