X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbcopy.c;h=e99662477a21c5150850a74a87e6d1588b0cca52;hb=ada27b1a435802523f568fd94b81e393dcbabe71;hp=6df6ca48c5d7300f6e2c54e83173ab7316bb83be;hpb=c37638750b04e222c9436d70c55d28193c58a86f;p=bacula%2Fbacula diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c index 6df6ca48c5..e99662477a 100644 --- a/bacula/src/stored/bcopy.c +++ b/bacula/src/stored/bcopy.c @@ -1,23 +1,14 @@ -/* - * - * Program to copy a Bacula from one volume to another. - * - * Kern E. Sibbald, October 2002 - * - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2008 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. + License as published by the Free Software Foundation and included + 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 @@ -34,6 +25,15 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Program to copy a Bacula from one volume to another. + * + * Kern E. Sibbald, October 2002 + * + * + * Version $Id$ + */ #include "bacula.h" #include "stored.h" @@ -42,6 +42,7 @@ int generate_daemon_event(JCR *jcr, const char *event) { return 1; } /* Forward referenced functions */ +static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec); static bool record_cb(DCR *dcr, DEV_RECORD *rec); @@ -52,10 +53,11 @@ static JCR *in_jcr; /* input jcr */ static JCR *out_jcr; /* output jcr */ static BSR *bsr = NULL; static const char *wd = "/tmp"; -static int list_records = 0; +static bool list_records = false; static uint32_t records = 0; static uint32_t jobs = 0; static DEV_BLOCK *out_block; +static SESSION_LABEL sessrec; #define CONFIG_FILE "bacula-sd.conf" char *configfile = NULL; @@ -73,13 +75,14 @@ PROG_COPYRIGHT "Usage: bcopy [-d debug_level] \n" " -b bootstrap specify a bootstrap file\n" " -c specify configuration file\n" -" -d set debug level to nn\n" +" -d set debug level to \n" +" -dt print timestamp in debug output\n" " -i specify input Volume names (separated by |)\n" " -o specify output Volume names (separated by |)\n" " -p proceed inspite of errors\n" " -v verbose\n" " -w specify working directory (default /tmp)\n" -" -? print this message\n\n"), BYEAR, VERSION, BDATE); +" -? print this message\n\n"), 2002, VERSION, BDATE); exit(1); } @@ -89,6 +92,7 @@ int main (int argc, char *argv[]) char *iVolumeName = NULL; char *oVolumeName = NULL; bool ignore_label_errors = false; + bool ok; setlocale(LC_ALL, ""); bindtextdomain("bacula", LOCALEDIR); @@ -112,9 +116,14 @@ int main (int argc, char *argv[]) break; case 'd': /* debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) - debug_level = 1; + if (*optarg == 't') { + dbg_timestamp = true; + } else { + debug_level = atoi(optarg); + if (debug_level <= 0) { + debug_level = 1; + } + } break; case 'i': /* input Volume name */ @@ -186,22 +195,25 @@ int main (int argc, char *argv[]) } Dmsg0(100, "About to acquire device for writing\n"); /* For we must now acquire the device for writing */ - lock_device(out_dev); + out_dev->r_dlock(); if (out_dev->open(out_jcr->dcr, OPEN_READ_WRITE) < 0) { Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), out_dev->errmsg); - unlock_device(out_dev); + out_dev->dunlock(); exit(1); } - unlock_device(out_dev); + out_dev->dunlock(); if (!acquire_device_for_append(out_jcr->dcr)) { free_jcr(in_jcr); exit(1); } out_block = out_jcr->dcr->block; - read_records(in_jcr->dcr, record_cb, mount_next_read_volume); - if (!write_block_to_device(out_jcr->dcr)) { - Pmsg0(000, _("Write of last block failed.\n")); + ok = read_records(in_jcr->dcr, record_cb, mount_next_read_volume); + + if (ok || out_dev->can_write()) { + if (!write_block_to_device(out_jcr->dcr)) { + Pmsg0(000, _("Write of last block failed.\n")); + } } Pmsg2(000, _("%u Jobs copied. %u records copied.\n"), jobs, records); @@ -230,6 +242,7 @@ static bool record_cb(DCR *in_dcr, DEV_RECORD *rec) * */ if (rec->FileIndex < 0) { + get_session_record(in_dcr->dev, rec, &sessrec); if (verbose > 1) { dump_label_record(in_dcr->dev, rec, 1); @@ -253,6 +266,7 @@ static bool record_cb(DCR *in_dcr, DEV_RECORD *rec) out_dev->print_name(), out_dev->bstrerror()); Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"), out_dev->bstrerror()); + return false; } } if (!write_block_to_device(out_jcr->dcr)) { @@ -260,8 +274,9 @@ static bool record_cb(DCR *in_dcr, DEV_RECORD *rec) out_dev->print_name(), out_dev->bstrerror()); Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"), out_dev->bstrerror()); + return false; } - break; + return true; case EOM_LABEL: Pmsg0(000, _("EOM label not copied.\n")); return true; @@ -269,7 +284,7 @@ static bool record_cb(DCR *in_dcr, DEV_RECORD *rec) Pmsg0(000, _("EOT label not copied.\n")); return true; default: - break; + return true; } } @@ -283,23 +298,59 @@ static bool record_cb(DCR *in_dcr, DEV_RECORD *rec) out_dev->print_name(), out_dev->bstrerror()); Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"), out_dev->bstrerror()); - break; + return false; } } return true; } +static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec) +{ + const char *rtype; + memset(sessrec, 0, sizeof(sessrec)); + switch (rec->FileIndex) { + case PRE_LABEL: + rtype = _("Fresh Volume Label"); + break; + case VOL_LABEL: + rtype = _("Volume Label"); + unser_volume_label(dev, rec); + break; + case SOS_LABEL: + rtype = _("Begin Job Session"); + unser_session_label(sessrec, rec); + break; + case EOS_LABEL: + rtype = _("End Job Session"); + unser_session_label(sessrec, rec); + break; + case 0: + case EOM_LABEL: + rtype = _("End of Medium"); + break; + default: + rtype = _("Unknown"); + break; + } + Dmsg5(10, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", + rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); + if (verbose) { + Pmsg5(-1, _("%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n"), + rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); + } +} + /* Dummies to replace askdir.c */ bool dir_find_next_appendable_volume(DCR *dcr) { return 1;} -bool dir_update_volume_info(DCR *dcr, bool relabel) { return 1; } +bool dir_update_volume_info(DCR *dcr, bool relabel, bool update_LastWritten) { return 1; } bool dir_create_jobmedia_record(DCR *dcr) { return 1; } bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { return 1; } bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} bool dir_send_job_status(JCR *jcr) {return 1;} -bool dir_ask_sysop_to_mount_volume(DCR *dcr) +bool dir_ask_sysop_to_mount_volume(DCR *dcr, int /*mode*/) { DEVICE *dev = dcr->dev; fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "),