* Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-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
*/
/* Requests from the Storage daemon */
-static char Find_media[] = "CatReq Job=%127s FindMedia=%d\n";
+static char Find_media[] = "CatReq Job=%127s FindMedia=%d pool_name=%127s media_type=%127s\n";
static char Get_Vol_Info[] = "CatReq Job=%127s GetVolInfo VolName=%127s write=%d\n";
-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=%d VolStatus=%10s\
- Slot=%d relabel=%d InChanger=%d VolReadTime=%" lld " VolWriteTime=%" lld "\n";
+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=%d VolStatus=%10s"
+ " Slot=%d relabel=%d InChanger=%d VolReadTime=%" lld " VolWriteTime=%" lld
+ " VolParts=%u\n";
-static char Create_job_media[] = "CatReq Job=%127s CreateJobMedia \
- FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u \
- StartBlock=%u EndBlock=%u\n";
+static char Create_job_media[] = "CatReq Job=%127s CreateJobMedia "
+ " FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u "
+ " StartBlock=%u EndBlock=%u\n";
/* Responses sent to Storage daemon */
" VolBlocks=%u VolBytes=%s VolMounts=%u VolErrors=%u VolWrites=%u"
" MaxVolBytes=%s VolCapacityBytes=%s VolStatus=%s Slot=%d"
" MaxVolJobs=%u MaxVolFiles=%u InChanger=%d VolReadTime=%s"
- " VolWriteTime=%s\n";
+ " VolWriteTime=%s EndFile=%u EndBlock=%u VolParts=%u LabelType=%d\n";
static char OK_create[] = "1000 OK CreateJobMedia\n";
-static int send_volume_info_to_storage_daemon(JCR *jcr, BSOCK *sd, MEDIA_DBR *mr)
+static int send_volume_info_to_storage_daemon(JCR *jcr, BSOCK *sd, MEDIA_DBR *mr)
{
int stat;
char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50];
jcr->MediaId = mr->MediaId;
- pm_strcpy(&jcr->VolumeName, mr->VolumeName);
+ pm_strcpy(jcr->VolumeName, mr->VolumeName);
bash_spaces(mr->VolumeName);
stat = bnet_fsend(sd, 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),
+ mr->VolMounts, mr->VolErrors, mr->VolWrites,
+ edit_uint64(mr->MaxVolBytes, ed2),
edit_uint64(mr->VolCapacityBytes, ed3),
mr->VolStatus, mr->Slot, mr->MaxVolJobs, mr->MaxVolFiles,
mr->InChanger,
edit_uint64(mr->VolReadTime, ed4),
- edit_uint64(mr->VolWriteTime, ed5));
+ edit_uint64(mr->VolWriteTime, ed5),
+ mr->EndFile, mr->EndBlock,
+ mr->VolParts,
+ mr->LabelType);
unbash_spaces(mr->VolumeName);
- Dmsg2(200, "Vol Info for %s: %s", jcr->Job, sd->msg);
+ Dmsg2(100, "Vol Info for %s: %s", jcr->Job, sd->msg);
return stat;
}
void catalog_request(JCR *jcr, BSOCK *bs, char *msg)
{
- MEDIA_DBR mr, sdmr;
+ MEDIA_DBR mr, sdmr;
JOBMEDIA_DBR jm;
char Job[MAX_NAME_LENGTH];
+ char pool_name[MAX_NAME_LENGTH];
int index, ok, label, writing;
POOLMEM *omsg;
+ POOL_DBR pr;
memset(&mr, 0, sizeof(mr));
memset(&sdmr, 0, sizeof(sdmr));
/*
* Request to find next appendable Volume for this Job
*/
- Dmsg1(200, "catreq %s", bs->msg);
- if (sscanf(bs->msg, Find_media, &Job, &index) == 2) {
- ok = find_next_volume_for_append(jcr, &mr, TRUE /*permit create new vol*/);
+ Dmsg1(100, "catreq %s", bs->msg);
+ if (!jcr->db) {
+ omsg = get_memory(bs->msglen+1);
+ pm_strcpy(omsg, bs->msg);
+ 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;
+ }
+ /*
+ * Find next appendable medium for SD
+ */
+ 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));
+ 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*/);
+ }
/*
- * Send Find Media response to Storage daemon
+ * Send Find Media response to Storage daemon
*/
if (ok) {
send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
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(500, "CatReq GetVolInfo Vol=%s\n", mr.VolumeName);
/*
* Find the Volume
*/
unbash_spaces(mr.VolumeName);
if (db_get_media_record(jcr, jcr->db, &mr)) {
- char *reason = NULL; /* detailed reason for rejection */
- /*
+ 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
+ * 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
+ * Pool matches, and it is either Append or Recycle
* and Media Type matches and Pool allows any volume.
*/
if (mr.PoolId != jcr->PoolId) {
} else if (strcmp(mr.MediaType, jcr->store->media_type) != 0) {
reason = "not correct MediaType";
} else {
- /*
- * ****FIXME***
+ /*
+ * ****FIXME***
* This test (accept_any_volume) is turned off
* because it doesn't properly check if the volume
* really is out of sequence!
* reason = "Volume not in sequence";
*/
- /*
+ /*
* Now try recycling if necessary
* reason set non-NULL if we cannot use it
*/
}
if (reason == NULL) {
/*
- * Send Find Media response to Storage daemon
+ * Send Find Media response to Storage daemon
*/
send_volume_info_to_storage_daemon(jcr, bs, &mr);
- } else {
+ } else {
/* Not suitable volume */
- bnet_fsend(bs, "1998 Volume \"%s\" status is %s, %s.\n", mr.VolumeName,
+ 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);
+ Dmsg1(400, "1997 Volume \"%s\" not in catalog.\n", mr.VolumeName);
}
-
/*
* Request to update Media record. Comes typically at the end
- * of a Storage daemon Job Session or when labeling/relabeling a
- * Volume.
+ * of a Storage daemon Job Session, when labeling/relabeling a
+ * Volume, or when an EOF mark is written.
*/
- } else if (sscanf(bs->msg, Update_media, &Job, &sdmr.VolumeName, &sdmr.VolJobs,
- &sdmr.VolFiles, &sdmr.VolBlocks, &sdmr.VolBytes, &sdmr.VolMounts, &sdmr.VolErrors,
- &sdmr.VolWrites, &sdmr.MaxVolBytes, &sdmr.LastWritten, &sdmr.VolStatus,
- &sdmr.Slot, &label, &sdmr.InChanger, &sdmr.VolReadTime,
- &sdmr.VolWriteTime) == 17) {
+ } else if (sscanf(bs->msg, Update_media, &Job, &sdmr.VolumeName,
+ &sdmr.VolJobs, &sdmr.VolFiles, &sdmr.VolBlocks, &sdmr.VolBytes,
+ &sdmr.VolMounts, &sdmr.VolErrors, &sdmr.VolWrites, &sdmr.MaxVolBytes,
+ &sdmr.LastWritten, &sdmr.VolStatus, &sdmr.Slot, &label, &sdmr.InChanger,
+ &sdmr.VolReadTime, &sdmr.VolWriteTime, &sdmr.VolParts) == 18) {
db_lock(jcr->db);
- Dmsg3(300, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
+ Dmsg3(400, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
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 failed: %s", 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.VolJobs == 0 || sdmr.VolJobs == 1) {
+ if (mr.FirstWritten == 0) {
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 */
- Dmsg2(300, "label=%d labeldate=%d\n", label, mr.LabelDate);
if (label || mr.LabelDate == 0) {
- mr.LabelDate = time(NULL);
+ 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) {
+ 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;
+ }
}
- Dmsg2(300, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
+ Dmsg2(400, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
/* Copy updated values to original media record */
mr.VolJobs = sdmr.VolJobs;
mr.VolFiles = sdmr.VolFiles;
mr.InChanger = sdmr.InChanger;
mr.VolReadTime = sdmr.VolReadTime;
mr.VolWriteTime = sdmr.VolWriteTime;
+ mr.VolParts = sdmr.VolParts;
bstrncpy(mr.VolStatus, sdmr.VolStatus, sizeof(mr.VolStatus));
- Dmsg2(300, "db_update_media_record. Stat=%s Vol=%s\n", mr.VolStatus, mr.VolumeName);
+ 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.
*/
- if (has_volume_expired(jcr, &mr)) {
- send_volume_info_to_storage_daemon(jcr, bs, &mr);
- } else if (db_update_media_record(jcr, jcr->db, &mr)) {
+ if (has_volume_expired(jcr, &mr) || db_update_media_record(jcr, jcr->db, &mr)) {
send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
- Jmsg(jcr, M_ERROR, 0, _("Catalog error updating Media record. %s"),
+ Jmsg(jcr, M_FATAL, 0, _("Catalog error updating Media record. %s"),
db_strerror(jcr->db));
bnet_fsend(bs, "1992 Update Media error\n");
- Dmsg0(190, "send error\n");
+ Dmsg0(400, "send error\n");
}
db_unlock(jcr->db);
jm.JobId = jcr->JobId;
jm.MediaId = jcr->MediaId;
- Dmsg6(300, "create_jobmedia JobId=%d MediaId=%d SF=%d EF=%d FI=%d LI=%d\n",
+ 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);
if (!db_create_jobmedia_record(jcr, jcr->db, &jm)) {
- Jmsg(jcr, M_ERROR, 0, _("Catalog error creating JobMedia record. %s"),
+ Jmsg(jcr, M_FATAL, 0, _("Catalog error creating JobMedia record. %s"),
db_strerror(jcr->db));
bnet_fsend(bs, "1991 Update JobMedia error\n");
} else {
- Dmsg0(300, "JobMedia record created\n");
+ Dmsg0(400, "JobMedia record created\n");
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);
- Jmsg1(jcr, M_ERROR, 0, _("Invalid Catalog request: %s"), omsg);
+ pm_strcpy(omsg, bs->msg);
+ bnet_fsend(bs, "1990 Invalid Catalog Request: %s", omsg);
+ Jmsg1(jcr, M_FATAL, 0, _("Invalid Catalog request: %s"), omsg);
free_memory(omsg);
}
- Dmsg1(300, ">CatReq response: %s", bs->msg);
- Dmsg1(200, "Leave catreq jcr 0x%x\n", jcr);
+ Dmsg1(400, ">CatReq response: %s", bs->msg);
+ Dmsg1(400, "Leave catreq jcr 0x%x\n", jcr);
return;
}
* 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, and file name
+ * VolSessionId, VolSessionTime, FileIndex, and file name
* to store in the catalog.
*/
void catalog_update(JCR *jcr, BSOCK *bs, char *msg)
unser_uint32(data_len);
p += unser_length(p);
- Dmsg1(300, "UpdCat msg=%s\n", bs->msg);
- Dmsg5(300, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n",
+ Dmsg1(400, "UpdCat msg=%s\n", bs->msg);
+ Dmsg5(400, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n",
VolSessionId, VolSessionTime, FileIndex, Stream, data_len);
if (Stream == STREAM_UNIX_ATTRIBUTES || Stream == STREAM_UNIX_ATTRIBUTES_EX) {
len = strlen(fname); /* length before attributes */
attr = &fname[len+1];
- Dmsg2(300, "dird<stored: stream=%d %s\n", Stream, fname);
- Dmsg1(300, "dird<stored: attr=%s\n", attr);
- ar.attr = attr;
+ 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;
- Dmsg2(300, "dird<filed: stream=%d %s\n", Stream, fname);
- Dmsg1(120, "dird<filed: attr=%s\n", attr);
+ 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)) {
Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
jcr->FileIndex = FileIndex;
} else if (Stream == STREAM_MD5_SIGNATURE || Stream == STREAM_SHA1_SIGNATURE) {
fname = p;
- if (jcr->FileIndex != FileIndex) {
+ if (jcr->FileIndex != FileIndex) {
Jmsg(jcr, M_WARNING, 0, "Got MD5/SHA1 but not same File as attributes\n");
} else {
/* Update signature in catalog */
type = SHA1_SIG;
}
bin_to_base64(SIGbuf, fname, len);
- Dmsg3(190, "SIGlen=%d SIG=%s type=%d\n", strlen(SIGbuf), SIGbuf, Stream);
+ 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"),
+ Jmsg(jcr, M_ERROR, 0, _("Catalog error updating MD5/SHA1. %s"),
db_strerror(jcr->db));
}
}
projects / bacula / bacula / blobdiff