*
*/
/*
- 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
int quit = 0;
char buf[100000];
int bsize = TAPE_BSIZE;
-char VolName[100];
+char VolName[MAX_NAME_LENGTH];
DEVICE *dev = NULL;
DEVRES *device = NULL;
static void rewindcmd();
static void clearcmd();
static void wrcmd();
+static void rrcmd();
static void eodcmd();
static void fillcmd();
+static void qfillcmd();
+static void statcmd();
static void unfillcmd();
static int flush_block(DEV_BLOCK *block, int dump);
static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
static int my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+static void scan_blocks();
+static void set_volume_name(char *VolName, int volnum);
+static void rawfill_cmd();
/* Static variables */
static uint64_t VolBytes;
static time_t now;
static double kbs;
-static long file_index;
-static int verbose = 0;
+static int32_t file_index;
static int end_of_tape = 0;
static uint32_t LastBlock = 0;
static uint32_t eot_block;
static uint32_t eot_block_len;
static uint32_t eot_FileIndex;
static int dumped = 0;
+static DEV_BLOCK *last_block = NULL;
+static DEV_BLOCK *this_block = NULL;
+static uint32_t last_file = 0;
+static uint32_t last_block_num = 0;
+static uint32_t BlockNumber = 0;
+static int simple = FALSE;
static char *VolumeName = NULL;
+static int vol_num;
static JCR *jcr = NULL;
int get_cmd(char *prompt);
-int write_dev(DEVICE *dev, char *buf, size_t len)
-{
- Emsg0(M_ABORT, 0, "write_dev not implemented.\n");
- return 0;
-}
-
-int read_dev(DEVICE *dev, char *buf, size_t len)
-{
- Emsg0(M_ABORT, 0, "read_dev not implemented.\n");
- return 0;
-}
-
-
/*********************************************************************
*
* Main Bacula Pool Creation Program
exit(1);
}
- jcr = setup_jcr("btape", argv[0], bsr);
+ jcr = setup_jcr("btape", argv[0], bsr, NULL);
dev = setup_to_access_device(jcr, 0); /* acquire for write */
if (!dev) {
exit(1);
free_bsr(bsr);
}
+ if (last_block) {
+ free_block(last_block);
+ }
+ if (this_block) {
+ free_block(this_block);
+ }
+
term_msg();
close_memory_pool(); /* free memory in pool */
static void eomcmd()
{
if (!eod_dev(dev)) {
- Pmsg1(0, _("Bad status from eod. ERR=%s\n"), strerror_dev(dev));
+ Pmsg1(0, _("Bad status from MTEOD. ERR=%s\n"), strerror_dev(dev));
return;
} else {
- Pmsg0(0, _("Moved to end of media\n"));
+ Pmsg0(0, _("Moved to end of medium.\n"));
}
}
/*
- * Go to the end of the media (either hardware determined
+ * Go to the end of the medium (either hardware determined
* or defined by two eofs.
*/
static void eodcmd()
printf("%sSHORT ", dev->state & ST_SHORT ? "" : "!");
printf("\n");
+ printf(_("Device parameters:\n"));
+ printf("Device name: %s\n", dev->dev_name);
+ printf("File=%u block=%u\n", dev->file, dev->block_num);
+ printf("Min block=%u Max block=%u\n", dev->min_block_size, dev->max_block_size);
+
+ printf("Status:\n");
+ statcmd();
+
}
/*
DEV_RECORD *rec;
int i, blkno = 0;
- Pmsg0(0, "Test writting larger and larger records.\n\
-This is a torture test for records.\nI am going to write\n\
-larger and larger records. It will stop when the record size\n\
-plus the header exceeds the block size (by default about 64K\n");
+ Pmsg0(0, "Test writting larger and larger records.\n"
+"This is a torture test for records.\nI am going to write\n"
+"larger and larger records. It will stop when the record size\n"
+"plus the header exceeds the block size (by default about 64K)\n");
get_cmd("Do you want to continue? (y/n): ");
sm_check(__FILE__, __LINE__, False);
}
-/*
- * This is a general test of Bacula's functions
- * needed to read and write the tape.
+/*
+ * This test attempts to re-read a block written by Bacula
+ * normally at the end of the tape. Bacula will then back up
+ * over the two eof marks, backup over the record and reread
+ * it to make sure it is valid. Bacula can skip this validation
+ * if you set "Backward space record = no"
*/
-static void testcmd()
+static int re_read_block_test()
{
DEV_BLOCK *block;
DEV_RECORD *rec;
+ int stat = 0;
int len;
- Pmsg0(0, "\nWrite, backup, and re-read test.\n\n"
-"I'm going to write three records and two eof's\n"
-"then backup over the eof's and re-read the last record.\n\n");
+ if (!(dev->capabilities & CAP_BSR)) {
+ Pmsg0(-1, _("Skipping read backwards test because BSR turned off.\n"));
+ return 0;
+ }
+
+ Pmsg0(-1, _("\n=== Write, backup, and re-read test ===\n\n"
+ "I'm going to write three records and two eof's\n"
+ "then backup over the eof's and re-read the last record.\n"
+ "Bacula does this after writing the last block on the\n"
+ "tape to verify that the block was written correctly.\n"
+ "It is not an *essential* feature ...\n\n"));
rewindcmd();
block = new_block(dev);
rec = new_record();
len = rec->data_len = block->buf_len-100;
memset(rec->data, 1, rec->data_len);
if (!write_record_to_block(block, rec)) {
- Pmsg0(0, "Error writing record to block.\n");
+ Pmsg0(0, _("Error writing record to block.\n"));
goto bail_out;
}
if (!write_block_to_dev(jcr, dev, block)) {
- Pmsg0(0, "Error writing block to device.\n");
+ Pmsg0(0, _("Error writing block to device.\n"));
goto bail_out;
} else {
- Pmsg1(0, "Wrote one record of %d bytes.\n", rec->data_len);
+ Pmsg1(0, _("Wrote first record of %d bytes.\n"), rec->data_len);
}
memset(rec->data, 2, rec->data_len);
if (!write_record_to_block(block, rec)) {
- Pmsg0(0, "Error writing record to block.\n");
+ Pmsg0(0, _("Error writing record to block.\n"));
goto bail_out;
}
if (!write_block_to_dev(jcr, dev, block)) {
- Pmsg0(0, "Error writing block to device.\n");
+ Pmsg0(0, _("Error writing block to device.\n"));
goto bail_out;
} else {
- Pmsg1(0, "Wrote one record of %d bytes.\n", rec->data_len);
+ Pmsg1(0, _("Wrote second record of %d bytes.\n"), rec->data_len);
}
memset(rec->data, 3, rec->data_len);
if (!write_record_to_block(block, rec)) {
- Pmsg0(0, "Error writing record to block.\n");
+ Pmsg0(0, _("Error writing record to block.\n"));
goto bail_out;
}
if (!write_block_to_dev(jcr, dev, block)) {
- Pmsg0(0, "Error writing block to device.\n");
+ Pmsg0(0, _("Error writing block to device.\n"));
goto bail_out;
} else {
- Pmsg1(0, "Wrote one record of %d bytes.\n", rec->data_len);
+ Pmsg1(0, _("Wrote third record of %d bytes.\n"), rec->data_len);
}
weofcmd();
weofcmd();
if (bsf_dev(dev, 1) != 0) {
- Pmsg1(0, "Back space file failed! ERR=%s\n", strerror(dev->dev_errno));
+ Pmsg1(0, _("Back space file failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
if (bsf_dev(dev, 1) != 0) {
- Pmsg1(0, "Back space file failed! ERR=%s\n", strerror(dev->dev_errno));
+ Pmsg1(0, _("Back space file failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
Pmsg0(0, "Backspaced over two EOFs OK.\n");
if (bsr_dev(dev, 1) != 0) {
- Pmsg1(0, "Back space record failed! ERR=%s\n", strerror(dev->dev_errno));
+ Pmsg1(0, _("Back space record failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
Pmsg0(0, "Backspace record OK.\n");
- if (!read_block_from_dev(dev, block)) {
- Pmsg1(0, "Read block failed! ERR=%s\n", strerror(dev->dev_errno));
+ if (!read_block_from_dev(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
+ Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
memset(rec->data, 0, rec->data_len);
if (!read_record_from_block(block, rec)) {
- Pmsg1(0, "Read block failed! ERR=%s\n", strerror(dev->dev_errno));
+ Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
for (int i=0; i<len; i++) {
if (rec->data[i] != 3) {
- Pmsg0(0, "Bad data in record. Test failed!\n");
+ Pmsg0(0, _("Bad data in record. Test failed!\n"));
goto bail_out;
}
}
- Pmsg0(0, "Test succeeded!\n\n");
+ Pmsg0(0, _("\nBlock re-read correct. Test succeeded!\n"));
+ Pmsg0(-1, _("=== End Write, backup, and re-read test ===\n\n"));
+
+ stat = 1;
+bail_out:
+ free_block(block);
+ free_record(rec);
+ if (stat == 0) {
+ Pmsg0(0, _("This is not terribly serious since Bacula only uses\n"
+ "this function to verify the last block written to the\n"
+ "tape. Bacula will skip the last block verification\n"
+ "if you add:\n\n"
+ "Backward Space Record = No\n\n"
+ "to your Storage daemon's Device resource definition.\n"));
+ }
+ return stat;
+}
- Pmsg0(0, "\nAppend files test.\n\n"
+/*
+ * This test writes some records, then writes an end of file,
+ * rewinds the tape, moves to the end of the data and attepts
+ * to append to the tape. This function is essential for
+ * Bacula to be able to write multiple jobs to the tape.
+ */
+static int append_test()
+{
+ Pmsg0(-1, _("\n\n=== Append files test ===\n\n"
+ "This test is essential to Bacula.\n\n"
"I'm going to write one record in file 0,\n"
" two records in file 1,\n"
-" and three records in file 2\n\n");
+" and three records in file 2\n\n"));
rewindcmd();
wrcmd();
weofcmd(); /* end file 0 */
wrcmd();
wrcmd();
weofcmd(); /* end file 2 */
-// weofcmd();
rewindcmd();
- Pmsg0(0, "Now moving to end of media.\n");
+ Pmsg0(0, _("Now moving to end of medium.\n"));
eodcmd();
- Pmsg2(0, "End Append files test.\n\
-We should be in file 3. I am at file %d. This is %s\n\n",
+ Pmsg2(-1, _("We should be in file 3. I am at file %d. This is %s\n"),
dev->file, dev->file == 3 ? "correct!" : "NOT correct!!!!");
- Pmsg0(0, "\nNow I am going to attempt to append to the tape.\n");
+ if (dev->file != 3) {
+ return -1;
+ }
+
+ Pmsg0(-1, _("\nNow the important part, I am going to attempt to append to the tape.\n\n"));
wrcmd();
weofcmd();
-// weofcmd();
- rewindcmd();
- Pmsg0(0, "Done writing, scanning results ...\n\n");
- scancmd();
- Pmsg0(0, "End Append to the tape test.\n\
-The above scan should have four files of:\n\
-One record, two records, three records, and one record \n\
-respectively each with 64,512 bytes.\n\n");
-
-
- Pmsg0(0, "Append block test.\n\
-I'm going to write a block, an EOF, rewind, go to EOM,\n\
-then backspace over the EOF and attempt to append a second\n\
-block in the first file.\n\n");
- rewindcmd();
- wrcmd();
- weofcmd();
-// weofcmd();
rewindcmd();
- eodcmd();
- Pmsg2(0, "We should be at file 1. I am at EOM File=%d. This is %s\n",
- dev->file, dev->file == 1 ? "correct!" : "NOT correct!!!!");
- Pmsg0(0, "Doing backspace file.\n");
- bsfcmd();
- Pmsg0(0, "Write second block, hoping to append to first file.\n");
- wrcmd();
- weofcmd();
- rewindcmd();
- Pmsg0(0, "Done writing, scanning results ...\n\n");
- scancmd();
- Pmsg0(0, "The above should have one file of two blocks 64,512 bytes each.\n");
-bail_out:
- free_record(rec);
- free_block(block);
-}
+ Pmsg0(-1, _("Done appending, there should be no I/O errors\n\n"));
+ Pmsg0(-1, "Doing Bacula scan of blocks:\n");
+ scan_blocks();
+ Pmsg0(-1, _("End scanning the tape.\n"));
+ Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"),
+ dev->file, dev->file == 4 ? "correct!" : "NOT correct!!!!");
+ if (dev->file != 4) {
+ return -2;
+ }
-static void fsfcmd()
+ return 1;
+}
+
+/*
+ * This is a general test of Bacula's functions
+ * needed to read and write the tape.
+ */
+static void testcmd()
{
int stat;
- if ((stat=fsf_dev(dev, 1)) < 0) {
- Pmsg2(0, "Bad status from fsf %d. ERR=%s\n", stat, strerror_dev(dev));
+ stat = append_test();
+ if (stat == 1) { /* OK get out */
+ goto all_done;
+ }
+ if (stat == -1) { /* first test failed */
+ if (dev_cap(dev, CAP_EOM)) {
+ Pmsg0(-1, "\nAppend test failed. Attempting again.\n"
+ "Setting \"Hardware End of Medium = no\" and retrying append test.\n\n");
+ dev->capabilities &= ~CAP_EOM; /* turn off eom */
+ stat = append_test();
+ if (stat == 1) {
+ Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n"
+ " Hardware End of Medium = No\n\n"
+ "to your Device resource in the Storage conf file.\n");
+ goto all_done;
+ }
+ if (stat == -1) {
+ Pmsg0(-1, "\n\nThat appears not to have corrected the problem.\n");
+ goto all_done;
+ }
+ /* Wrong count after append */
+ if (stat == -2) {
+ Pmsg0(-1, "\n\nIt looks like the append failed. Attempting again.\n"
+ "Setting \"BSF at EOM = yes\" and retrying append test.\n");
+ dev->capabilities |= CAP_BSFATEOM; /* backspace on eom */
+ stat = append_test();
+ if (stat == 1) {
+ Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n"
+ " Hardware End of Medium = No\n"
+ " BSR at EOM = yes\n\n"
+ "to your Device resource in the Storage conf file.\n");
+ goto all_done;
+ }
+ }
+
+ Pmsg0(-1, "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+ "Unable to correct the problem. You MUST fix this\n"
+ "problem before Bacula can use your tape drive correctly\n");
+ Pmsg0(-1, "\nPerhaps running Bacula in fixed block mode will work.\n"
+ "Do so by setting:\n\n"
+ "Minimum Block Size = nnn\n"
+ "Maximum Block Size = nnn\n\n"
+ "in your Storage daemon's Device definition.\n"
+ "nnn must match your tape driver's block size.\n"
+ "This, however, is not really an ideal solution.\n");
+ }
+ }
+
+all_done:
+ Pmsg0(-1, _("\nThe above Bacula scan should have output identical to what follows.\n"
+ "Please double check it ...\n"
+ "=== Sample correct output ===\n"
+ "1 block of 64448 bytes in file 1\n"
+ "End of File mark.\n"
+ "2 blocks of 64448 bytes in file 2\n"
+ "End of File mark.\n"
+ "3 blocks of 64448 bytes in file 3\n"
+ "End of File mark.\n"
+ "1 block of 64448 bytes in file 4\n"
+ "End of File mark.\n"
+ "Total files=4, blocks=7, bytes = 451136\n"
+ "=== End sample correct output ===\n\n"));
+
+ Pmsg0(-1, _("If the above scan output is not identical to the\n"
+ "sample output, you MUST correct the problem\n"
+ "or Bacula will not be able to write multiple Jobs to \n"
+ "the tape.\n\n"));
+
+ if (stat == 1) {
+ re_read_block_test();
+ }
+
+ Pmsg0(-1, _("\n=== End Append files test ===\n"));
+
+}
+
+/* Forward space a file */
+static void fsfcmd()
+{
+ if (!fsf_dev(dev, 1)) {
+ Pmsg1(0, "Bad status from fsf. ERR=%s\n", strerror_dev(dev));
return;
}
Pmsg0(0, "Forward spaced one file.\n");
}
+/* Forward space a record */
static void fsrcmd()
{
int stat;
Pmsg0(0, "Forward spaced one record.\n");
}
-static void rdcmd()
-{
-#ifdef xxxxx
- int stat;
-
- if (!read_dev(dev, buf, 512*126)) {
- Pmsg1(0, "Bad status from read. ERR=%s\n", strerror_dev(dev));
- return;
- }
- Pmsg1(10, "Read %d bytes\n", stat);
-#else
- printf("Rdcmd no longer implemented.\n");
-#endif
-}
-
+/*
+ * Write a Bacula block to the tape
+ */
static void wrcmd()
{
DEV_BLOCK *block;
rec->data_len = i;
sm_check(__FILE__, __LINE__, False);
if (!write_record_to_block(block, rec)) {
- Pmsg0(0, "Error writing record to block.\n");
+ Pmsg0(0, _("Error writing record to block.\n"));
goto bail_out;
}
if (!write_block_to_dev(jcr, dev, block)) {
- Pmsg0(0, "Error writing block to device.\n");
+ Pmsg0(0, _("Error writing block to device.\n"));
goto bail_out;
} else {
- Pmsg1(0, "Wrote one record of %d bytes.\n",
- ((i+TAPE_BSIZE-1)/TAPE_BSIZE) * TAPE_BSIZE);
+ Pmsg1(0, _("Wrote one record of %d bytes.\n"), i);
}
- Pmsg0(0, "Wrote block to device.\n");
+ Pmsg0(0, _("Wrote block to device.\n"));
bail_out:
sm_check(__FILE__, __LINE__, False);
sm_check(__FILE__, __LINE__, False);
}
+/*
+ * Read a record from the tape
+ */
+static void rrcmd()
+{
+ char *buf;
+ int stat, len;
+
+ if (!get_cmd("Enter length to read: ")) {
+ return;
+ }
+ len = atoi(cmd);
+ if (len < 0 || len > 1000000) {
+ Pmsg0(0, _("Bad length entered, using default of 1024 bytes.\n"));
+ len = 1024;
+ }
+ buf = (char *)malloc(len);
+ stat = read(dev->fd, buf, len);
+ if (stat > 0 && stat <= len) {
+ errno = 0;
+ }
+ Pmsg3(0, _("Read of %d bytes gives stat=%d. ERR=%s\n"),
+ len, stat, strerror(errno));
+ free(buf);
+}
+
/*
* Scan tape by reading block by block. Report what is
- * on the tape.
+ * on the tape. Note, this command does raw reads, and as such
+ * will not work with fixed block size devices.
*/
static void scancmd()
{
int blocks, tot_blocks, tot_files;
int block_size;
uint64_t bytes;
+ char ec1[50];
blocks = block_size = tot_blocks = 0;
}
update_pos_dev(dev);
tot_files = dev->file;
+ Pmsg1(0, _("Starting scan at file %u\n"), dev->file);
for (;;) {
if ((stat = read(dev->fd, buf, sizeof(buf))) < 0) {
clrerror_dev(dev, -1);
}
update_pos_dev(dev);
tot_files = dev->file - tot_files;
- printf("Total files=%d, blocks=%d, bytes = %" lld "\n", tot_files, tot_blocks, bytes);
+ printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+ edit_uint64_with_commas(bytes, ec1));
+}
+
+
+/*
+ * Scan tape by reading Bacula block by block. Report what is
+ * on the tape. This function reads Bacula blocks, so if your
+ * Device resource is correctly defined, it should work with
+ * either variable or fixed block sizes.
+ */
+static void scan_blocks()
+{
+ int blocks, tot_blocks, tot_files;
+ uint32_t block_size;
+ uint64_t bytes;
+ DEV_BLOCK *block;
+ char ec1[50];
+
+ block = new_block(dev);
+ blocks = block_size = tot_blocks = 0;
+ bytes = 0;
+
+ update_pos_dev(dev);
+ tot_files = dev->file;
+ for (;;) {
+ if (!read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
+ Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev));
+ if (dev->state & ST_EOT) {
+ if (blocks > 0) {
+ printf("%d block%s of %d bytes in file %d\n",
+ blocks, blocks>1?"s":"", block_size, dev->file);
+ blocks = 0;
+ }
+ goto bail_out;
+ }
+ if (dev->state & ST_EOF) {
+ if (blocks > 0) {
+ printf("%d block%s of %d bytes in file %d\n",
+ blocks, blocks>1?"s":"", block_size, dev->file);
+ blocks = 0;
+ }
+ printf(_("End of File mark.\n"));
+ continue;
+ }
+ if (dev->state & ST_SHORT) {
+ if (blocks > 0) {
+ printf("%d block%s of %d bytes in file %d\n",
+ blocks, blocks>1?"s":"", block_size, dev->file);
+ blocks = 0;
+ }
+ printf(_("Short block read.\n"));
+ continue;
+ }
+ printf(_("Error reading block. ERR=%s\n"), strerror_dev(dev));
+ goto bail_out;
+ }
+ if (block->block_len != block_size) {
+ if (blocks > 0) {
+ printf("%d block%s of %d bytes in file %d\n",
+ blocks, blocks>1?"s":"", block_size, dev->file);
+ blocks = 0;
+ }
+ block_size = block->block_len;
+ }
+ blocks++;
+ tot_blocks++;
+ bytes += block->block_len;
+ Dmsg5(100, "Blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n",
+ block->BlockNumber, block->block_len, block->BlockVer,
+ block->VolSessionId, block->VolSessionTime);
+ if (verbose == 1) {
+ DEV_RECORD *rec = new_record();
+ read_record_from_block(block, rec);
+ Pmsg7(-1, "Block: %u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n",
+ block->BlockNumber, block->block_len,
+ FI_to_ascii(rec->FileIndex), rec->VolSessionId, rec->VolSessionTime,
+ stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len);
+ rec->remainder = 0;
+ free_record(rec);
+ } else if (verbose > 1) {
+ dump_block(block, "");
+ }
+
+ }
+bail_out:
+ free_block(block);
+ tot_files = dev->file - tot_files;
+ printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+ edit_uint64_with_commas(bytes, ec1));
}
+
static void statcmd()
{
int stat = 0;
DEV_RECORD rec;
DEV_BLOCK *block;
char ec1[50];
- char *p;
ok = TRUE;
- stop = FALSE;
+ stop = 0;
+ vol_num = 0;
- Pmsg0(000, "\n\
+ Pmsg0(-1, "\n\
This command simulates Bacula writing to a tape.\n\
-It command requires two blank tapes, which it\n\
+It requires either one or two blank tapes, which it\n\
will label and write. It will print a status approximately\n\
-every 322 MB, and write an EOF every 3.2 GB. When the first tape\n\
-fills, it will ask for a second, and after writing a few \n\
+every 322 MB, and write an EOF every 3.2 GB. If you have\n\
+selected the simple test option, after writing the first tape\n\
+it will rewind it and re-read the last block written.\n\
+If you have selected the multiple tape test, when the first tape\n\
+fills, it will ask for a second, and after writing a few more \n\
blocks, it will stop. Then it will begin re-reading the\n\
-This may take a long time. I.e. hours! ...\n\n");
-
- get_cmd("Insert a blank tape then answer. Do you wish to continue? (y/n): ");
- if (cmd[0] != 'y') {
+two tapes.\n\n\
+This may take a long time -- hours! ...\n\n");
+
+ get_cmd("Insert a blank tape then indicate if you want\n"
+ "to run the simplified test (s) with one tape or\n"
+ "the complete multiple tape (m) test: (s/m) ");
+ if (cmd[0] == 's') {
+ Pmsg0(-1, "Simple test (single tape) selected.\n");
+ simple = TRUE;
+ } else if (cmd[0] == 'm') {
+ Pmsg0(-1, "Complete multiple tape test selected.\n");
+ simple = FALSE;
+ } else {
Pmsg0(000, "Command aborted.\n");
return;
}
- VolumeName = "TestVolume1";
+ set_volume_name("TestVolume1", 1);
labelcmd();
VolumeName = NULL;
* subroutine.
*/
Dmsg0(100, "just before acquire_device\n");
- if (!acquire_device_for_append(jcr, dev, block)) {
- jcr->JobStatus = JS_Cancelled;
+ if (!(dev=acquire_device_for_append(jcr, dev, block))) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
free_block(block);
return;
}
* Write Begin Session Record
*/
if (!write_session_label(jcr, block, SOS_LABEL)) {
- jcr->JobStatus = JS_Cancelled;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
strerror_dev(dev));
ok = FALSE;
}
+ Pmsg0(-1, "Wrote Start Of Session label.\n");
memset(&rec, 0, sizeof(rec));
rec.data = get_memory(100000); /* max record size */
- /*
- * Fill write buffer with random data
- */
+
#define REC_SIZE 32768
- p = rec.data;
- for (int i=0; i < REC_SIZE; ) {
- makeSessionKey(p, NULL, 0);
- p += 16;
- i += 16;
- }
rec.data_len = REC_SIZE;
/*
- * Get Data from File daemon, write to device
+ * Generate data as if from File daemon, write to device
*/
- jcr->VolFirstFile = 0;
+ jcr->VolFirstIndex = 0;
time(&jcr->run_time); /* start counting time for rates */
- for (file_index = 0; ok && !job_cancelled(jcr); ) {
- uint64_t *lp;
+ Pmsg0(-1, "Begin writing records to first tape ...\n");
+ for (file_index = 0; ok && !job_canceled(jcr); ) {
rec.VolSessionId = jcr->VolSessionId;
rec.VolSessionTime = jcr->VolSessionTime;
rec.FileIndex = ++file_index;
rec.Stream = STREAM_FILE_DATA;
- /* Write file_index at beginning of buffer */
- lp = (uint64_t *)rec.data;
- *lp = (uint64_t)file_index;
+
+ /*
+ * Fill the buffer with the file_index negated. Negation ensures that
+ * more bits are turned on.
+ */
+ uint64_t *lp = (uint64_t *)rec.data;
+ for (uint32_t i=0; i < (rec.data_len-sizeof(uint64_t))/sizeof(uint64_t); i++) {
+ *lp++ = ~file_index;
+ }
Dmsg4(250, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream, rec.FileIndex),
rec.data_len);
- if (!write_record_to_block(block, &rec)) {
+ while (!write_record_to_block(block, &rec)) {
+ /*
+ * When we get here we have just filled a block
+ */
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
rec.remainder);
if (now <= 0) {
now = 1;
}
- kbs = (double)dev->VolCatInfo.VolCatBytes / (1000 * now);
- Pmsg3(000, "Wrote block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now);
+ Pmsg3(-1, "Wrote block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs);
}
- /* Every 50000 blocks (approx 3.2MB) write an eof.
+ /* Every 15000 blocks (approx 1GB) write an EOF.
*/
- if ((block->BlockNumber % 50000) == 0) {
- Pmsg0(000, "Flush block, write EOF\n");
+ if ((block->BlockNumber % 15000) == 0) {
+ Pmsg0(-1, "Flush block, write EOF\n");
flush_block(block, 0);
weof_dev(dev, 1);
- /* The weof resets the block number */
}
- if (block->BlockNumber > 10 && stop) { /* get out */
- break;
+ /* Get out after writing 10 blocks to the second tape */
+ if (++BlockNumber > 10 && stop != 0) { /* get out */
+ break;
}
}
if (!ok) {
- Pmsg0(000, "Not OK\n");
+ Pmsg0(000, _("Not OK\n"));
break;
}
jcr->JobBytes += rec.data_len; /* increment bytes this job */
Dmsg4(190, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
FI_to_ascii(rec.FileIndex), rec.VolSessionId,
stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len);
+
+ /* Get out after writing 10 blocks to the second tape */
+ if (BlockNumber > 10 && stop != 0) { /* get out */
+ Pmsg0(-1, "Done writing ...\n");
+ break;
+ }
}
- Dmsg0(000, "Write_end_session_label()\n");
- /* Create Job status for end of session label */
- if (!job_cancelled(jcr) && ok) {
- jcr->JobStatus = JS_Terminated;
- } else if (!ok) {
- jcr->JobStatus = JS_ErrorTerminated;
- }
- if (!write_session_label(jcr, block, EOS_LABEL)) {
- Pmsg1(000, _("Error writting end session label. ERR=%s\n"), strerror_dev(dev));
- ok = FALSE;
- }
- /* Write out final block of this session */
- if (!write_block_to_device(jcr, dev, block)) {
- Pmsg0(000, "Set ok=FALSE after write_block_to_device.\n");
- ok = FALSE;
+ if (stop > 0) {
+ Dmsg0(100, "Write_end_session_label()\n");
+ /* Create Job status for end of session label */
+ if (!job_canceled(jcr) && ok) {
+ set_jcr_job_status(jcr, JS_Terminated);
+ } else if (!ok) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ }
+ if (!write_session_label(jcr, block, EOS_LABEL)) {
+ Pmsg1(000, _("Error writting end session label. ERR=%s\n"), strerror_dev(dev));
+ ok = FALSE;
+ }
+ /* Write out final block of this session */
+ if (!write_block_to_device(jcr, dev, block)) {
+ Pmsg0(-1, _("Set ok=FALSE after write_block_to_device.\n"));
+ ok = FALSE;
+ }
+ Pmsg0(-1, "Wrote End Of Session label.\n");
}
/* Release the device */
if (!release_device(jcr, dev)) {
- Pmsg0(000, "Error in release_device\n");
+ Pmsg0(-1, _("Error in release_device\n"));
ok = FALSE;
}
free_block(block);
free_memory(rec.data);
- Pmsg0(000, "Done with fill command. Now beginning re-read of tapes...\n");
+ Pmsg0(-1, _("\n\nDone filling tape. Now beginning re-read of tape ...\n"));
+
+ dump_block(last_block, _("Last block written to tape.\n"));
unfillcmd();
}
/*
* Read two tapes written by the "fill" command and ensure
- * that the data is valid.
+ * that the data is valid. If stop==1 we simulate full read back
+ * of two tapes. If stop==-1 we simply read the last block and
+ * verify that it is correct.
*/
static void unfillcmd()
{
dev->capabilities &= ~CAP_LABEL; /* don't label anything here */
end_of_tape = 0;
- get_cmd("Mount first of two tapes. Press enter when ready: ");
+
+ if (!simple) {
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
+ get_cmd(_("Mount first tape. Press enter when ready: "));
- free_vol_list(jcr);
- pm_strcpy(&jcr->VolumeName, "TestVolume1");
- jcr->bsr = NULL;
- create_vol_list(jcr);
- close_dev(dev);
- dev->state &= ~ST_READ;
- if (!acquire_device_for_read(jcr, dev, block)) {
- Pmsg0(000, dev->errmsg);
- return;
+ free_vol_list(jcr);
+ set_volume_name("TestVolume1", 1);
+ jcr->bsr = NULL;
+ create_vol_list(jcr);
+ close_dev(dev);
+ dev->state &= ~ST_READ;
+ if (!acquire_device_for_read(jcr, dev, block)) {
+ Pmsg1(-1, "%s", dev->errmsg);
+ return;
+ }
}
time(&jcr->run_time); /* start counting time for rates */
stop = 0;
file_index = 0;
- read_records(jcr, dev, record_cb, my_mount_next_read_volume);
+ if (!simple) {
+ /* Read all records and then second tape */
+ read_records(jcr, dev, record_cb, my_mount_next_read_volume);
+ } else {
+ /*
+ * Simplified test, we simply fsf to file, then read the
+ * last block and make sure it is the same as the saved block.
+ */
+ Pmsg0(000, "Rewinding tape ...\n");
+ if (!rewind_dev(dev)) {
+ Pmsg1(-1, _("Error rewinding: ERR=%s\n"), strerror_dev(dev));
+ goto bail_out;
+ }
+ if (last_file > 0) {
+ Pmsg1(000, "Forward spacing to last file=%u\n", last_file);
+ if (!fsf_dev(dev, last_file)) {
+ Pmsg1(-1, _("Error in FSF: ERR=%s\n"), strerror_dev(dev));
+ goto bail_out;
+ }
+ }
+ Pmsg1(-1, _("Forward space to file %u complete. Reading blocks ...\n"),
+ last_file);
+ Pmsg1(-1, _("Now reading to block %u.\n"), last_block_num);
+ for (uint32_t i=0; i <= last_block_num; i++) {
+ if (!read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
+ Pmsg1(-1, _("Error reading blocks: ERR=%s\n"), strerror_dev(dev));
+ Pmsg2(-1, _("Wanted block %u error at block %u\n"), last_block_num, i);
+ goto bail_out;
+ }
+ if (i > 0 && i % 1000 == 0) {
+ Pmsg1(-1, _("At block %u\n"), i);
+ }
+ }
+ if (last_block) {
+ dump_block(last_block, _("Last block written"));
+ dump_block(block, _("Block read back"));
+ Pmsg0(-1, _("Except for the buffer address, the contents of\n"
+ "the above two block dumps should be the same.\n"
+ "If not you have a problem ...\n"));
+ }
+ }
+
+bail_out:
free_block(block);
- Pmsg0(000, "Done with unfillcmd.\n");
+ Pmsg0(000, _("Done with reread of fill data.\n"));
}
-
/*
- * We are called here from "unfill" for each record on the
- * tape.
+ * We are called here from "unfill" for each record on the tape.
*/
static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
{
-
SESSION_LABEL label;
- if (stop > 1) { /* on second tape */
- Pmsg4(000, "Blk: FileIndex=%d: block=%u size=%d vol=%s\n",
+
+ if (stop > 1 && !dumped) { /* on second tape */
+ dumped = 1;
+ dump_block(block, "First block on second tape");
+ Pmsg4(-1, "Blk: FileIndex=%d: block=%u size=%d vol=%s\n",
rec->FileIndex, block->BlockNumber, block->block_len, dev->VolHdr.VolName);
- Pmsg6(000, " Rec: VId=%d VT=%d FI=%s Strm=%s len=%d state=%x\n",
+ Pmsg6(-1, " Rec: VId=%d VT=%d FI=%s Strm=%s len=%d state=%x\n",
rec->VolSessionId, rec->VolSessionTime,
FI_to_ascii(rec->FileIndex), stream_to_ascii(rec->Stream, rec->FileIndex),
rec->data_len, rec->state);
-
- if (!dumped) {
- dumped = 1;
- dump_block(block, "Block not written to previous tape");
- }
}
if (rec->FileIndex < 0) {
if (verbose > 1) {
dump_label_record(dev, rec, 1);
}
switch (rec->FileIndex) {
- case PRE_LABEL:
- Pmsg0(000, "Volume is prelabeled. This tape cannot be scanned.\n");
- return;
- case VOL_LABEL:
- unser_volume_label(dev, rec);
- Pmsg3(000, "VOL_LABEL: block=%u size=%d vol=%s\n", block->BlockNumber,
- block->block_len, dev->VolHdr.VolName);
- stop++;
- break;
- case SOS_LABEL:
- unser_session_label(&label, rec);
- Pmsg1(000, "SOS_LABEL: JobId=%u\n", label.JobId);
- break;
- case EOS_LABEL:
- unser_session_label(&label, rec);
- Pmsg2(000, "EOS_LABEL: block=%u JobId=%u\n", block->BlockNumber,
- label.JobId);
- break;
- case EOM_LABEL:
- Pmsg0(000, "EOM_LABEL:\n");
- break;
- case EOT_LABEL: /* end of all tapes */
- char ec1[50];
+ case PRE_LABEL:
+ Pmsg0(-1, "Volume is prelabeled. This tape cannot be scanned.\n");
+ return;
+ case VOL_LABEL:
+ unser_volume_label(dev, rec);
+ Pmsg3(-1, "VOL_LABEL: block=%u size=%d vol=%s\n", block->BlockNumber,
+ block->block_len, dev->VolHdr.VolName);
+ stop++;
+ break;
+ case SOS_LABEL:
+ unser_session_label(&label, rec);
+ Pmsg1(-1, "SOS_LABEL: JobId=%u\n", label.JobId);
+ break;
+ case EOS_LABEL:
+ unser_session_label(&label, rec);
+ Pmsg2(-1, "EOS_LABEL: block=%u JobId=%u\n", block->BlockNumber,
+ label.JobId);
+ break;
+ case EOM_LABEL:
+ Pmsg0(-1, "EOM_LABEL:\n");
+ break;
+ case EOT_LABEL: /* end of all tapes */
+ char ec1[50];
- if (LastBlock != block->BlockNumber) {
- VolBytes += block->block_len;
- }
- LastBlock = block->BlockNumber;
- now = time(NULL);
- now -= jcr->run_time;
- if (now <= 0) {
- now = 1;
- }
- kbs = (double)VolBytes / (1000 * now);
- Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
- edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
+ if (LastBlock != block->BlockNumber) {
+ VolBytes += block->block_len;
+ }
+ LastBlock = block->BlockNumber;
+ now = time(NULL);
+ now -= jcr->run_time;
+ if (now <= 0) {
+ now = 1;
+ }
+ kbs = (double)VolBytes / (1000 * now);
+ Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
- Pmsg0(000, "End of all tapes.\n");
+ Pmsg0(000, "End of all tapes.\n");
- break;
- default:
- break;
+ break;
+ default:
+ break;
}
return;
}
+ if (++file_index != rec->FileIndex) {
+ Pmsg3(000, "Incorrect FileIndex in Block %u. Got %d, expected %d.\n",
+ block->BlockNumber, rec->FileIndex, file_index);
+ }
+ /*
+ * Now check that the right data is in the record.
+ */
+ uint64_t *lp = (uint64_t *)rec->data;
+ uint64_t val = ~file_index;
+ for (uint32_t i=0; i < (REC_SIZE-sizeof(uint64_t))/sizeof(uint64_t); i++) {
+ if (*lp++ != val) {
+ Pmsg2(000, "Record %d contains bad data in Block %u.\n",
+ file_index, block->BlockNumber);
+ break;
+ }
+ }
+
if (LastBlock != block->BlockNumber) {
VolBytes += block->block_len;
}
{
char ec1[50];
lock_device(dev);
+ DEV_BLOCK *tblock;
+ uint32_t this_file, this_block_num;
+
+ if (!this_block) {
+ this_block = new_block(dev);
+ }
+ /* Copy block */
+ free_memory(this_block->buf);
+ memcpy(this_block, block, sizeof(DEV_BLOCK));
+ this_block->buf = get_memory(block->buf_len);
+ memcpy(this_block->buf, block->buf, this_block->buf_len);
+ this_file = dev->file;
+ this_block_num = dev->block_num;
if (!write_block_to_dev(jcr, dev, block)) {
Pmsg0(000, strerror_dev(dev));
Pmsg3(000, "Block not written: FileIndex=%u Block=%u Size=%u\n",
(unsigned)file_index, block->BlockNumber, block->block_len);
+ Pmsg2(000, "last_block_num=%u this_block_num=%d\n", last_block_num,
+ this_block_num);
if (dump) {
dump_block(block, "Block not written");
}
- if (!stop) {
+ if (stop == 0) {
eot_block = block->BlockNumber;
eot_block_len = block->block_len;
eot_FileIndex = file_index;
vol_size = dev->VolCatInfo.VolCatBytes;
Pmsg2(000, "End of tape. VolumeCapacity=%s. Write rate = %.1f KB/s\n",
edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs);
- if (!fixup_device_block_write_error(jcr, dev, block)) {
- Pmsg1(000, _("Cannot fixup device error. %s\n"), strerror_dev(dev));
- ok = FALSE;
- unlock_device(dev);
- return 0;
+
+ if (simple) {
+ stop = -1; /* stop, but do simplified test */
+ } else {
+ /* Full test in progress */
+ if (!fixup_device_block_write_error(jcr, dev, block)) {
+ Pmsg1(000, _("Cannot fixup device error. %s\n"), strerror_dev(dev));
+ ok = FALSE;
+ unlock_device(dev);
+ return 0;
+ }
+ stop = 1;
+ BlockNumber = 0; /* start counting for second tape */
}
- stop = 1;
unlock_device(dev);
- return 1; /* write one more block to next tape then stop */
+ return 1; /* end of tape reached */
}
+
+ /*
+ * Toggle between two allocated blocks for efficiency.
+ * Switch blocks so that the block just successfully written is
+ * always in last_block.
+ */
+ tblock = last_block;
+ last_block = this_block;
+ this_block = tblock;
+ last_file = this_file;
+ last_block_num = this_block_num;
+
unlock_device(dev);
return 1;
}
+/*
+ * First we label the tape, then we fill
+ * it with data get a new tape and write a few blocks.
+ */
+static void qfillcmd()
+{
+ DEV_BLOCK *block;
+ DEV_RECORD *rec;
+ int i, count;
+
+ Pmsg0(0, "Test writing blocks of 64512 bytes to tape.\n");
+
+ get_cmd("How many blocks do you want to write? (1000): ");
+
+ count = atoi(cmd);
+ if (count <= 0) {
+ count = 1000;
+ }
+
+ sm_check(__FILE__, __LINE__, False);
+ block = new_block(dev);
+ rec = new_record();
+
+ i = block->buf_len - 100;
+ ASSERT (i > 0);
+ rec->data = check_pool_memory_size(rec->data, i);
+ memset(rec->data, i & 0xFF, i);
+ rec->data_len = i;
+ rewindcmd();
+ Pmsg1(0, "Begin writing %d blocks to tape ...\n", count);
+ for (i=0; i < count; i++) {
+ if (i % 100 == 0) {
+ printf("+");
+ }
+ if (!write_record_to_block(block, rec)) {
+ Pmsg0(0, _("Error writing record to block.\n"));
+ goto bail_out;
+ }
+ if (!write_block_to_dev(jcr, dev, block)) {
+ Pmsg0(0, _("Error writing block to device.\n"));
+ goto bail_out;
+ }
+ }
+ printf("\n");
+ weofcmd();
+ weofcmd();
+ rewindcmd();
+ scan_blocks();
+
+bail_out:
+ sm_check(__FILE__, __LINE__, False);
+ free_record(rec);
+ free_block(block);
+ sm_check(__FILE__, __LINE__, False);
+
+}
+
+static void rawfill_cmd()
+{
+ DEV_BLOCK *block;
+ int stat;
+ int fd;
+ uint32_t block_num = 0;
+ uint32_t *p;
+ int my_errno;
+
+ block = new_block(dev);
+ fd = open("/dev/urandom", O_RDONLY);
+ if (fd) {
+ read(fd, block->buf, block->buf_len);
+ } else {
+ Pmsg0(0, "Cannot open /dev/urandom.\n");
+ free_block(block);
+ return;
+ }
+ p = (uint32_t *)block->buf;
+ Pmsg1(0, "Begin writing blocks of %u bytes.\n", block->buf_len);
+ for ( ;; ) {
+ *p = block_num;
+ stat = write(dev->fd, block->buf, block->buf_len);
+ if (stat == (int)block->buf_len) {
+ if ((block_num++ % 100) == 0) {
+ printf("+");
+ }
+ continue;
+ }
+ break;
+ }
+ my_errno = errno;
+ printf("\n");
+ weofcmd();
+ printf("Write failed at block %u. stat=%d ERR=%s\n", block_num, stat,
+ strerror(my_errno));
+ free_block(block);
+
+}
+
struct cmdstruct { char *key; void (*func)(); char *help; };
static struct cmdstruct commands[] = {
{"bsf", bsfcmd, "backspace file"},
{"cap", capcmd, "list device capabilities"},
{"clear", clearcmd, "clear tape errors"},
{"eod", eodcmd, "go to end of Bacula data for append"},
- {"test", testcmd, "General test Bacula tape functions"},
{"eom", eomcmd, "go to the physical end of medium"},
{"fill", fillcmd, "fill tape, write onto second volume"},
{"unfill", unfillcmd, "read filled tape"},
{"label", labelcmd, "write a Bacula label to the tape"},
{"load", loadcmd, "load a tape"},
{"quit", quitcmd, "quit btape"},
- {"rd", rdcmd, "read tape"},
+ {"rawfill", rawfill_cmd, "use write() to fill tape"},
{"readlabel", readlabelcmd, "read and print the Bacula tape label"},
{"rectest", rectestcmd, "test record handling functions"},
{"rewind", rewindcmd, "rewind the tape"},
- {"scan", scancmd, "read tape block by block to EOT and report"},
+ {"scan", scancmd, "read() tape block by block to EOT and report"},
+ {"scanblocks", scan_blocks, "Bacula read block by block to EOT and report"},
{"status", statcmd, "print tape status"},
+ {"test", testcmd, "General test Bacula tape functions"},
{"weof", weofcmd, "write an EOF on the tape"},
- {"wr", wrcmd, "write a single record of 2048 bytes"},
+ {"wr", wrcmd, "write a single Bacula block"},
+ {"rr", rrcmd, "read a single record"},
+ {"qfill", qfillcmd, "quick fill command"},
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
static void usage()
{
fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
"Usage: btape [-c config_file] [-d debug_level] [device_name]\n"
" -c <file> set configuration file to file\n"
" -dnn set debug level to nn\n"
}
/* Dummies to replace askdir.c */
-int dir_get_volume_info(JCR *jcr, int writing) { return 1;}
-int dir_find_next_appendable_volume(JCR *jcr) { return 1;}
+int dir_get_volume_info(JCR *jcr, enum get_vol_info_rw writing) { return 1;}
int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel) { return 1; }
int dir_create_jobmedia_record(JCR *jcr) { return 1; }
int dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;}
int dir_send_job_status(JCR *jcr) {return 1;}
+
+int dir_find_next_appendable_volume(JCR *jcr)
+{
+ return 1;
+}
+
int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
{
- Pmsg0(000, dev->errmsg); /* print reason */
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
+ Pmsg1(-1, "%s", dev->errmsg); /* print reason */
fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ",
jcr->VolumeName, dev_name(dev));
getchar();
int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
{
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
fprintf(stderr, "Mount next Volume on device %s and press return when ready: ",
dev_name(dev));
getchar();
- VolumeName = "TestVolume2";
+ set_volume_name("TestVolume2", 2);
labelcmd();
VolumeName = NULL;
+ BlockNumber = 0;
+ stop = 1;
return 1;
}
if (now <= 0) {
now = 1;
}
- kbs = (double)VolBytes / (1000 * now);
- Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ kbs = (double)VolBytes / (1000.0 * (double)now);
+ Pmsg3(-1, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
if (strcmp(jcr->VolumeName, "TestVolume2") == 0) {
}
free_vol_list(jcr);
- pm_strcpy(&jcr->VolumeName, "TestVolume2");
+ set_volume_name("TestVolume2", 2);
jcr->bsr = NULL;
create_vol_list(jcr);
close_dev(dev);
}
return 1; /* next volume mounted */
}
+
+static void set_volume_name(char *VolName, int volnum)
+{
+ VolumeName = VolName;
+ vol_num = volnum;
+ pm_strcpy(&jcr->VolumeName, VolName);
+ bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName));
+}