X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Flabel.c;h=b600a66ffc0e4329eb1f587df40fd8ec5865e7ad;hb=d6a1dde94e0ab1de2e40f5233e247f6bb0312761;hp=ac0dd6bab5a5d2d83cae64b399e23788c659fd8a;hpb=95669c04d2e61e2dc9d4cf486bfc13a05e46de94;p=bacula%2Fbacula diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c index ac0dd6bab5..b600a66ffc 100644 --- a/bacula/src/stored/label.c +++ b/bacula/src/stored/label.c @@ -8,19 +8,32 @@ * Version $Id$ */ /* - 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 - version 2 as ammended 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 - the file LICENSE for additional details. - - */ + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2006 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. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ @@ -28,9 +41,6 @@ /* Forward referenced functions */ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec); -extern char my_name[]; -extern int debug_level; - /* * Read the volume label * @@ -64,12 +74,16 @@ int read_dev_volume_label(DCR *dcr) DEV_BLOCK *block = dcr->block; int stat; bool want_ansi_label; + bool have_ansi_label = false; - Dmsg3(100, "Enter read_volume_label device=%s vol=%s dev_Vol=%s\n", - dev->name(), VolName, dev->VolHdr.VolumeName); + Dmsg4(100, "Enter read_volume_label res=%d device=%s vol=%s dev_Vol=%s\n", + dev->reserved_device, dev->print_name(), VolName, + dev->VolHdr.VolumeName[0]?dev->VolHdr.VolumeName:"*NULL*"); if (!dev->is_open()) { - Emsg0(M_ABORT, 0, _("BAD call to read_dev_volume_label\n")); + if (dev->open(dcr, OPEN_READ_ONLY) < 0) { + return VOL_IO_ERROR; + } } if (dev->is_labeled()) { /* did we already read label? */ /* Compare Volume Names allow special wild card */ @@ -81,10 +95,11 @@ int read_dev_volume_label(DCR *dcr) * => we are in a loop */ if (!dev->poll && jcr->label_errors++ > 100) { - Jmsg(jcr, M_FATAL, 0, "Too many tries: %s", jcr->errmsg); + Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg); } - Dmsg0(100, "return VOL_NAME_ERROR\n"); - return VOL_NAME_ERROR; + Dmsg0(150, "return VOL_NAME_ERROR\n"); + stat = VOL_NAME_ERROR; + goto bail_out; } Dmsg0(30, "Leave read_volume_label() VOL_OK\n"); return VOL_OK; /* label already read */ @@ -95,9 +110,9 @@ int read_dev_volume_label(DCR *dcr) dev->clear_read(); dev->label_type = B_BACULA_LABEL; - if (!rewind_dev(dev)) { + if (!dev->rewind(dcr)) { Mmsg(jcr->errmsg, _("Couldn't rewind device %s: ERR=%s\n"), - dev->print_name(), strerror_dev(dev)); + dev->print_name(), dev->print_errmsg()); Dmsg1(30, "return VOL_NO_MEDIA: %s", jcr->errmsg); return VOL_NO_MEDIA; } @@ -107,27 +122,24 @@ int read_dev_volume_label(DCR *dcr) want_ansi_label = dcr->VolCatInfo.LabelType != B_BACULA_LABEL || dcr->device->label_type != B_BACULA_LABEL; - if (want_ansi_label || dev_cap(dev, CAP_CHECKLABELS)) { + if (want_ansi_label || dev->has_cap(CAP_CHECKLABELS)) { stat = read_ansi_ibm_label(dcr); /* If we want a label and didn't find it, return error */ if (want_ansi_label && stat != VOL_OK) { - empty_block(block); - rewind_dev(dev); - return stat; + goto bail_out; } if (stat == VOL_NAME_ERROR || stat == VOL_LABEL_ERROR) { Mmsg(jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"), dev->print_name(), VolName, dev->VolHdr.VolumeName); if (!dev->poll && jcr->label_errors++ > 100) { - Jmsg(jcr, M_FATAL, 0, "Too many tries: %s", jcr->errmsg); + Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg); } - empty_block(block); - rewind_dev(dev); - Dmsg1(100, "return %d\n", stat); - return stat; + goto bail_out; } if (stat != VOL_OK) { /* Not an ANSI/IBM label, so re-read */ - rewind_dev(dev); + dev->rewind(dcr); + } else { + have_ansi_label = true; } } @@ -139,14 +151,14 @@ int read_dev_volume_label(DCR *dcr) if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { Mmsg(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bacula " "labeled Volume, because: ERR=%s"), NPRT(VolName), - dev->print_name(), strerror_dev(dev)); + dev->print_name(), dev->print_errmsg()); Dmsg1(30, "%s", jcr->errmsg); - } else if (!read_record_from_block(block, record)) { + } else if (!read_record_from_block(dcr, block, record)) { Mmsg(jcr->errmsg, _("Could not read Volume label from block.\n")); Dmsg1(30, "%s", jcr->errmsg); } else if (!unser_volume_label(dev, record)) { Mmsg(jcr->errmsg, _("Could not unserialize Volume label: ERR=%s\n"), - strerror_dev(dev)); + dev->print_errmsg()); Dmsg1(30, "%s", jcr->errmsg); } else if (strcmp(dev->VolHdr.Id, BaculaId) != 0 && strcmp(dev->VolHdr.Id, OldBaculaId) != 0) { @@ -156,17 +168,17 @@ int read_dev_volume_label(DCR *dcr) ok = true; } free_record(record); /* finished reading Volume record */ - empty_block(block); /* done with block */ if (!ok) { if (forge_on || jcr->ignore_label_errors) { dev->set_labeled(); /* set has Bacula label */ Jmsg(jcr, M_ERROR, 0, "%s", jcr->errmsg); + empty_block(block); return VOL_OK; } - rewind_dev(dev); - Dmsg0(100, "return VOL_NO_LABEL\n"); - return VOL_NO_LABEL; + Dmsg0(100, "No volume label - bailing out\n"); + stat = VOL_NO_LABEL; + goto bail_out; } /* At this point, we have read the first Bacula block, and @@ -174,10 +186,6 @@ int read_dev_volume_label(DCR *dcr) * make sure we have the right Volume. */ - /* If we are a streaming device, we only get one chance to read */ - if (!dev_cap(dev, CAP_STREAM)) { - rewind_dev(dev); - } if (dev->VolHdr.VerNum != BaculaTapeVersion && dev->VolHdr.VerNum != OldCompatibleBaculaTapeVersion1 && @@ -185,7 +193,8 @@ int read_dev_volume_label(DCR *dcr) Mmsg(jcr->errmsg, _("Volume on %s has wrong Bacula version. Wanted %d got %d\n"), dev->print_name(), BaculaTapeVersion, dev->VolHdr.VerNum); Dmsg1(30, "VOL_VERSION_ERROR: %s", jcr->errmsg); - return VOL_VERSION_ERROR; + stat = VOL_VERSION_ERROR; + goto bail_out; } /* We are looking for either an unused Bacula tape (PRE_LABEL) or @@ -196,14 +205,15 @@ int read_dev_volume_label(DCR *dcr) dev->print_name(), dev->VolHdr.LabelType); Dmsg1(30, "%s", jcr->errmsg); if (!dev->poll && jcr->label_errors++ > 100) { - Jmsg(jcr, M_FATAL, 0, "Too many tries: %s", jcr->errmsg); + Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg); } - Dmsg0(100, "return VOL_LABEL_ERROR\n"); - return VOL_LABEL_ERROR; + Dmsg0(150, "return VOL_LABEL_ERROR\n"); + stat = VOL_LABEL_ERROR; + goto bail_out; } dev->set_labeled(); /* set has Bacula label */ - new_volume(dev->VolHdr.VolumeName, dev); + new_volume(dcr, dev->VolHdr.VolumeName); /* Compare Volume Names */ Dmsg2(30, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolumeName); @@ -218,8 +228,9 @@ int read_dev_volume_label(DCR *dcr) if (!dev->poll && jcr->label_errors++ > 100) { Jmsg(jcr, M_FATAL, 0, "Too many tries: %s", jcr->errmsg); } - Dmsg0(100, "return VOL_NAME_ERROR\n"); - return VOL_NAME_ERROR; + Dmsg0(150, "return VOL_NAME_ERROR\n"); + stat = VOL_NAME_ERROR; + goto bail_out; } Dmsg1(30, "Copy vol_name=%s\n", dev->VolHdr.VolumeName); @@ -227,107 +238,25 @@ int read_dev_volume_label(DCR *dcr) dump_volume_label(dev); } Dmsg0(30, "Leave read_volume_label() VOL_OK\n"); - return VOL_OK; -} - -/* Read the volume label by guessing the volume name. (only for DVD devices) - * write is true if we are reading the label before writing to the device. - * - * If the volume name cannot be guessed : - * Writing : returns the label of the current file (on the harddisk). - * Reading : returns an error - */ -int read_dvd_volume_label(DCR *dcr, bool write) -{ - int vol_label_status; - DEVICE *dev = dcr->dev; - JCR *jcr = dcr->jcr; - Dmsg3(100, "Enter: dvd_volume_label device=%s vol=%s dev_Vol=%s\n", - dev->print_name(), dcr->VolumeName, dev->VolHdr.VolumeName); - - if (!dev->is_dvd()) { - Jmsg1(jcr, M_ABORT, 0, _("Device %s is not a DVD.\n"), dev->print_name()); - return -1; /* for compiler, won't get here */ - } - - if (!write && (dcr->VolCatInfo.VolCatParts == 0)) { - Dmsg0(100, "Leave read_dvd_volume_label !writing, and VolCatParts == 0\n"); - return read_dev_volume_label(dcr); - } - - /* - * For mounted devices, try to guess the Volume name - * and read the label if possible. - */ - if (!can_open_mounted_dev(dev)) { - if (!write || dcr->VolCatInfo.VolCatParts > 0) { - Mmsg2(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bacula labeled Volume."), - dev->print_name(), dcr->VolumeName); - Dmsg0(100, "Leave read_dvd_volume_label VOL_NO_LABEL (!open_mounted_dev)\n"); - return VOL_NO_LABEL; - } - - /* At this point, we are writing */ - if (dev->free_space_errno < 0) { - Dmsg0(100, "Exit: read_dvd_volume_label !free_space VOL_NO_MEDIA\n"); - Mmsg2(jcr->errmsg, _("free_space error on %s. The current medium is probably not writable: ERR=%s.\n"), - dev->print_name(), dev->errmsg); - return VOL_NO_MEDIA; - } - - /* - * If we can't guess the name, and we are writing, - * just reopen the right file with open_first_part. - */ - if (open_first_part(dev, OPEN_READ_WRITE) < 0) { - berrno be; - Mmsg2(jcr->errmsg, _("open_first_part error on %s: ERR=%s.\n"), - dev->print_name(), be.strerror()); - Dmsg0(100, "Leave read_dvd_volume_label VOL_IO_ERROR (!open_mounted_dev && !open_first_part)\n"); - return VOL_IO_ERROR; - } - - Dmsg0(100, "Leave read_dvd_volume_label !open_mounted_dev\n"); - return read_dev_volume_label(dcr); - - } else { - /* - * If we get here, we can open the mounted device - */ - if (write && dcr->dev->free_space_errno < 0) { - Dmsg0(100, "Leave read_dvd_volume_label !free_space VOL_NO_MEDIA\n"); - Mmsg2(jcr->errmsg, _("free_space error on %s. The current medium is probably not writable: ERR=%s.\n"), - dev->print_name(), dev->errmsg); - return VOL_NO_MEDIA; - } - - if (!write || dcr->VolCatInfo.VolCatParts > 0) { - Dmsg0(100, "Exit: read_dvd_volume_label (open_mounted_dev && (!write || dcr->VolCatInfo.VolCatParts > 0))\n"); - return read_dev_volume_label(dcr); - } - - /* At this point, we are writing */ - if (open_first_part(dcr->dev, OPEN_READ_WRITE) < 0) { - berrno be; - Mmsg2(jcr->errmsg, _("open_first_part error on %s: ERR=%s.\n"), - dev->print_name(), be.strerror()); - Dmsg0(100, "Leave read_dvd_volume_label VOL_IO_ERROR (open_mounted_dev && !open_first_part)\n"); - return VOL_IO_ERROR; - } - vol_label_status = read_dev_volume_label(dcr); - - /* When writing, if the guessed volume name is not the right volume name, - * report the error, otherwise, just continue with the right file. - */ - if (vol_label_status != VOL_NAME_ERROR) { - Dmsg0(100, "Leave read_dvd_volume_label (open_mounted_dev && !VOL_NAME_ERROR)\n"); - dev->clear_labeled(); - return read_dev_volume_label(dcr); - } else { - Dmsg0(100, "Leave read_dvd_volume_label (open_mounted_dev && VOL_NAME_ERROR)\n"); - return vol_label_status; + /* If we are a streaming device, we only get one chance to read */ + if (!dev->has_cap(CAP_STREAM)) { + dev->rewind(dcr); + if (have_ansi_label) { + stat = read_ansi_ibm_label(dcr); + /* If we want a label and didn't find it, return error */ + if (stat != VOL_OK) { + goto bail_out; + } } } + empty_block(block); + return VOL_OK; + +bail_out: + empty_block(block); + dev->rewind(dcr); + Dmsg1(150, "return %d\n", stat); + return stat; } /* @@ -371,11 +300,10 @@ bool write_volume_label_to_block(DCR *dcr) * after the label will be destroyed, * in fact, we write the label 5 times !!!! * - * This routine expects that open_device() was previously called. - * * This routine should be used only when labeling a blank tape. */ -bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName) +bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, + const char *PoolName, bool relabel, bool dvdnow) { DEVICE *dev = dcr->dev; @@ -383,17 +311,37 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po Dmsg0(99, "write_volume_label()\n"); empty_block(dcr->block); - Dmsg1(100, "Label type=%d\n", dev->label_type); - if (!rewind_dev(dev)) { + /* If relabeling, truncate the device */ + if (relabel && !dev->truncate(dcr)) { + goto bail_out; + } + + if (relabel) { + dev->close_part(dcr); /* make sure closed for rename */ + } + + /* Set the new filename for open, ... */ + bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName)); + bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName)); + Dmsg1(150, "New VolName=%s\n", VolName); + if (dev->open(dcr, OPEN_READ_WRITE) < 0) { + /* If device is not tape, attempt to create it */ + if (dev->is_tape() || dev->open(dcr, CREATE_READ_WRITE) < 0) { + goto bail_out; + } + } + Dmsg1(150, "Label type=%d\n", dev->label_type); + if (!dev->rewind(dcr)) { + free_volume(dev); memset(&dev->VolHdr, 0, sizeof(dev->VolHdr)); - Dmsg2(30, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), strerror_dev(dev)); + Dmsg2(30, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), dev->print_errmsg()); if (!forge_on) { goto bail_out; } } - /* Create PRE_LABEL */ - create_volume_label(dev, VolName, PoolName); + /* Create PRE_LABEL or VOL_LABEL if DVD */ + create_volume_label(dev, VolName, PoolName, dvdnow); /* * If we have already detected an ANSI label, re-read it @@ -402,7 +350,7 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po */ if (dev->label_type != B_BACULA_LABEL) { if (read_ansi_ibm_label(dcr) != VOL_OK) { - rewind_dev(dev); + dev->rewind(dcr); goto bail_out; } } else if (!write_ansi_ibm_labels(dcr, ANSI_VOL_LABEL, VolName)) { @@ -415,7 +363,7 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po /* Temporarily mark in append state to enable writing */ dev->set_append(); if (!write_record_to_block(dcr->block, dcr->rec)) { - Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), strerror_dev(dev)); + Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); goto bail_out; } else { Dmsg2(30, "Wrote label of %d bytes to %s\n", dcr->rec->data_len, dev->print_name()); @@ -423,12 +371,22 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po Dmsg0(99, "Call write_block_to_dev()\n"); if (!write_block_to_dev(dcr)) { - Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), strerror_dev(dev)); + Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); goto bail_out; } + + /* Now commit block to DVD if we should write now */ + if (dev->is_dvd() && dvdnow) { + Dmsg1(150, "New VolName=%s\n", dev->VolCatInfo.VolCatName); + if (!dvd_write_part(dcr)) { + Dmsg2(30, "Bad DVD write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); + goto bail_out; + } + } + Dmsg0(99, " Wrote block to device\n"); - if (weof_dev(dev, 1) == 0) { + if (dev->weof(1)) { dev->set_labeled(); write_ansi_ibm_labels(dcr, ANSI_EOF_LABEL, dev->VolHdr.VolumeName); } @@ -436,10 +394,12 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po if (debug_level >= 20) { dump_volume_label(dev); } + new_volume(dcr, VolName); dev->clear_append(); /* remove append since this is PRE_LABEL */ return true; bail_out: + free_volume(dev); memset(&dev->VolHdr, 0, sizeof(dev->VolHdr)); dev->clear_append(); /* remove append since this is PRE_LABEL */ return false; @@ -456,13 +416,19 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) DEVICE *dev = dcr->dev; JCR *jcr = dcr->jcr; - Dmsg1(190, "set append found freshly labeled volume. dev=%x\n", dev); + if (dev->open(dcr, OPEN_READ_WRITE) < 0) { + return false; + } + Dmsg2(190, "set append found freshly labeled volume. fd=%d dev=%x\n", dev->fd, dev); dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */ dev->set_append(); if (!write_volume_label_to_block(dcr)) { Dmsg0(200, "Error from write volume label.\n"); return false; } + + dev->VolCatInfo.VolCatBytes = 0; /* reset byte count */ + /* * If we are not dealing with a streaming device, * write the block now to ensure we have write permission. @@ -470,15 +436,23 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) * We do not write the block now if this is an ANSI label. This * avoids re-writing the ANSI label, which we do not want to do. */ - if (!dev_cap(dev, CAP_STREAM)) { - if (!rewind_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s: ERR=%s\n"), - dev->print_name(), strerror_dev(dev)); + if (!dev->has_cap(CAP_STREAM)) { + if (!dev->rewind(dcr)) { + Jmsg2(jcr, M_FATAL, 0, _("Rewind error on device %s: ERR=%s\n"), + dev->print_name(), dev->print_errmsg()); + return false; } if (recycle) { - if (!truncate_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device %s: ERR=%s\n"), - dev->print_name(), strerror_dev(dev)); + if (!dev->truncate(dcr)) { + Jmsg2(jcr, M_FATAL, 0, _("Truncate error on device %s: ERR=%s\n"), + dev->print_name(), dev->print_errmsg()); + return false; + } + if (dev->open(dcr, OPEN_READ_WRITE) < 0) { + Jmsg2(jcr, M_FATAL, 0, + _("Failed to re-open DVD after truncate on device %s: ERR=%s\n"), + dev->print_name(), dev->print_errmsg()); + return false; } } @@ -489,7 +463,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) */ if (dev->label_type != B_BACULA_LABEL) { if (read_ansi_ibm_label(dcr) != VOL_OK) { - rewind_dev(dev); + dev->rewind(dcr); return false; } } else if (!write_ansi_ibm_labels(dcr, ANSI_VOL_LABEL, dev->VolHdr.VolumeName)) { @@ -497,18 +471,18 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) } /* Attempt write to check write permission */ - Dmsg0(200, "Attempt to write to device.\n"); + Dmsg1(200, "Attempt to write to device fd=%d.\n", dev->fd); if (!write_block_to_dev(dcr)) { Jmsg2(jcr, M_ERROR, 0, _("Unable to write device %s: ERR=%s\n"), - dev->print_name(), strerror_dev(dev)); + dev->print_name(), dev->print_errmsg()); Dmsg0(200, "===ERROR write block to dev\n"); return false; } } + dev->set_labeled(); /* Set or reset Volume statistics */ dev->VolCatInfo.VolCatJobs = 0; dev->VolCatInfo.VolCatFiles = 0; - dev->VolCatInfo.VolCatBytes = 1; dev->VolCatInfo.VolCatErrors = 0; dev->VolCatInfo.VolCatBlocks = 0; dev->VolCatInfo.VolCatRBytes = 0; @@ -521,7 +495,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) dev->VolCatInfo.VolCatWrites = 1; dev->VolCatInfo.VolCatReads = 1; } - Dmsg0(100, "dir_update_vol_info. Set Append\n"); + Dmsg0(150, "dir_update_vol_info. Set Append\n"); bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus)); if (!dir_update_volume_info(dcr, true)) { /* indicate doing relabel */ return false; @@ -537,7 +511,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) * End writing real Volume label (from pre-labeled tape), or recycling * the volume. */ - Dmsg0(200, "OK from rewite vol label.\n"); + Dmsg0(200, "OK from rewrite vol label.\n"); return true; } @@ -554,6 +528,7 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec) struct date_time dt; DEVICE *dev = dcr->dev; JCR *jcr = dcr->jcr; + char buf[100]; /* Serialize the label into the device record. */ @@ -596,8 +571,8 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec) 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->Stream = jcr->NumWriteVolumes; + Dmsg2(150, "Created Vol label rec: FI=%s len=%d\n", FI_to_ascii(buf, rec->FileIndex), rec->data_len); } @@ -605,7 +580,8 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec) /* * Create a volume label in memory */ -void create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName) +void create_volume_label(DEVICE *dev, const char *VolName, + const char *PoolName, bool dvdnow) { DEVRES *device = (DEVRES *)dev->device; @@ -613,11 +589,17 @@ void create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName) ASSERT(dev != NULL); + free_volume(dev); /* release any old volume */ memset(&dev->VolHdr, 0, sizeof(dev->VolHdr)); bstrncpy(dev->VolHdr.Id, BaculaId, sizeof(dev->VolHdr.Id)); dev->VolHdr.VerNum = BaculaTapeVersion; - dev->VolHdr.LabelType = PRE_LABEL; /* Mark tape as unused */ + if (dev->is_dvd() && dvdnow) { + /* We do not want to re-label a DVD so write VOL_LABEL now */ + dev->VolHdr.LabelType = VOL_LABEL; + } else { + dev->VolHdr.LabelType = PRE_LABEL; /* Mark tape as unused */ + } bstrncpy(dev->VolHdr.VolumeName, VolName, sizeof(dev->VolHdr.VolumeName)); bstrncpy(dev->VolHdr.PoolName, PoolName, sizeof(dev->VolHdr.PoolName)); bstrncpy(dev->VolHdr.MediaType, device->media_type, sizeof(dev->VolHdr.MediaType)); @@ -703,6 +685,7 @@ bool write_session_label(DCR *dcr, int label) DEVICE *dev = dcr->dev; DEV_RECORD *rec; DEV_BLOCK *block = dcr->block; + char buf1[100], buf2[100]; rec = new_record(); Dmsg1(90, "session_label record=%x\n", rec); @@ -740,7 +723,7 @@ bool write_session_label(DCR *dcr, int label) * read the next block). */ if (!can_write_record_to_block(block, rec)) { - Dmsg0(100, "Cannot write session label to block.\n"); + Dmsg0(150, "Cannot write session label to block.\n"); if (!write_block_to_device(dcr)) { Dmsg0(90, "Got session label write_block_to_dev error.\n"); /* ****FIXME***** errno is not set here */ @@ -757,15 +740,15 @@ bool write_session_label(DCR *dcr, int label) return false; } - Dmsg6(20, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d " + Dmsg6(50, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d " "remainder=%d\n", jcr->JobId, - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len, + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len, rec->remainder); free_record(rec); - Dmsg2(20, "Leave write_session_label Block=%d File=%d\n", - dev->block_num, dev->file); + Dmsg2(50, "Leave write_session_label Block=%ud File=%ud\n", + dev->get_block(), dev->get_file()); return true; } @@ -783,11 +766,12 @@ bool write_session_label(DCR *dcr, int label) bool unser_volume_label(DEVICE *dev, DEV_RECORD *rec) { ser_declare; + char buf1[100], buf2[100]; 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, rec->FileIndex), + FI_to_ascii(buf1, rec->FileIndex), + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len); if (!forge_on) { return false; @@ -826,8 +810,8 @@ bool unser_volume_label(DEVICE *dev, DEV_RECORD *rec) unser_string(dev->VolHdr.ProgDate); ser_end(rec->data, SER_LENGTH_Volume_Label); - Dmsg0(90, "ser_read_vol\n"); - if (debug_level >= 90) { + Dmsg0(190, "unser_vol_label\n"); + if (debug_level >= 190) { dump_volume_label(dev); } return true; @@ -912,11 +896,11 @@ void dump_volume_label(DEVICE *dev) goto bail_out; default: LabelType = buf; - sprintf(buf, "Unknown %d", dev->VolHdr.LabelType); + sprintf(buf, _("Unknown %d"), dev->VolHdr.LabelType); break; } - Pmsg11(-1, "\nVolume Label:\n" + Pmsg11(-1, _("\nVolume Label:\n" "Id : %s" "VerNo : %d\n" "VolName : %s\n" @@ -928,7 +912,7 @@ void dump_volume_label(DEVICE *dev) "MediaType : %s\n" "PoolType : %s\n" "HostName : %s\n" -"", +""), dev->VolHdr.Id, dev->VolHdr.VerNum, dev->VolHdr.VolumeName, dev->VolHdr.PrevVolumeName, File, LabelType, dev->VolHdr.LabelSize, @@ -938,13 +922,13 @@ void dump_volume_label(DEVICE *dev) 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); + 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); Pmsg5(-1, -"Date label written: %04d-%02d-%02d at %02d:%02d\n", +_("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); } @@ -964,28 +948,28 @@ static void dump_session_label(DEV_RECORD *rec, const char *type) unser_session_label(&label, rec); dbl = debug_level; debug_level = 1; - Pmsg7(-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.VerNum, +""), type, label.JobId, label.VerNum, label.PoolName, label.PoolType, label.JobName, label.ClientName); if (label.VerNum >= 10) { - Pmsg4(-1, "" + Pmsg4(-1, _( "Job (unique name) : %s\n" "FileSet : %s\n" "JobType : %c\n" "JobLevel : %c\n" -"", label.Job, label.FileSetName, label.JobType, label.JobLevel); +""), label.Job, label.FileSetName, label.JobType, label.JobLevel); } if (rec->FileIndex == EOS_LABEL) { - Pmsg8(-1, "" + Pmsg8(-1, _( "JobFiles : %s\n" "JobBytes : %s\n" "StartBlock : %s\n" @@ -994,7 +978,7 @@ static void dump_session_label(DEV_RECORD *rec, const char *type) "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.StartBlock, ec3), @@ -1012,8 +996,7 @@ static void dump_session_label(DEV_RECORD *rec, const char *type) 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"), + 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); } @@ -1025,6 +1008,9 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) const char *type; int dbl; + if (rec->FileIndex == 0 && rec->VolSessionId == 0 && rec->VolSessionTime == 0) { + return; + } dbl = debug_level; debug_level = 1; switch (rec->FileIndex) { @@ -1044,7 +1030,7 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) type = _("End of Media"); break; case EOT_LABEL: - type = ("End of Tape"); + type = _("End of Tape"); break; default: type = _("Unknown"); @@ -1064,33 +1050,39 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) dump_session_label(rec, type); break; case EOM_LABEL: - Pmsg5(-1, "%s Record: SessId=%d SessTime=%d JobId=%d DataLen=%d\n", - type, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); + Pmsg7(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"), + type, dev->file, dev->block_num, rec->VolSessionId, + rec->VolSessionTime, rec->Stream, rec->data_len); break; case EOT_LABEL: Pmsg0(-1, _("End of physical tape.\n")); break; default: - Pmsg5(-1, "%s Record: SessId=%d SessTime=%d JobId=%d DataLen=%d\n", - type, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); + Pmsg7(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"), + type, dev->file, dev->block_num, rec->VolSessionId, + rec->VolSessionTime, rec->Stream, rec->data_len); break; } } else { SESSION_LABEL label; + char dt[50]; switch (rec->FileIndex) { case SOS_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); + bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime)); + Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"), + type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId); + Pmsg4(-1, _(" Job=%s Date=%s Level=%c Type=%c\n"), + label.Job, dt, label.JobLevel, label.JobType); break; case EOS_LABEL: char ed1[30], ed2[30]; 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); - Pmsg4(-1, " Files=%s Bytes=%s Errors=%d Status=%c\n", + bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime)); + Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"), + type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId); + Pmsg7(-1, _(" Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"), + dt, label.JobLevel, label.JobType, edit_uint64_with_commas(label.JobFiles, ed1), edit_uint64_with_commas(label.JobBytes, ed2), label.JobErrors, (char)label.JobStatus); @@ -1099,8 +1091,9 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) 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); + Pmsg7(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"), + type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, + rec->Stream, rec->data_len); break; case EOT_LABEL: break;