Add debug times, reduce size of two-pool-changer test

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 6bd65639d98d5c7fdc8e8178a2520b47d87f41c7..58cbda77c745df74f812c626b6517e989056ba89 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -114,6 +114,10 @@ Professional Needs:
 
 Priority:
 ================
+- Dangling softlinks are not restored properly.  For example, take a
+  soft link such as src/testprogs/install-sh, which points to /usr/share/autoconf...
+  move the directory to another machine where the file /usr/share/autoconf does
+  not exist, back it up, then try a full restore.  It fails.
 - Check for FD compatibility -- eg .nobackup ...
 - Re-check new dcr->reserved_volume
 - Softlinks that point to non-existent file are not restored in restore all,

diff --git a/bacula/src/lib/btime.c b/bacula/src/lib/btime.c
index f29bf7f1175a735b1269213c23b2b413c01fc21a..7487fe1c5a40b3435e75adaad12b4799a1c90e06 100644 (file)
--- a/bacula/src/lib/btime.c
+++ b/bacula/src/lib/btime.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-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.

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 8fb4f6e1d7bf2e15de421ef6866ba79bd8e63303..989be6a532f061660eb957416e9009c0fe2c0621 100644 (file)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -694,7 +694,7 @@ void set_jcr_job_status(JCR *jcr, int JobStatus)
          jcr->wait_time = time(NULL);
       }
    }
-   Dmsg3(100, "jid=%u Exit set_jcr_job_status=%c set=%c\n", (uint32_t)jcr->JobId,
+   Dmsg3(100, "jid=%u leave set_jcr_job_status=%c set=%c\n", (uint32_t)jcr->JobId,
          jcr->JobStatus, JobStatus);
 }
 

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 63c784c505e07c4f4fd5bb1b05e0b75ff474ff1a..fc72f8a7c244adef04b47d028cf8df4048983c58 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -447,6 +447,7 @@ bool release_device(DCR *dcr)
    JCR *jcr = dcr->jcr;
    DEVICE *dev = dcr->dev;
    bool ok = true;
+   char tbuf[100];
 
    /* lock only if not already locked by this thread */
    if (!dcr->is_dev_locked()) {
@@ -545,7 +546,8 @@ bool release_device(DCR *dcr)
       free_pool_memory(alert);
    }
    pthread_cond_broadcast(&dev->wait_next_vol);
-   Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId);
+   Dmsg2(100, "JobId=%u broadcast wait_device_release at %s\n", 
+         (uint32_t)jcr->JobId, bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
    pthread_cond_broadcast(&wait_device_release);
    dev->dunlock();
    if (dcr->keep_dcr) {

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index ceac150446910fb5813f187b1c2dd4440f6e46d4..b61e2e66305f9f7d29791aa808067dbf5291a10b 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -149,6 +149,7 @@ void *handle_connection_request(void *arg)
    bool found, quit;
    int bnet_stat = 0;
    char name[500];
+   char tbuf[100];
 
    if (bs->recv() <= 0) {
       Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
@@ -174,7 +175,8 @@ void *handle_connection_request(void *arg)
       Dmsg1(000, "<filed: %s", bs->msg);
    }
    if (sscanf(bs->msg, "Hello Start Job %127s", name) == 1) {
-      Dmsg0(110, "Got a FD connection\n");
+      Dmsg1(110, "Got a FD connection at %s\n", bstrftimes(tbuf, sizeof(tbuf), 
+            (utime_t)time(NULL)));
       handle_filed_connection(bs, name);
       return NULL;
    }
@@ -182,7 +184,8 @@ void *handle_connection_request(void *arg)
    /* 
     * This is a connection from the Director, so setup a JCR 
     */
-   Dmsg0(110, "Got a DIR connection\n");
+   Dmsg1(110, "Got a DIR connection at %s\n", bstrftimes(tbuf, sizeof(tbuf), 
+         (utime_t)time(NULL)));
    jcr = new_jcr(sizeof(JCR), stored_free_jcr); /* create Job Control Record */
    jcr->dir_bsock = bs;               /* save Director bsock */
    jcr->dir_bsock->set_jcr(jcr);

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index 2acc5bd330b9ce0419314680465406a5098ceb75..b9ad674d2fba709215532e58c9e7d114301177a3 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -1040,7 +1040,7 @@ bool find_suitable_device_for_job(JCR *jcr, RCTX &rctx)
       Dmsg0(dbglvl, "deleted temp vol list\n");
       Dmsg0(dbglvl, "unlock volumes\n");
       unlock_volumes();
-      debug_list_volumes("=== After free temp table\n");
+      debug_list_volumes("after free temp table");
    }
    if (ok) {
       Dmsg1(dbglvl, "OK dev found. Vol=%s from in-use vols list\n", rctx.VolumeName);

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 33cbf0499b9f0e2ae52a5b1272bfd9f0a5a027a6..5006b337357ac205fde72420774bb45553155a25 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -624,7 +624,10 @@ bool commit_attribute_spool(JCR *jcr)
 {
    off_t size;
    char ec1[30];
+   char tbuf[100];
 
+   Dmsg1(100, "Commit attributes at %s\n", bstrftimes(tbuf, sizeof(tbuf),
+         ( utime_t)time(NULL)));
    if (are_attributes_spooled(jcr)) {
       if (fseeko(jcr->dir_bsock->m_spool_fd, 0, SEEK_END) != 0) {
          berrno be;
@@ -690,6 +693,10 @@ bool close_attr_spool_file(JCR *jcr, BSOCK *bs)
 {
    POOLMEM *name;
 
+   char tbuf[100];
+
+   Dmsg1(100, "Close attr spool file at %s\n", bstrftimes(tbuf, sizeof(tbuf),
+         ( utime_t)time(NULL)));
    if (!bs->m_spool_fd) {
       return true;
    }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index bdca238582225349b5d6e9879023c1e7fbafb0fd..5c4bb33306c03d0498a182085d20075f379addd7 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.3.20"
-#define BDATE   "07 May 2008"
-#define LSMDATE "07May08"
+#define BDATE   "10 May 2008"
+#define LSMDATE "10May08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 9061089db6403e9c6f00141d6039e9aa0362ba53..1a948a0fb9f7aa5466f1b9479234573369d01ca2 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -24,6 +24,8 @@ Add long term statistics job table
 
 
 General:
+10May08
+kes  Add debug times, reduce size of two-pool-changer test 
 08May08
 ebl  Tweak autoconf scripts for faketape
 07May08