Tweak debug

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

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index a6c7ce5653d9ea302e5613a13511981b60225789..91092407627bc542259cfd537cd6344207deb582 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -107,7 +107,6 @@ void prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
    prune_list.JobId = (JobId_t *)malloc(sizeof(JobId_t) * prune_list.max_ids);
 
    ua = new_ua_context(jcr);
-
    db_lock(jcr->db);
 
    /* Edit PoolId */
@@ -154,7 +153,7 @@ void prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
       goto bail_out;
    }
 
-   Dmsg1(100, "num_ids=%d\n", ids.num_ids);
+   Dmsg1(100, "Volume prune num_ids=%d\n", ids.num_ids);
 
    /* Visit each Volume and Prune it until we find one that is purged */
    for (i=0; i<ids.num_ids; i++) {
@@ -217,8 +216,6 @@ void prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
             memcpy(mr, &lmr, sizeof(lmr));
             break;                        /* got a volume */
          }
-      } else {
-         Dmsg2(100, "Nothing pruned MediaId=%d Volume=%s\n", (int)lmr.MediaId, lmr.VolumeName);
       }
    }
 

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 35da13ba749b2e1bf61d8a72f0702af72fc016c0..47e5962447b4cb41861a25e3200178b8a7a5dd73 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -345,7 +345,7 @@ extern "C" void msg_thread_cleanup(void *arg)
    jcr->sd_msg_thread_done = true;
    jcr->SD_msg_chan = 0;
    pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
-   Dmsg1(100, "=== End msg_thread. use=%d\n", jcr->use_count());
+   Dmsg2(100, "=== End msg_thread. JobId=%d usecnt=%d\n", jcr->JobId, jcr->use_count());
    free_jcr(jcr);                     /* release jcr */
    db_thread_cleanup();               /* remove thread specific data */
 }

diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index a675a073749671e005587c150edd86bdde1f149c..904f4cf0cab4e79eed6b0b1f1620d21f30789ccc 100644 (file)
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -42,6 +42,7 @@
 /*
  *  Items needed:
  *   mr.PoolId must be set
+ *   mr.StorageId should also be set
  *   jcr->wstore
  *   jcr->db
  *   jcr->pool
@@ -134,10 +135,10 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index,
                 jcr->pool->purge_oldest_volume, jcr->pool->recycle_oldest_volume);
             /* Find oldest volume to recycle */
             ok = db_find_next_volume(jcr, jcr->db, -1, InChanger, mr);
-            Dmsg1(400, "Find oldest=%d\n", ok);
+            Dmsg1(200, "Find oldest=%d Volume\n", ok);
             if (ok && prune) {
                UAContext *ua;
-               Dmsg0(400, "Try purge.\n");
+               Dmsg0(200, "Try purge Volume.\n");
                /*
                 * 7.  Try to purging oldest volume only if not UA calling us.
                 */