* Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "stored.h" /* pull in Storage Deamon headers */
/* Forward referenced functions */
-static int create_volume_label(DEVICE *dev, char *VolName);
static void create_volume_label_record(JCR *jcr, DEVICE *dev, DEV_RECORD *rec);
extern char my_name[];
extern int debug_level;
-char BaculaId[] = "Bacula 0.9 mortal\n";
-unsigned int BaculaTapeVersion = 9;
-
-
/*
* Read the volume label
*
* VOL_CREATE_ERROR
* VOL_VERSION_ERROR
* VOL_LABEL_ERROR
+ * VOL_NO_MEDIA
*/
int read_dev_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
{
char *VolName = jcr->VolumeName;
DEV_RECORD *record;
+ int ok = 0;
- Dmsg2(30, "Enter read_volume_label device=%s vol=%s\n",
- dev_name(dev), VolName);
+ Dmsg3(100, "Enter read_volume_label device=%s vol=%s dev_Vol=%s\n",
+ dev_name(dev), VolName, dev->VolHdr.VolName);
- if (dev->state & ST_LABEL) { /* did we already read label? */
- /* Compare Volume Names */
- if (VolName && *VolName && strcmp(dev->VolHdr.VolName, VolName) != 0) {
- Mmsg(&jcr->errmsg, _("Volume name mismatch on device %s: Wanted %s got %s\n"),
+ if (dev_state(dev, ST_LABEL)) { /* did we already read label? */
+ /* Compare Volume Names allow special wild card */
+ if (VolName && *VolName && *VolName != '*' && strcmp(dev->VolHdr.VolName, VolName) != 0) {
+ Mmsg(&jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"),
dev_name(dev), VolName, dev->VolHdr.VolName);
-
+ /*
+ * Cancel Job if too many label errors
+ * => we are in a loop
+ */
+ if (jcr->label_errors++ > 100) {
+ Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg);
+ }
return jcr->label_status = VOL_NAME_ERROR;
}
Dmsg0(30, "Leave read_volume_label() VOL_OK\n");
if (!rewind_dev(dev)) {
Mmsg(&jcr->errmsg, _("Couldn't rewind device %s ERR=%s\n"), dev_name(dev),
strerror_dev(dev));
- return jcr->label_status = VOL_IO_ERROR;
+ return jcr->label_status = VOL_NO_MEDIA;
}
- strcpy(dev->VolHdr.Id, "**error**");
+ bstrncpy(dev->VolHdr.Id, "**error**", sizeof(dev->VolHdr.Id));
- /* Read the device label block */
+ /* Read the Volume label block */
record = new_record();
Dmsg0(90, "Big if statement in read_volume_label\n");
- if (!read_block_from_dev(dev, block) ||
- !read_record_from_block(block, record) ||
- !unser_volume_label(dev, record) ||
- strcmp(dev->VolHdr.Id, BaculaId) != 0) {
-
+ if (!read_block_from_dev(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
Mmsg(&jcr->errmsg, _("Volume on %s is not a Bacula labeled Volume, \
because:\n %s"), dev_name(dev), strerror_dev(dev));
+ } else if (!read_record_from_block(block, record)) {
+ Mmsg(&jcr->errmsg, _("Could not read Volume label from block.\n"));
+ } else if (!unser_volume_label(dev, record)) {
+ Mmsg(&jcr->errmsg, _("Could not unserialize Volume label: %s\n"),
+ strerror_dev(dev));
+ } else if (strcmp(dev->VolHdr.Id, BaculaId) != 0 &&
+ strcmp(dev->VolHdr.Id, OldBaculaId) != 0) {
+ Mmsg(&jcr->errmsg, _("Volume Header Id bad: %s\n"), dev->VolHdr.Id);
+ } else {
+ ok = 1;
+ }
+ if (!ok) {
free_record(record);
empty_block(block);
rewind_dev(dev);
}
free_record(record);
- empty_block(block);
- rewind_dev(dev);
+ /* If we are a streaming device, we only get one chance to read */
+ if (!dev_cap(dev, CAP_STREAM)) {
+ empty_block(block);
+ rewind_dev(dev);
+ }
- if (dev->VolHdr.VerNum != BaculaTapeVersion) {
+ if (dev->VolHdr.VerNum != BaculaTapeVersion &&
+ dev->VolHdr.VerNum != OldCompatibleBaculaTapeVersion1 &&
+ dev->VolHdr.VerNum != OldCompatibleBaculaTapeVersion2) {
Mmsg(&jcr->errmsg, _("Volume on %s has wrong Bacula version. Wanted %d got %d\n"),
dev_name(dev), BaculaTapeVersion, dev->VolHdr.VerNum);
return jcr->label_status = VOL_VERSION_ERROR;
}
- /* Compare Volume Names */
- Dmsg2(30, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolName);
- if (VolName && *VolName && strcmp(dev->VolHdr.VolName, VolName) != 0) {
- Mmsg(&jcr->errmsg, _("Volume name mismatch. Wanted %s got %s\n"),
- VolName, dev->VolHdr.VolName);
- return jcr->label_status = VOL_NAME_ERROR;
- }
- Dmsg1(30, "Copy vol_name=%s\n", dev->VolHdr.VolName);
-
/* We are looking for either an unused Bacula tape (PRE_LABEL) or
* a Bacula volume label (VOL_LABEL)
*/
}
dev->state |= ST_LABEL; /* set has Bacula label */
+
+ /* Compare Volume Names */
+ Dmsg2(30, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolName);
+ if (VolName && *VolName && *VolName != '*' && strcmp(dev->VolHdr.VolName, VolName) != 0) {
+ Mmsg(&jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"),
+ dev_name(dev), VolName, dev->VolHdr.VolName);
+ /*
+ * Cancel Job if too many label errors
+ * => we are in a loop
+ */
+ if (jcr->label_errors++ > 100) {
+ Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg);
+ }
+ return jcr->label_status = VOL_NAME_ERROR;
+ }
+ Dmsg1(30, "Copy vol_name=%s\n", dev->VolHdr.VolName);
+
if (debug_level >= 10) {
dump_volume_label(dev);
}
if (rec->FileIndex != VOL_LABEL && rec->FileIndex != PRE_LABEL) {
Mmsg3(&dev->errmsg, _("Expecting Volume Label, got FI=%s Stream=%s len=%d\n"),
- FI_to_ascii(rec->FileIndex), stream_to_ascii(rec->Stream),
+ FI_to_ascii(rec->FileIndex),
+ stream_to_ascii(rec->Stream, rec->FileIndex),
rec->data_len);
return 0;
}
dev->VolHdr.LabelSize = rec->data_len;
- /* Unserialize the record into the Volume Header */
- ser_begin(rec->data, SER_LENGTH_Volume_Label);
-#define Fld(x) (dev->VolHdr.x)
- unser_string(Fld(Id));
-
- unser_uint32(Fld(VerNum));
-
- unser_float64(Fld(label_date));
- unser_float64(Fld(label_time));
- unser_float64(Fld(write_date));
- unser_float64(Fld(write_time));
+ /* Unserialize the record into the Volume Header */
+ rec->data = check_pool_memory_size(rec->data, SER_LENGTH_Volume_Label);
+ ser_begin(rec->data, SER_LENGTH_Volume_Label);
+ unser_string(dev->VolHdr.Id);
+ unser_uint32(dev->VolHdr.VerNum);
+
+ if (dev->VolHdr.VerNum >= 11) {
+ unser_btime(dev->VolHdr.label_btime);
+ unser_btime(dev->VolHdr.write_btime);
+ } else { /* old way */
+ unser_float64(dev->VolHdr.label_date);
+ unser_float64(dev->VolHdr.label_time);
+ }
+ unser_float64(dev->VolHdr.write_date); /* Unused with VerNum >= 11 */
+ unser_float64(dev->VolHdr.write_time); /* Unused with VerNum >= 11 */
- unser_string(Fld(VolName));
- unser_string(Fld(PrevVolName));
- unser_string(Fld(PoolName));
- unser_string(Fld(PoolType));
- unser_string(Fld(MediaType));
+ unser_string(dev->VolHdr.VolName);
+ unser_string(dev->VolHdr.PrevVolName);
+ unser_string(dev->VolHdr.PoolName);
+ unser_string(dev->VolHdr.PoolType);
+ unser_string(dev->VolHdr.MediaType);
- unser_string(Fld(HostName));
- unser_string(Fld(LabelProg));
- unser_string(Fld(ProgVersion));
- unser_string(Fld(ProgDate));
+ unser_string(dev->VolHdr.HostName);
+ unser_string(dev->VolHdr.LabelProg);
+ unser_string(dev->VolHdr.ProgVersion);
+ unser_string(dev->VolHdr.ProgDate);
ser_end(rec->data, SER_LENGTH_Volume_Label);
-#undef Fld
Dmsg0(90, "ser_read_vol\n");
if (debug_level >= 90) {
dump_volume_label(dev);
Dmsg0(20, "write Label in write_volume_label_to_block()\n");
memset(&rec, 0, sizeof(rec));
- rec.data = (char *) get_memory(SER_LENGTH_Volume_Label);
+ rec.data = get_memory(SER_LENGTH_Volume_Label);
create_volume_label_record(jcr, dev, &rec);
empty_block(block); /* Volume label always at beginning */
+ block->BlockNumber = 0;
if (!write_record_to_block(block, &rec)) {
free_pool_memory(rec.data);
- Emsg1(M_ERROR, 0, _("Cannot write Volume label to block for device %s\n"),
+ Jmsg1(jcr, M_FATAL, 0, _("Cannot write Volume label to block for device %s\n"),
dev_name(dev));
return 0;
} else {
/* Serialize the label into the device record. */
+ rec->data = check_pool_memory_size(rec->data, SER_LENGTH_Volume_Label);
ser_begin(rec->data, SER_LENGTH_Volume_Label);
-#define Fld(x) (dev->VolHdr.x)
- ser_string(Fld(Id));
+ ser_string(dev->VolHdr.Id);
- ser_uint32(Fld(VerNum));
+ ser_uint32(dev->VolHdr.VerNum);
- ser_float64(Fld(label_date));
- ser_float64(Fld(label_time));
-
- get_current_time(&dt);
- Fld(write_date) = dt.julian_day_number;
- Fld(write_time) = dt.julian_day_fraction;
-
- ser_float64(Fld(write_date));
- ser_float64(Fld(write_time));
+ if (dev->VolHdr.VerNum >= 11) {
+ ser_btime(dev->VolHdr.label_btime);
+ dev->VolHdr.write_btime = get_current_btime();
+ ser_btime(dev->VolHdr.write_btime);
+ dev->VolHdr.write_date = 0;
+ dev->VolHdr.write_time = 0;
+ } else {
+ /* OLD WAY DEPRECATED */
+ ser_float64(dev->VolHdr.label_date);
+ ser_float64(dev->VolHdr.label_time);
+ get_current_time(&dt);
+ dev->VolHdr.write_date = dt.julian_day_number;
+ dev->VolHdr.write_time = dt.julian_day_fraction;
+ }
+ ser_float64(dev->VolHdr.write_date); /* 0 if VerNum >= 11 */
+ ser_float64(dev->VolHdr.write_time); /* 0 if VerNum >= 11 */
- ser_string(Fld(VolName));
- ser_string(Fld(PrevVolName));
- ser_string(Fld(PoolName));
- ser_string(Fld(PoolType));
- ser_string(Fld(MediaType));
+ ser_string(dev->VolHdr.VolName);
+ ser_string(dev->VolHdr.PrevVolName);
+ ser_string(dev->VolHdr.PoolName);
+ ser_string(dev->VolHdr.PoolType);
+ ser_string(dev->VolHdr.MediaType);
- ser_string(Fld(HostName));
- ser_string(Fld(LabelProg));
- ser_string(Fld(ProgVersion));
- ser_string(Fld(ProgDate));
+ ser_string(dev->VolHdr.HostName);
+ ser_string(dev->VolHdr.LabelProg);
+ ser_string(dev->VolHdr.ProgVersion);
+ ser_string(dev->VolHdr.ProgDate);
ser_end(rec->data, SER_LENGTH_Volume_Label);
rec->data_len = ser_length(rec->data);
- rec->FileIndex = Fld(LabelType);
+ rec->FileIndex = dev->VolHdr.LabelType;
rec->VolSessionId = jcr->VolSessionId;
rec->VolSessionTime = jcr->VolSessionTime;
rec->Stream = jcr->NumVolumes;
Dmsg2(100, "Created Vol label rec: FI=%s len=%d\n", FI_to_ascii(rec->FileIndex),
rec->data_len);
-#undef Fld
}
* Returns: 0 on error
* 1 on success
*/
-static int create_volume_label(DEVICE *dev, char *VolName)
+void create_volume_label(DEVICE *dev, char *VolName, char *PoolName)
{
struct date_time dt;
DEVRES *device = (DEVRES *)dev->device;
/* ***FIXME*** we really need to get the volume name,
* pool name, and pool type from the database.
- * We also need to pickup the MediaType.
*/
- strcpy(dev->VolHdr.Id, BaculaId);
+ bstrncpy(dev->VolHdr.Id, BaculaId, sizeof(dev->VolHdr.Id));
dev->VolHdr.VerNum = BaculaTapeVersion;
dev->VolHdr.LabelType = PRE_LABEL; /* Mark tape as unused */
- strcpy(dev->VolHdr.VolName, VolName);
- strcpy(dev->VolHdr.PoolName, "Default");
- strcpy(dev->VolHdr.MediaType, device->media_type);
- strcpy(dev->VolHdr.PoolType, "Backup");
+ bstrncpy(dev->VolHdr.VolName, VolName, sizeof(dev->VolHdr.VolName));
+ bstrncpy(dev->VolHdr.PoolName, PoolName, sizeof(dev->VolHdr.PoolName));
+ bstrncpy(dev->VolHdr.MediaType, device->media_type, sizeof(dev->VolHdr.MediaType));
+
+ bstrncpy(dev->VolHdr.PoolType, "Backup", sizeof(dev->VolHdr.PoolType));
/* Put label time/date in header */
- get_current_time(&dt);
- dev->VolHdr.label_date = dt.julian_day_number;
- dev->VolHdr.label_time = dt.julian_day_fraction;
+ if (BaculaTapeVersion >= 11) {
+ dev->VolHdr.label_btime = get_current_btime();
+ dev->VolHdr.label_date = 0;
+ dev->VolHdr.label_time = 0;
+ } else {
+ /* OLD WAY DEPRECATED */
+ get_current_time(&dt);
+ dev->VolHdr.label_date = dt.julian_day_number;
+ dev->VolHdr.label_time = dt.julian_day_fraction;
+ }
- strcpy(dev->VolHdr.LabelProg, my_name);
- sprintf(dev->VolHdr.ProgVersion, "Ver. %s %s", VERSION, DATE);
+ if (gethostname(dev->VolHdr.HostName, sizeof(dev->VolHdr.HostName)) != 0) {
+ dev->VolHdr.HostName[0] = 0;
+ }
+ bstrncpy(dev->VolHdr.LabelProg, my_name, sizeof(dev->VolHdr.LabelProg));
+ sprintf(dev->VolHdr.ProgVersion, "Ver. %s %s", VERSION, BDATE);
sprintf(dev->VolHdr.ProgDate, "Build %s %s", __DATE__, __TIME__);
dev->state |= ST_LABEL; /* set has Bacula label */
if (debug_level >= 90) {
dump_volume_label(dev);
}
- return 1;
}
/*
Dmsg0(99, "write_volume_label()\n");
- if (!create_volume_label(dev, VolName)) {
- return 0;
- }
- strcpy(dev->VolHdr.MediaType, device->media_type);
- strcpy(dev->VolHdr.VolName, VolName);
- strcpy(dev->VolHdr.PoolName, PoolName);
+ create_volume_label(dev, VolName, PoolName);
if (!rewind_dev(dev)) {
+ memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
Dmsg2(30, "Bad status on %s from rewind. ERR=%s\n", dev_name(dev), strerror_dev(dev));
return 0;
}
block = new_block(dev);
memset(&rec, 0, sizeof(rec));
- rec.data = (char *) get_memory(SER_LENGTH_Volume_Label);
+ rec.data = get_memory(SER_LENGTH_Volume_Label);
create_volume_label_record(jcr, dev, &rec);
rec.Stream = 0;
if (!write_record_to_block(block, &rec)) {
Dmsg2(30, "Bad Label write on %s. ERR=%s\n", dev_name(dev), strerror_dev(dev));
+ memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
free_block(block);
free_pool_memory(rec.data);
return 0;
free_pool_memory(rec.data);
Dmsg0(99, "Call write_block_to_device()\n");
- if (!write_block_to_dev(dev, block)) {
+ if (!write_block_to_dev(jcr, dev, block)) {
+ memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
Dmsg2(30, "Bad Label write on %s. ERR=%s\n", dev_name(dev), strerror_dev(dev));
stat = 9;
}
weof_dev(dev, 1);
dev->state |= ST_LABEL;
- if (debug_level >= 00) {
+ if (debug_level >= 20) {
dump_volume_label(dev);
}
free_block(block);
void create_session_label(JCR *jcr, DEV_RECORD *rec, int label)
{
ser_declare;
- struct date_time dt;
- rec->sync = 1; /* wait for completion */
rec->VolSessionId = jcr->VolSessionId;
rec->VolSessionTime = jcr->VolSessionTime;
rec->Stream = jcr->JobId;
+ rec->data = check_pool_memory_size(rec->data, SER_LENGTH_Session_Label);
ser_begin(rec->data, SER_LENGTH_Session_Label);
ser_string(BaculaId);
ser_uint32(BaculaTapeVersion);
ser_uint32(jcr->JobId);
- get_current_time(&dt);
- ser_float64(dt.julian_day_number);
- ser_float64(dt.julian_day_fraction);
+ /* Changed in VerNum 11 */
+ ser_btime(get_current_btime());
+ ser_float64(0);
ser_string(jcr->pool_name);
ser_string(jcr->pool_type);
- ser_string(jcr->job_name);
+ ser_string(jcr->job_name); /* base Job name */
ser_string(jcr->client_name);
+
+ /* Added in VerNum 10 */
+ ser_string(jcr->Job); /* Unique name of this Job */
+ ser_string(jcr->fileset_name);
+ ser_uint32(jcr->JobType);
+ ser_uint32(jcr->JobLevel);
+ /* Added in VerNum 11 */
+ ser_string(jcr->fileset_md5);
+
if (label == EOS_LABEL) {
ser_uint32(jcr->JobFiles);
ser_uint64(jcr->JobBytes);
- ser_uint32(jcr->start_block);
- ser_uint32(jcr->end_block);
- ser_uint32(jcr->start_file);
- ser_uint32(jcr->end_file);
+ ser_uint32(jcr->StartBlock);
+ ser_uint32(jcr->EndBlock);
+ ser_uint32(jcr->StartFile);
+ ser_uint32(jcr->EndFile);
ser_uint32(jcr->JobErrors);
+
+ /* Added in VerNum 11 */
+ ser_uint32(jcr->JobStatus);
}
ser_end(rec->data, SER_LENGTH_Session_Label);
rec->data_len = ser_length(rec->data);
rec = new_record();
Dmsg1(90, "session_label record=%x\n", rec);
switch (label) {
- case SOS_LABEL:
- jcr->start_block = dev->block_num;
- jcr->start_file = dev->file;
- break;
- case EOS_LABEL:
- jcr->end_block = dev->block_num;
- jcr->end_file = dev->file;
- break;
- default:
- Emsg1(M_ABORT, 0, _("Bad session label = %d\n"), label);
- break;
+ case SOS_LABEL:
+ if (dev->state & ST_TAPE) {
+ jcr->StartBlock = dev->block_num;
+ jcr->StartFile = dev->file;
+ } else {
+ jcr->StartBlock = (uint32_t)dev->file_addr;
+ jcr->StartFile = (uint32_t)(dev->file_addr >> 32);
+ }
+ break;
+ case EOS_LABEL:
+ if (dev->state & ST_TAPE) {
+ jcr->EndBlock = dev->EndBlock;
+ jcr->EndFile = dev->EndFile;
+ } else {
+ jcr->EndBlock = (uint32_t)dev->file_addr;
+ jcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+ }
+ break;
+ default:
+ Jmsg1(jcr, M_ABORT, 0, _("Bad session label = %d\n"), label);
+ break;
}
create_session_label(jcr, rec, label);
rec->FileIndex = label;
- if (!write_record_device(jcr, dev, block, rec)) {
+ /*
+ * We guarantee that the session record can totally fit
+ * into a block. If not, write the block, and put it in
+ * the next block. Having the sesssion record totally in
+ * one block makes reading them much easier (no need to
+ * read the next block).
+ */
+ if (!can_write_record_to_block(block, rec)) {
+ Dmsg0(100, "Cannot write session label to block.\n");
+ if (!write_block_to_device(jcr, dev, block)) {
+ Dmsg0(90, "Got session label write_block_to_dev error.\n");
+ Jmsg(jcr, M_FATAL, 0, _("Error writing Session label to %s: %s\n"),
+ dev_vol_name(dev), strerror(errno));
+ free_record(rec);
+ return 0;
+ }
+ }
+ if (!write_record_to_block(block, rec)) {
Jmsg(jcr, M_FATAL, 0, _("Error writing Session label to %s: %s\n"),
dev_vol_name(dev), strerror(errno));
free_record(rec);
return 0;
}
- Dmsg1(90, "session_label record=%x\n", rec);
- Dmsg5(90, "sesson_label record FI=%s SessId=%d Strm=%s len=%d\n\
-remainder=%d\n",
+ Dmsg6(20, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d\n\
+remainder=%d\n", jcr->JobId,
FI_to_ascii(rec->FileIndex), rec->VolSessionId,
- stream_to_ascii(rec->Stream), rec->data_len,
+ stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len,
rec->remainder);
free_record(rec);
void dump_volume_label(DEVICE *dev)
{
- int dbl;
+ int dbl = debug_level;
uint32_t File;
char *LabelType, buf[30];
struct tm tm;
struct date_time dt;
+ debug_level = 1;
File = dev->file;
switch (dev->VolHdr.LabelType) {
case PRE_LABEL:
case EOS_LABEL:
LabelType = "EOS_LABEL";
break;
+ case EOT_LABEL:
+ goto bail_out;
default:
LabelType = buf;
sprintf(buf, "Unknown %d", dev->VolHdr.LabelType);
}
- dbl = debug_level;
- debug_level = 1;
- Dmsg11(-1, "\nVolume Label:\n\
+ Pmsg11(-1, "\nVolume Label:\n\
Id : %s\
VerNo : %d\n\
VolName : %s\n\
dev->VolHdr.PoolName, dev->VolHdr.MediaType,
dev->VolHdr.PoolType, dev->VolHdr.HostName);
+ if (dev->VolHdr.VerNum >= 11) {
+ char dt[50];
+ bstrftime(dt, sizeof(dt), btime_to_unix(dev->VolHdr.label_btime));
+ Pmsg1(-1, "Date label written: %s\n", dt);
+ } else {
dt.julian_day_number = dev->VolHdr.label_date;
dt.julian_day_fraction = dev->VolHdr.label_time;
tm_decode(&dt, &tm);
- Dmsg5(-1, "\
+ Pmsg5(-1, "\
Date label written: %04d-%02d-%02d at %02d:%02d\n",
tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min);
+ }
+
+bail_out:
debug_level = dbl;
}
{
ser_declare;
+ rec->data = check_pool_memory_size(rec->data, SER_LENGTH_Session_Label);
unser_begin(rec->data, SER_LENGTH_Session_Label);
unser_string(label->Id);
unser_uint32(label->VerNum);
unser_uint32(label->JobId);
- unser_float64(label->write_date);
+ if (label->VerNum >= 11) {
+ unser_btime(label->write_btime);
+ } else {
+ unser_float64(label->write_date);
+ }
unser_float64(label->write_time);
unser_string(label->PoolName);
unser_string(label->PoolType);
unser_string(label->JobName);
unser_string(label->ClientName);
+ if (label->VerNum >= 10) {
+ unser_string(label->Job); /* Unique name of this Job */
+ unser_string(label->FileSetName);
+ unser_uint32(label->JobType);
+ unser_uint32(label->JobLevel);
+ }
+ if (label->VerNum >= 11) {
+ unser_string(label->FileSetMD5);
+ } else {
+ label->FileSetMD5[0] = 0;
+ }
if (rec->FileIndex == EOS_LABEL) {
unser_uint32(label->JobFiles);
unser_uint64(label->JobBytes);
- unser_uint32(label->start_block);
- unser_uint32(label->end_block);
- unser_uint32(label->start_file);
- unser_uint32(label->end_file);
+ unser_uint32(label->StartBlock);
+ unser_uint32(label->EndBlock);
+ unser_uint32(label->StartFile);
+ unser_uint32(label->EndFile);
unser_uint32(label->JobErrors);
+ if (label->VerNum >= 11) {
+ unser_uint32(label->JobStatus);
+ } else {
+ label->JobStatus = JS_Terminated; /* kludge */
+ }
}
return 1;
}
SESSION_LABEL label;
char ec1[30], ec2[30], ec3[30], ec4[30], ec5[30], ec6[30], ec7[30];
-
unser_session_label(&label, rec);
dbl = debug_level;
debug_level = 1;
- Dmsg6(-1, "\n%s Record:\n\
+ Pmsg7(-1, "\n%s Record:\n\
JobId : %d\n\
+VerNum : %d\n\
PoolName : %s\n\
PoolType : %s\n\
JobName : %s\n\
ClientName : %s\n\
-", type,
- label.JobId, label.PoolName, label.PoolType,
+", type, label.JobId, label.VerNum,
+ label.PoolName, label.PoolType,
label.JobName, label.ClientName);
+ if (label.VerNum >= 10) {
+ Pmsg4(-1, "\
+Job (unique name) : %s\n\
+FileSet : %s\n\
+JobType : %c\n\
+JobLevel : %c\n\
+", label.Job, label.FileSetName, label.JobType, label.JobLevel);
+ }
+
if (rec->FileIndex == EOS_LABEL) {
- Dmsg7(-1, "\
+ Pmsg8(-1, "\
JobFiles : %s\n\
JobBytes : %s\n\
StartBlock : %s\n\
StartFile : %s\n\
EndFile : %s\n\
JobErrors : %s\n\
+JobStatus : %c\n\
",
edit_uint64_with_commas(label.JobFiles, ec1),
edit_uint64_with_commas(label.JobBytes, ec2),
- edit_uint64_with_commas(label.start_block, ec3),
- edit_uint64_with_commas(label.end_block, ec4),
- edit_uint64_with_commas(label.start_file, ec5),
- edit_uint64_with_commas(label.end_file, ec6),
- edit_uint64_with_commas(label.JobErrors, ec7));
- }
- dt.julian_day_number = label.write_date;
- dt.julian_day_fraction = label.write_time;
- tm_decode(&dt, &tm);
- Dmsg5(-1, "\
-Date written : %04d-%02d-%02d at %02d:%02d\n",
+ edit_uint64_with_commas(label.StartBlock, ec3),
+ edit_uint64_with_commas(label.EndBlock, ec4),
+ edit_uint64_with_commas(label.StartFile, ec5),
+ edit_uint64_with_commas(label.EndFile, ec6),
+ edit_uint64_with_commas(label.JobErrors, ec7),
+ label.JobStatus);
+ }
+ if (label.VerNum >= 11) {
+ char dt[50];
+ bstrftime(dt, sizeof(dt), btime_to_unix(label.write_btime));
+ Pmsg1(-1, _("Date written : %s\n"), dt);
+ } else {
+ dt.julian_day_number = label.write_date;
+ dt.julian_day_fraction = label.write_time;
+ tm_decode(&dt, &tm);
+ Pmsg5(-1, _("\
+Date written : %04d-%02d-%02d at %02d:%02d\n"),
tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min);
+ }
debug_level = dbl;
}
debug_level = 1;
switch (rec->FileIndex) {
case PRE_LABEL:
- type = "Fresh Volume";
+ type = _("Fresh Volume");
break;
case VOL_LABEL:
- type = "Volume";
+ type = _("Volume");
break;
case SOS_LABEL:
- type = "Begin Session";
+ type = _("Begin Session");
break;
case EOS_LABEL:
- type = "End Session";
+ type = _("End Session");
break;
case EOM_LABEL:
- type = "End of Media";
+ type = _("End of Media");
+ break;
+ case EOT_LABEL:
+ type = ("End of Tape");
break;
default:
- type = "Unknown";
+ type = _("Unknown");
break;
}
if (verbose) {
dump_session_label(rec, type);
break;
case EOM_LABEL:
- Dmsg5(-1, "%s Record: VSessId=%d VSessTime=%d JobId=%d DataLen=%d\n",
+ Pmsg5(-1, "%s Record: SessId=%d SessTime=%d JobId=%d DataLen=%d\n",
type, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
break;
+ case EOT_LABEL:
+ Pmsg0(-1, _("End of physical tape.\n"));
+ break;
default:
- Dmsg5(-1, "%s Record: VSessId=%d VSessTime=%d JobId=%d DataLen=%d\n",
+ Pmsg5(-1, "%s Record: SessId=%d SessTime=%d JobId=%d DataLen=%d\n",
type, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
break;
}
} else {
- Dmsg5(-1, "%s Record: VSessId=%d VSessTime=%d JobId=%d DataLen=%d\n",
+ switch (rec->FileIndex) {
+ case SOS_LABEL:
+ case EOS_LABEL:
+ SESSION_LABEL label;
+ unser_session_label(&label, rec);
+ Pmsg6(-1, "%s Record: SessId=%d SessTime=%d JobId=%d Level=%c \
+Type=%c\n",
+ type, rec->VolSessionId, rec->VolSessionTime, rec->Stream,
+ label.JobLevel, label.JobType);
+ break;
+ case EOM_LABEL:
+ case PRE_LABEL:
+ case VOL_LABEL:
+ default:
+ Pmsg5(-1, "%s Record: SessId=%d SessTime=%d JobId=%d DataLen=%d\n",
type, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
+ break;
+ case EOT_LABEL:
+ break;
+ }
}
debug_level = dbl;
}
projects / bacula / bacula / blobdiff