Update disk seek debug code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3705 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/fd_cmds.c b/bacula/src/stored/fd_cmds.c
index bb1cea383133c660578fb462a600ff2c0fe3f749..47306f20b59e393351ea2d099435276a5e7ca1fa 100644 (file)
--- a/bacula/src/stored/fd_cmds.c
+++ b/bacula/src/stored/fd_cmds.c
@@ -349,11 +349,13 @@ bool get_bootstrap_file(JCR *jcr, BSOCK *sock)
          jcr->RestoreBootstrap, strerror(errno));
       goto bail_out;
    }
+   Dmsg0(10, "=== Bootstrap file ===\n");
    while (bnet_recv(sock) >= 0) {
-       Dmsg1(400, "stored<filed: bootstrap file %s", sock->msg);
+       Dmsg1(10, "%s", sock->msg);
        fputs(sock->msg, bs);
    }
    fclose(bs);
+   Dmsg0(10, "=== end bootstrap file ===\n");
    jcr->bsr = parse_bsr(jcr, jcr->RestoreBootstrap);
    if (!jcr->bsr) {
       Jmsg(jcr, M_FATAL, 0, _("Error parsing bootstrap file.\n"));

diff --git a/bacula/src/stored/match_bsr.c b/bacula/src/stored/match_bsr.c
index 8968cf8f9cfd970268e889e5ab210c17426601b2..4cf196230f4deb4812237c8c4e45a197854fd595 100755 (executable)
--- a/bacula/src/stored/match_bsr.c
+++ b/bacula/src/stored/match_bsr.c
@@ -330,7 +330,7 @@ static int match_all(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
                      SESSION_LABEL *sessrec, bool done)
 {
    if (bsr->done) {
-      Dmsg0(dbglevel, "bsr->done set\n");
+//    Dmsg0(dbglevel, "bsr->done set\n");
       goto no_match;
    }
    if (!match_volume(bsr, bsr->volume, volrec, 1)) {

diff --git a/bacula/src/stored/parse_bsr.c b/bacula/src/stored/parse_bsr.c
index 0f66eeb186b0a1464d7a04aab3fd500cb1fba89e..f05e8c2b24689f5c996926c8ed5b9e98ce185a95 100755 (executable)
--- a/bacula/src/stored/parse_bsr.c
+++ b/bacula/src/stored/parse_bsr.c
@@ -751,9 +751,6 @@ void dump_sesstime(BSR_SESSTIME *sesstime)
 }
 
 
-
-
-
 void dump_bsr(BSR *bsr, bool recurse)
 {
    int save_debug = debug_level;

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index 7cbe2bcf3edb10556f06824fba9796080cc08f95..8f43ec09ef76eeb9f15663679de576d5ae129463 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -333,16 +333,18 @@ static bool try_repositioning(JCR *jcr, DEV_RECORD *rec, DCR *dcr)
        *   when find_next_bsr() is fixed not to return a bsr already
        *   completed.
        */
+#ifdef xxx
       if (dev->file > bsr->volfile->sfile ||             
          (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
          return false;
       }
+#endif
       if (verbose) {
          Jmsg(jcr, M_INFO, 0, _("Reposition from (file:block) %u:%u to %u:%u\n"),
             dev->file, dev->block_num, bsr->volfile->sfile,
             bsr->volblock->sblock);
       }
-      Dmsg4(dbglvl, "Try_Reposition from (file:block) %u:%u to %u:%u\n",
+      Dmsg4(10, "Try_Reposition from (file:block) %u:%u to %u:%u\n",
             dev->file, dev->block_num, bsr->volfile->sfile,
             bsr->volblock->sblock);
       dev->reposition(dcr, bsr->volfile->sfile, bsr->volblock->sblock);