X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fmount.c;h=e41724439ede81c48aff1c42a34459948f6983de;hb=26f6b4a810469774eb17bb3efe49150ce6ac4625;hp=5d411b743e5468061f6e0568bf67269192046adf;hpb=dbd24da039d5b0577b881c06ce1bb6c68e96a0a2;p=bacula%2Fbacula diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c index 5d411b743e..e41724439e 100644 --- a/bacula/src/stored/mount.c +++ b/bacula/src/stored/mount.c @@ -30,6 +30,9 @@ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ +static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle); + + /* * If release is set, we rewind the current volume, * which we no longer want, and ask the user (console) @@ -42,11 +45,13 @@ * impossible to get the requested Volume. * */ -int mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release) +bool mount_next_write_volume(DCR *dcr, DEV_BLOCK *block, bool release) { int retry = 0; bool ask = false, recycle, autochanger; int vol_label_status; + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; Dmsg0(100, "Enter mount_next_volume()\n"); @@ -62,15 +67,15 @@ mount_next_vol: if (!dev->poll && retry++ > 4) { /* Last ditch effort before giving up, force operator to respond */ jcr->VolCatInfo.Slot = 0; - if (!dir_ask_sysop_to_mount_volume(jcr, dev)) { + if (!dir_ask_sysop_to_mount_volume(dcr)) { Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), dev_name(dev)); - return 0; + return false; } } if (job_canceled(jcr)) { Jmsg(jcr, M_FATAL, 0, _("Job %d canceled.\n"), jcr->JobId); - return 0; + return false; } recycle = false; if (release) { @@ -84,15 +89,15 @@ mount_next_vol: * in jcr->VolCatInfo */ Dmsg0(200, "Before dir_find_next_appendable_volume.\n"); - while (!dir_find_next_appendable_volume(jcr)) { + while (!dir_find_next_appendable_volume(dcr)) { Dmsg0(200, "not dir_find_next\n"); - if (!dir_ask_sysop_to_create_appendable_volume(jcr, dev)) { - return 0; + if (!dir_ask_sysop_to_create_appendable_volume(dcr)) { + return false; } Dmsg0(200, "Again dir_find_next_append...\n"); } if (job_canceled(jcr)) { - return 0; + return false; } Dmsg2(100, "After find_next_append. Vol=%s Slot=%d\n", jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot); @@ -112,7 +117,7 @@ mount_next_vol: */ dev->state &= ~(ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF); - if (autoload_device(jcr, dev, 1, NULL) > 0) { + if (autoload_device(dcr, 1, NULL) > 0) { autochanger = true; ask = false; } else { @@ -129,15 +134,19 @@ mount_next_vol: if (!release && dev_is_tape(dev) && dev_cap(dev, CAP_AUTOMOUNT)) { ask = false; /* don't ask SYSOP this time */ } + /* Don't ask if not removable */ + if (!dev_cap(dev, CAP_REM)) { + ask = false; + } Dmsg2(100, "Ask=%d autochanger=%d\n", ask, autochanger); release = true; /* release next time if we "recurse" */ - if (ask && !dir_ask_sysop_to_mount_volume(jcr, dev)) { + if (ask && !dir_ask_sysop_to_mount_volume(dcr)) { Dmsg0(100, "Error return ask_sysop ...\n"); - return 0; /* error return */ + return false; /* error return */ } if (job_canceled(jcr)) { - return 0; + return false; } Dmsg1(100, "want vol=%s\n", jcr->VolumeName); @@ -147,7 +156,7 @@ mount_next_vol: /* Ensure the device is open */ if (!open_device(jcr, dev)) { - return 0; + return false; } /* @@ -163,7 +172,7 @@ read_volume: create_volume_label(dev, jcr->VolumeName, "Default"); dev->VolHdr.LabelType = PRE_LABEL; } else { - vol_label_status = read_dev_volume_label(jcr, dev, block); + vol_label_status = read_dev_volume_label(jcr->dcr, block); } Dmsg2(100, "dirVol=%s dirStat=%s\n", jcr->VolumeName, @@ -181,6 +190,14 @@ read_volume: case VOL_NAME_ERROR: VOLUME_CAT_INFO VolCatInfo; + /* If not removable, Volume is broken */ + if (!dev_cap(dev, CAP_REM)) { + Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"), + jcr->VolumeName, dev_name(dev)); + mark_volume_in_error(jcr, dev); + goto mount_next_vol; + } + Dmsg1(100, "Vol NAME Error Name=%s\n", jcr->VolumeName); /* If polling and got a previous bad name, ignore it */ if (dev->poll && strcmp(dev->BadVolName, dev->VolHdr.VolName) == 0) { @@ -198,7 +215,7 @@ read_volume: memcpy(&VolCatInfo, &jcr->VolCatInfo, sizeof(VolCatInfo)); /* Check if this is a valid Volume in the pool */ pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName); - if (!dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) { + if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) { bstrncpy(dev->BadVolName, dev->VolHdr.VolName, sizeof(dev->BadVolName)); Jmsg(jcr, M_WARNING, 0, _("Director wanted Volume \"%s\".\n" " Current Volume \"%s\" not acceptable because:\n" @@ -234,7 +251,8 @@ read_volume: (!dev_is_tape(dev) && strcmp(jcr->VolCatInfo.VolCatStatus, "Recycle") == 0))) { Dmsg0(100, "Create volume label\n"); - if (!write_volume_label_to_dev(jcr, (DEVRES *)dev->device, jcr->VolumeName, + /* Create a new Volume label and write it to the device */ + if (!write_new_volume_label_to_dev(jcr->dcr, jcr->VolumeName, jcr->pool_name)) { Dmsg0(100, "!write_vol_label\n"); goto mount_next_vol; @@ -242,11 +260,18 @@ read_volume: Dmsg0(100, "dir_update_vol_info. Set Append\n"); /* Copy Director's info into the device info */ memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo)); - dir_update_volume_info(jcr, dev, 1); /* indicate tape labeled */ + dir_update_volume_info(dcr, true); /* indicate tape labeled */ Jmsg(jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"), jcr->VolumeName, dev_name(dev)); goto read_volume; /* read label we just wrote */ } + /* If not removable, Volume is broken */ + if (!dev_cap(dev, CAP_REM)) { + Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"), + jcr->VolumeName, dev_name(dev)); + mark_volume_in_error(jcr, dev); + goto mount_next_vol; + } /* NOTE! Fall-through wanted. */ case VOL_NO_MEDIA: default: @@ -274,63 +299,9 @@ read_volume: * If the tape is marked as Recycle, we rewrite the label. */ if (dev->VolHdr.LabelType == PRE_LABEL || recycle) { - Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev); - dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */ - write_volume_label_to_block(jcr, dev, block); - /* - * If we are not dealing with a streaming device, - * write the block now to ensure we have write permission. - * It is better to find out now rather than later. - */ - if (!dev_cap(dev, CAP_STREAM)) { - if (!rewind_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device \"%s\". ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } - if (recycle) { - if (!truncate_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device \"%s\". ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } - } - /* Attempt write to check write permission */ - if (!write_block_to_dev(jcr->dcr, block)) { - Jmsg2(jcr, M_ERROR, 0, _("Unable to write device \"%s\". ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - goto mount_next_vol; - } - } - /* 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; - if (recycle) { - dev->VolCatInfo.VolCatMounts++; - dev->VolCatInfo.VolCatRecycles++; - } else { - dev->VolCatInfo.VolCatMounts = 1; - dev->VolCatInfo.VolCatRecycles = 0; - dev->VolCatInfo.VolCatWrites = 1; - dev->VolCatInfo.VolCatReads = 1; - } - Dmsg0(100, "dir_update_vol_info. Set Append\n"); - bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus)); - dir_update_volume_info(jcr, dev, 1); /* indicate doing relabel */ - if (recycle) { - Jmsg(jcr, M_INFO, 0, _("Recycled volume \"%s\" on device \"%s\", all previous data lost.\n"), - jcr->VolumeName, dev_name(dev)); - } else { - Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume \"%s\" on device \"%s\"\n"), - jcr->VolumeName, dev_name(dev)); + if (!rewrite_volume_label(jcr->dcr, block, recycle)) { + goto mount_next_vol; } - /* - * End writing real Volume label (from pre-labeled tape), or recycling - * the volume. - */ - } else { /* * OK, at this point, we have a valid Bacula label, but @@ -365,15 +336,87 @@ The number of files mismatch! Volume=%u Catalog=%u\n"), } dev->VolCatInfo.VolCatMounts++; /* Update mounts */ Dmsg1(100, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts); - dir_update_volume_info(jcr, dev, 0); + dir_update_volume_info(dcr, false); /* Return an empty block */ empty_block(block); /* we used it for reading so set for write */ } dev->state |= ST_APPEND; Dmsg0(100, "Normal return from read_dev_for_append\n"); - return 1; + return true; +} + +/* + * Write a volume label. + * Returns: true if OK + * false if unable to write it + */ +static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle) +{ + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; + + Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev); + dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */ + if (!write_volume_label_to_block(dcr, block)) { + return false; + } + /* + * If we are not dealing with a streaming device, + * write the block now to ensure we have write permission. + * It is better to find out now rather than later. + */ + if (!dev_cap(dev, CAP_STREAM)) { + if (!rewind_dev(dev)) { + Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device \"%s\". ERR=%s\n"), + dev_name(dev), strerror_dev(dev)); + } + if (recycle) { + if (!truncate_dev(dev)) { + Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device \"%s\". ERR=%s\n"), + dev_name(dev), strerror_dev(dev)); + } + } + /* Attempt write to check write permission */ + if (!write_block_to_dev(dcr, block)) { + Jmsg2(jcr, M_ERROR, 0, _("Unable to write device \"%s\". ERR=%s\n"), + dev_name(dev), strerror_dev(dev)); + return false; + } + } + /* 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; + if (recycle) { + dev->VolCatInfo.VolCatMounts++; + dev->VolCatInfo.VolCatRecycles++; + } else { + dev->VolCatInfo.VolCatMounts = 1; + dev->VolCatInfo.VolCatRecycles = 0; + dev->VolCatInfo.VolCatWrites = 1; + dev->VolCatInfo.VolCatReads = 1; + } + Dmsg0(100, "dir_update_vol_info. Set Append\n"); + bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus)); + dir_update_volume_info(dcr, true); /* indicate doing relabel */ + if (recycle) { + Jmsg(jcr, M_INFO, 0, _("Recycled volume \"%s\" on device \"%s\", all previous data lost.\n"), + jcr->VolumeName, dev_name(dev)); + } else { + Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume \"%s\" on device \"%s\"\n"), + jcr->VolumeName, dev_name(dev)); + } + /* + * End writing real Volume label (from pre-labeled tape), or recycling + * the volume. + */ + return true; } + /* * Mark volume in error in catalog */ @@ -383,14 +426,14 @@ void mark_volume_in_error(JCR *jcr, DEVICE *dev) jcr->VolumeName); bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus)); Dmsg0(100, "dir_update_vol_info. Set Error.\n"); - dir_update_volume_info(jcr, dev, 0); + dir_update_volume_info(jcr->dcr, false); } /* * If we are reading, we come here at the end of the tape * and see if there are more volumes to be mounted. */ -int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) +bool mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) { Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume); /* @@ -402,12 +445,12 @@ int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) if (!acquire_device_for_read(jcr)) { Jmsg2(jcr, M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), jcr->VolumeName); - return 0; + return false; } - return 1; /* next volume mounted */ + return true; /* next volume mounted */ } Dmsg0(90, "End of Device reached.\n"); - return 0; + return false; } /*