- Fix removing items from watchdog queue, which apparently

  screwed up if there was more than one item.
- Rework mediaformat part of manual to separate out old
  tape format for easier reading.
- Add a lot of debug code to the authentication code.
- Add seconds to the start/end times printed in the job report.

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index ab30bb77fe404e1c05fae434b90327583b6201b3..f4d894739ea2314404c77862c98aeea2be6e8761 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,80 @@
 
 

+Version 1.36.1 released xxNov04:
+18Nov04
+- Increase authentication timeouts to 10 minutes.  
+15Nov04
+- Fix cancel bug in FD on /lib/tls with zero pid in 
+  pthread_kill.
+- Add date/time to all messages.
+- Make Qmsg use time message was queued rather than time
+  printed.
+- Indent job output two spaces.
+13Nov04
+- Fix web page links for new manual.
+- Grant postgresql permission to cdimages.
+- Correct crash after "list nextvol" "list media" bug 160
+12Nov04
+- Fix scripts/Makefile.in missing ;\  -- thanks Martin
+- A bit of work on btape to keep if from going into infinite
+  loops when things do not work well, and to print a bit
+  better info.
+11Nov04
+- JobDefs Storage resource completely overrode anything
+  specified in Job resource -- bug 159 -- fixed.
+- Fix syntax of renaming postgresql per Dan.
+- Add working_directory to be /tmp for wx_console.
+10Nov04
+- Allow both a JobId and a filename or list of files to be
+  specified on a restore command line.
+- Save old mtx-changer before installing new one: bug 156
+- Fix errors in CDROM file pointed out by Scott.
+09Nov04
+- Fix exepath when Bacula executed without path.
+- Move test for socket libraries for Solaris in configure.in
+  before tcp wrapper tests so that linking works.
+- Add "make copy-static-fd" to makefile in CDROM file to
+  copy existing static fd to CDROM rather than building it.
+08Nov04
+- More doc updates
+- Fix ps command for OpenBSD
+- Rework the creation of indexes for SQL -- fall back
+  to the old code, but document what can be added.
+06Nov04
+- Add new Daemon message handler in default DIR conf.
+05Nov04
+- Fix Seg Fault with -D100 in bpipe.c.    
+- Fix Seg Fault in run specifying a JobId.
+- Make mail from daemon with a Messages Resource use
+  the MailCommand with editing rather than the default
+  sendmail.
+- Replace Jmsg in dispatch_message() with Qmsg.
+- Make edit_job_codes handle NULL jcr.
+04Nov04
+- Add M_ALERT class and put tape alerts into it.
+- Fix Verify count vs found by not double counting files
+  that are split across files/Volumes.
+30Oct04
+- Fix count returned from write_bsr_file() to handle multiple
+  volumes. This fixes most cases of the Verify VolumeToCatalog.
+- Cleanup a bit the make clean for the rescue cdrom and remove
+  unneeded files from the CVS.
+28Oct04
+- Fixed acquiring a tape so that it does not block all acquires
+  when operator intervention is needed.
+- Platform build script updates from Scott
+- Doc updates
+- Add patch to force Linux LD_ASSUME_KERNEL to avoid using the
+  new /lib/tls. This is done in the startup scripts.
+- Modify mtx-changer so that it checks for ONLINE while
+  waiting.
+- Modify make_postgresql_tables.in so that EndBlock is stored
+  as a bigint. Prevents job failures when a disk volume is
+  larger than 2GB.
+24Oct04
+- Add grep ONLINE to wait_for_drive() in mtx-changer.in
+- More doc.
+- Rebuild Scott's new configure
+

 Version 1.36.0 released 21Oct04:
 Changes to 1.35.9:
 19Oct04
 Version 1.36.0 released 21Oct04:
 Changes to 1.35.9:
 19Oct04

diff --git a/bacula/kernstodo b/bacula/kernstodo
index e6df3623ea4f875b474dab8bb6436e40145f4092..b8e483b48c81d9ebc68d523274de4674d103a621 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                     Kern's ToDo List
                     Kern's ToDo List

-                     26 October 2004
+                     18 November 2004

 
 Major development:      
 Project                     Developer
 
 Major development:      
 Project                     Developer


@@ -15,10 +15,23 @@ For 1.36.1:
    Orphaned buffer:      24 bytes allocated at line 808 of rufus-dir job.c
    Orphaned buffer:      40 bytes allocated at line 45 of rufus-dir alist.c
 - Add dump of VolSessionId/Time and FileIndex with bls.
    Orphaned buffer:      24 bytes allocated at line 808 of rufus-dir job.c
    Orphaned buffer:      40 bytes allocated at line 45 of rufus-dir alist.c
 - Add dump of VolSessionId/Time and FileIndex with bls.

-- Add date/time to each Jmsg.

 
 

-1.37 Items:
-- Include within include
+1.37 Projects:
+#3   Migration (Move, Copy, Archive Jobs)
+#4   Embedded Python Scripting
+#5   Events that call a Python program
+#6   Select one from among Multiple Storage Devices for Job
+#7   Single Job Writing to Multiple Storage Devices
+
+
+1.37 Possibilities:
+- if 2 concurrent backups are attempted on the same tape
+  drive (autoloader) into different tape pools, one of them will exit
+  fatally instead of halting until the drive is idle
+- Add seconds to start and end times in the Job report output.
+- Add disk seeking on restore.  
+- Document that ChangerDevice is used for Alert command.
+- Include within include does it work?

 - Implement a Pool of type Cleaning?
 - Implement VolReadTime and VolWriteTime in SD
 - Modify Backing up Your Database to include a bootstrap file.
 - Implement a Pool of type Cleaning?
 - Implement VolReadTime and VolWriteTime in SD
 - Modify Backing up Your Database to include a bootstrap file.


@@ -234,8 +247,7 @@ For 1.37 Testing/Documentation:
    entirely upon the length.On a restore, the full and all incrementals
    since it will beapplied in sequence to restore the file.  
 - Add a regression test for dbcheck.  
    entirely upon the length.On a restore, the full and all incrementals
    since it will beapplied in sequence to restore the file.  
 - Add a regression test for dbcheck.  

-- Add disk seeking on restore.  - Allow
-   for optional cancelling of SD and FD in case DIR
+- Allow for optional cancelling of SD and FD in case DIR

   gets a fatal error. Requested by Jesse Guardiani <jesse@wingnet.net>
 - Add "limit=n" for "list jobs"
 - Check new HAVE_WIN32 open bits.    
   gets a fatal error. Requested by Jesse Guardiani <jesse@wingnet.net>
 - Add "limit=n" for "list jobs"
 - Check new HAVE_WIN32 open bits.    


@@ -985,4 +997,5 @@ Block Position: 0
 - Add "Rerun failed levels = yes/no" to Job resource.
 - Fix CDROM make script to permit picking up already installed
   static FD.
 - Add "Rerun failed levels = yes/no" to Job resource.
 - Fix CDROM make script to permit picking up already installed
   static FD.

+- Add date/time to each Jmsg.

 
 

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index d2f97aff817e34f3d0440ba68f8fa2a75ea3b5c0..613e13b2d86a60649ecbd7b3ae3a5ca42158a5a3 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -405,8 +405,8 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
          sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
         break;
    }
          sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
         break;
    }

-   bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
-   bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
+   bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+   bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);

    RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
    if (RunTime <= 0) {
       kbps = 0;
    RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
    if (RunTime <= 0) {
       kbps = 0;

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index 273ad0917d0c98f8c9c71154b7e15a34d2840370..02d86f80cc2d9598ab92629eabdef8de485effbd 100644 (file)
--- a/bacula/src/dird/mac.c
+++ b/bacula/src/dird/mac.c
@@ -326,8 +326,8 @@ static void mac_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr,
          sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
         break;
    }
          sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
         break;
    }

-   bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
-   bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
+   bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+   bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);

    RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
    if (RunTime <= 0) {
       kbps = 0;
    RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
    if (RunTime <= 0) {
       kbps = 0;

diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index 2cf91aef5794b63fdb45881210d6ef2cc3e77793..27c3abc025b49d74a05ed2910bb7dc69f9bc0dd8 100644 (file)
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -311,8 +311,8 @@ static void restore_cleanup(JCR *jcr, int TermCode)
       sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode);
       break;
    }
       sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode);
       break;
    }

-   bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
-   bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
+   bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+   bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);

    if (jcr->jr.EndTime - jcr->jr.StartTime > 0) {
       kbps = (double)jcr->jr.JobBytes / (1000 * (jcr->jr.EndTime - jcr->jr.StartTime));
    } else {
    if (jcr->jr.EndTime - jcr->jr.StartTime > 0) {
       kbps = (double)jcr->jr.JobBytes / (1000 * (jcr->jr.EndTime - jcr->jr.StartTime));
    } else {

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index d72fe1d370854552dd1eed55afe3880e703be570..c0dbaecf13efe518a2253ebb61fe753b9db49241 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -246,12 +246,12 @@ int prune_files(UAContext *ua, CLIENT *client)
        
    /* Select Jobs -- for counting */
    Mmsg(query, select_job, edit_uint64(now - period, ed1), cr.ClientId);
        
    /* Select Jobs -- for counting */
    Mmsg(query, select_job, edit_uint64(now - period, ed1), cr.ClientId);

-   Dmsg1(050, "select sql=%s\n", query);
+   Dmsg1(500, "select sql=%s\n", query);

    if (!db_sql_query(ua->db, query, file_count_handler, (void *)&del)) {
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }
    if (!db_sql_query(ua->db, query, file_count_handler, (void *)&del)) {
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }

-      Dmsg0(050, "Count failed\n");
+      Dmsg0(500, "Count failed\n");

       goto bail_out;
    }
       
       goto bail_out;
    }
       


@@ -276,7 +276,7 @@ int prune_files(UAContext *ua, CLIENT *client)
 
    for (i=0; i < del.num_ids; i++) {
       struct s_count_ctx cnt;
 
    for (i=0; i < del.num_ids; i++) {
       struct s_count_ctx cnt;

-      Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
+      Dmsg1(500, "Delete JobId=%d\n", del.JobId[i]);

       Mmsg(query, cnt_File, del.JobId[i]);
       cnt.count = 0;
       db_sql_query(ua->db, query, count_handler, (void *)&cnt);
       Mmsg(query, cnt_File, del.JobId[i]);
       cnt.count = 0;
       db_sql_query(ua->db, query, count_handler, (void *)&cnt);


@@ -291,7 +291,7 @@ int prune_files(UAContext *ua, CLIENT *client)
        */
       Mmsg(query, upd_Purged, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
        */
       Mmsg(query, upd_Purged, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);

-      Dmsg1(050, "Del sql=%s\n", query);
+      Dmsg1(500, "Del sql=%s\n", query);

    }
    edit_uint64_with_commas(del.tot_ids, ed1);
    edit_uint64_with_commas(del.num_ids, ed2);
    }
    edit_uint64_with_commas(del.tot_ids, ed1);
    edit_uint64_with_commas(del.num_ids, ed2);


@@ -323,7 +323,7 @@ static int create_temp_tables(UAContext *ua)
    for (i=0; create_deltabs[i]; i++) {
       if (!db_sql_query(ua->db, create_deltabs[i], NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
    for (i=0; create_deltabs[i]; i++) {
       if (!db_sql_query(ua->db, create_deltabs[i], NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));

-         Dmsg0(050, "create DelTables table failed\n");
+         Dmsg0(500, "create DelTables table failed\n");

         return 0;
       }
    }
         return 0;
       }
    }


@@ -384,17 +384,17 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }

-      Dmsg0(050, "insert delcand failed\n");
+      Dmsg0(500, "insert delcand failed\n");

       goto bail_out;
    }
 
    /* Count Files to be deleted */
    pm_strcpy(query, cnt_DelCand);
       goto bail_out;
    }
 
    /* Count Files to be deleted */
    pm_strcpy(query, cnt_DelCand);

-   Dmsg1(100, "select sql=%s\n", query);
+   Dmsg1(500, "select sql=%s\n", query);

    cnt.count = 0;
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
       bsendmsg(ua, "%s", db_strerror(ua->db));
    cnt.count = 0;
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
       bsendmsg(ua, "%s", db_strerror(ua->db));

-      Dmsg0(050, "Count failed\n");
+      Dmsg0(500, "Count failed\n");

       goto bail_out;
    }
       
       goto bail_out;
    }
       


@@ -437,26 +437,26 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
     * Then delete the Job entry, and finally and JobMedia records.
     */
    for (i=0; i < del.num_ids; i++) {
     * Then delete the Job entry, and finally and JobMedia records.
     */
    for (i=0; i < del.num_ids; i++) {

-      Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
+      Dmsg1(500, "Delete JobId=%d\n", del.JobId[i]);

       if (!del.PurgedFiles[i]) {
         Mmsg(query, del_File, del.JobId[i]);
         if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
             bsendmsg(ua, "%s", db_strerror(ua->db));
         }
       if (!del.PurgedFiles[i]) {
         Mmsg(query, del_File, del.JobId[i]);
         if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
             bsendmsg(ua, "%s", db_strerror(ua->db));
         }

-         Dmsg1(050, "Del sql=%s\n", query);
+         Dmsg1(500, "Del sql=%s\n", query);

       }
 
       Mmsg(query, del_Job, del.JobId[i]);
       if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }
       }
 
       Mmsg(query, del_Job, del.JobId[i]);
       if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }

-      Dmsg1(050, "Del sql=%s\n", query);
+      Dmsg1(500, "Del sql=%s\n", query);

 
       Mmsg(query, del_JobMedia, del.JobId[i]);
       if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }
 
       Mmsg(query, del_JobMedia, del.JobId[i]);
       if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }

-      Dmsg1(050, "Del sql=%s\n", query);
+      Dmsg1(500, "Del sql=%s\n", query);

    }
    bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,
       del.num_ids==1?_("Job"):_("Jobs"), client->hdr.name);
    }
    bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,
       del.num_ids==1?_("Job"):_("Jobs"), client->hdr.name);


@@ -498,7 +498,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
    Mmsg(query, cnt_JobMedia, mr->MediaId);
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
       bsendmsg(ua, "%s", db_strerror(ua->db));
    Mmsg(query, cnt_JobMedia, mr->MediaId);
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
       bsendmsg(ua, "%s", db_strerror(ua->db));

-      Dmsg0(050, "Count failed\n");
+      Dmsg0(500, "Count failed\n");

       goto bail_out;
    }
       
       goto bail_out;
    }
       


@@ -527,7 +527,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));
       }

-      Dmsg0(050, "Count failed\n");
+      Dmsg0(500, "Count failed\n");

       goto bail_out;
    }
 
       goto bail_out;
    }
 


@@ -535,7 +535,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
    period = mr->VolRetention;
    now = (utime_t)time(NULL);
 
    period = mr->VolRetention;
    now = (utime_t)time(NULL);
 

-   Dmsg3(200, "Now=%d period=%d now-period=%d\n", (int)now, (int)period,
+   Dmsg3(500, "Now=%d period=%d now-period=%d\n", (int)now, (int)period,

       (int)(now-period));
 
    for (i=0; i < del.num_ids; i++) {
       (int)(now-period));
 
    for (i=0; i < del.num_ids; i++) {


@@ -543,18 +543,18 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
       if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
         continue;
       }
       if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
         continue;
       }

-      Dmsg2(200, "Looking at %s JobTdate=%d\n", jr.Job, (int)jr.JobTDate);
+      Dmsg2(500, "Looking at %s JobTdate=%d\n", jr.Job, (int)jr.JobTDate);

       if (jr.JobTDate >= (now - period)) {
         continue;
       }
       if (jr.JobTDate >= (now - period)) {
         continue;
       }

-      Dmsg2(200, "Delete JobId=%d Job=%s\n", del.JobId[i], jr.Job);
+      Dmsg2(500, "Delete JobId=%d Job=%s\n", del.JobId[i], jr.Job);

       Mmsg(query, del_File, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_Job, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_JobMedia, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_File, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_Job, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_JobMedia, del.JobId[i]);
       db_sql_query(ua->db, query, NULL, (void *)NULL);

-      Dmsg1(050, "Del sql=%s\n", query);
+      Dmsg1(500, "Del sql=%s\n", query);

       del.num_del++;
    }
    if (del.JobId) {
       del.num_del++;
    }
    if (del.JobId) {


@@ -567,7 +567,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
 
    /* If purged, mark it so */
    if (del.num_ids == del.num_del) {
 
    /* If purged, mark it so */
    if (del.num_ids == del.num_del) {

-      Dmsg0(200, "Volume is purged.\n");
+      Dmsg0(500, "Volume is purged.\n");

       stat = mark_media_purged(ua, mr);
    }
 
       stat = mark_media_purged(ua, mr);
    }
 

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 0a6fc56b0ba7a8a6bed9824eb2d0a9be704c153a..5e02da421978f64f169cfc70a61d736f3debdd44 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -407,8 +407,8 @@ static void verify_cleanup(JCR *jcr, int TermCode)
                 _("Inappropriate term code: %d %c\n"), TermCode, TermCode);
       break;
    }
                 _("Inappropriate term code: %d %c\n"), TermCode, TermCode);
       break;
    }

-   bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
-   bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
+   bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+   bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);

    if (jcr->verify_job) {
       Name = jcr->verify_job->hdr.name;
    } else {
    if (jcr->verify_job) {
       Name = jcr->verify_job->hdr.name;
    } else {

diff --git a/bacula/src/lib/btime.c b/bacula/src/lib/btime.c
index 7eb3f1fc9b59b460fcf70a29f24723888c9cad15..d77b3e679d5334af77b8ea24c4a8de710930cef8 100644 (file)
--- a/bacula/src/lib/btime.c
+++ b/bacula/src/lib/btime.c
@@ -53,6 +53,19 @@ char *bstrftime(char *dt, int maxlen, utime_t tim)
    return dt;
 }
 
    return dt;
 }
 

+/* Formatted time for user display: dd-Mon-yyyy hh:mm:ss */
+char *bstrftimes(char *dt, int maxlen, utime_t tim)
+{
+   time_t ttime = (time_t)tim;
+   struct tm tm;
+   
+   /* ***FIXME**** the format and localtime_r() should be user configurable */
+   localtime_r(&ttime, &tm);
+   strftime(dt, maxlen, "%d-%b-%Y %H:%M:%S", &tm);
+   return dt;
+}
+
+

 /* Formatted time for user display: dd-Mon hh:mm */
 char *bstrftime_ny(char *dt, int maxlen, utime_t tim)
 {
 /* Formatted time for user display: dd-Mon hh:mm */
 char *bstrftime_ny(char *dt, int maxlen, utime_t tim)
 {

diff --git a/bacula/src/lib/btime.h b/bacula/src/lib/btime.h
index 8d216124700db1ff2158e1e60f3ef5cd90cc9734..e8649eee1aab4c00454d232cd0b3115989bbe7dd 100644 (file)
--- a/bacula/src/lib/btime.h
+++ b/bacula/src/lib/btime.h
@@ -41,6 +41,7 @@ int tm_woy(time_t stime);
 
 char *bstrutime(char *dt, int maxlen, utime_t tim);
 char *bstrftime(char *dt, int maxlen, utime_t tim);
 
 char *bstrutime(char *dt, int maxlen, utime_t tim);
 char *bstrftime(char *dt, int maxlen, utime_t tim);

+char *bstrftimes(char *dt, int maxlen, utime_t tim);

 char *bstrftime_ny(char *dt, int maxlen, utime_t tim);
 char *bstrftime_nc(char *dt, int maxlen, utime_t tim);
 utime_t str_to_utime(char *str);
 char *bstrftime_ny(char *dt, int maxlen, utime_t tim);
 char *bstrftime_nc(char *dt, int maxlen, utime_t tim);
 utime_t str_to_utime(char *str);

diff --git a/bacula/src/lib/btimers.c b/bacula/src/lib/btimers.c
index 7d1a0de59baa23bde21074632003d7a35a22b9ea..994afe4d0ba8eac2d143f5244ec1a9dd44883e24 100644 (file)
--- a/bacula/src/lib/btimers.c
+++ b/bacula/src/lib/btimers.c
@@ -165,7 +165,7 @@ btimer_t *start_bsock_timer(BSOCK *bsock, uint32_t wait)
    wid->wd->interval = wait;
    register_watchdog(wid->wd);
 
    wid->wd->interval = wait;
    register_watchdog(wid->wd);
 

-   Dmsg3(50, "Start thread timer %p tip %p for %d secs.\n", wid, wid->tid, wait);
+   Dmsg3(50, "Start bsock timer %p tip %p for %d secs.\n", wid, wid->tid, wait);

 
    return wid;
 }
 
    return wid;
 }

diff --git a/bacula/src/lib/watchdog.c b/bacula/src/lib/watchdog.c
index f3d08b7485738a6444ce1874cf0c755b2cb57e01..e33bb1ca219b5fffd6eb94fa6351039713a2e194 100755 (executable)
--- a/bacula/src/lib/watchdog.c
+++ b/bacula/src/lib/watchdog.c
@@ -234,7 +234,7 @@ extern "C" void *watchdog_thread(void *arg)
    Dmsg0(400, "NicB-reworked watchdog thread entered\n");
 
    while (!quit) {
    Dmsg0(400, "NicB-reworked watchdog thread entered\n");
 
    while (!quit) {

-      watchdog_t *p, *q;
+      watchdog_t *p;   

 
       /* 
        * We lock the jcr chain here because a good number of the
 
       /* 
        * We lock the jcr chain here because a good number of the


@@ -247,9 +247,10 @@ extern "C" void *watchdog_thread(void *arg)
        */
       lock_jcr_chain();
       wd_lock();
        */
       lock_jcr_chain();
       wd_lock();

+
+walk_list:

       watchdog_time = time(NULL);
       next_time = watchdog_time + watchdog_sleep_time;
       watchdog_time = time(NULL);
       next_time = watchdog_time + watchdog_sleep_time;

-

       foreach_dlist(p, wd_queue) {
         if (p->next_fire <= watchdog_time) {
            /* Run the callback */
       foreach_dlist(p, wd_queue) {
         if (p->next_fire <= watchdog_time) {
            /* Run the callback */


@@ -257,17 +258,9 @@ extern "C" void *watchdog_thread(void *arg)
 
             /* Reschedule (or move to inactive list if it's a one-shot timer) */
            if (p->one_shot) {
 
             /* Reschedule (or move to inactive list if it's a one-shot timer) */
            if (p->one_shot) {

-              /* 
-               * Note, when removing an item while walking the list
-               *  we must get the previous pointer (q) and set the
-               *  current pointer (p) to this previous pointer after
-                *  removing the current pointer, otherwise, we won't
-               *  walk the rest of the list.
-               */
-              q = (watchdog_t *)wd_queue->prev(p);

               wd_queue->remove(p);
               wd_inactive->append(p);
               wd_queue->remove(p);
               wd_inactive->append(p);

-              p = q;
+              goto walk_list;

            } else {
               p->next_fire = watchdog_time + p->interval;
            }
            } else {
               p->next_fire = watchdog_time + p->interval;
            }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index b42ff04d8af329e93c4e37a8ec112644a699a57a..c6655b1d7f3c77938a6fcb5a7a7ba577a63d2dbf 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 /* */
 #undef  VERSION

-#define VERSION "1.36.1"
-#define BDATE   "20 November 2004"
-#define LSMDATE "20Nov04"
+#define VERSION "1.37.1"
+#define BDATE   "21 November 2004"
+#define LSMDATE "21Nov04"

 
 /* Debug flags */
 #undef  DEBUG
 
 /* Debug flags */
 #undef  DEBUG

diff --git a/bacula/updatedb/update_mysql_tables_7_to_8 b/bacula/updatedb/update_mysql_tables_7_to_8
index 8e41e871f5ba648d2b3c33680f7d7cb76b3266ff..a98729474f328717e9608901311ac930722ed945 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_7_to_8
+++ b/bacula/updatedb/update_mysql_tables_7_to_8
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 #
 # Shell script to update MySQL tables from version 1.34 to 1.35.5
 #
 #
 # Shell script to update MySQL tables from version 1.34 to 1.35.5
 #


@@ -7,9 +7,27 @@ echo "This script will update a Bacula MySQL database from version 7 to 8"
 echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "
 echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "

-bindir=/home/kern/bacula/depkgs/sqlite
+bindir=/usr/bin

 
 

-if $bindir/mysql $* -f <<END-OF-DATA
+DB_VER="$bindir/mysql $* bacula -e 'select * from Version;'|tail -n 1 2>/dev/null"
+if [ -z "$DB_VER" ]; then
+       echo "Sorry, I can't seem to locate a bacula database."
+       exit 1
+fi
+
+if [ -n "$DB_VER" ]; then
+
+       if [ "$DB_VER" = "8" ]; then
+               echo "The Catalog is already at version 8. Nothing to do!"
+               exit 0
+       elif [ "$DB_VER" -ne "7" ]; then
+               echo "Sorry, this script is designed to update a version 7 database"
+               echo "and you have a version $DB_VER database."
+               exit 1
+       fi
+fi
+
+if $bindir/mysql $* -f << END_OF_DATA

 USE bacula;
 
 ALTER TABLE Media ADD COLUMN EndFile INTEGER UNSIGNED NOT NULL DEFAULT 0;
 USE bacula;
 
 ALTER TABLE Media ADD COLUMN EndFile INTEGER UNSIGNED NOT NULL DEFAULT 0;


@@ -22,10 +40,11 @@ UPDATE Filename SET Name='' WHERE Name=' ';
 DELETE FROM Version;
 INSERT INTO Version (VersionId) VALUES (8);
 
 DELETE FROM Version;
 INSERT INTO Version (VersionId) VALUES (8);
 

-END-OF-DATA
+END_OF_DATA

 then
    echo "Update of Bacula MySQL tables succeeded."
 else
    echo "Update of Bacula MySQL tables failed."
 fi
 then
    echo "Update of Bacula MySQL tables succeeded."
 else
    echo "Update of Bacula MySQL tables failed."
 fi

+

 exit 0
 exit 0

diff --git a/bacula/updatedb/update_postgresql_tables_7_to_8 b/bacula/updatedb/update_postgresql_tables_7_to_8
index 4c821ab6d60f32cb550475b2340c98eccee7fa2d..2aae66a8f782dba157c423bb7fdb4e53cc0c0548 100755 (executable)
--- a/bacula/updatedb/update_postgresql_tables_7_to_8
+++ b/bacula/updatedb/update_postgresql_tables_7_to_8
@@ -7,15 +7,34 @@ echo "This script will update a Bacula PostgreSQL database from version 7 to 8"
 echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "
 echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "

-bindir=/home/kern/bacula/depkgs/sqlite
+bindir=/usr/bin

 
 

-if $bindir/psql $* -f - <<END-OF-DATA
+DB_VER="`echo -e '\\c bacula\nselect * from Version;' | $bindir/psql $* bacula -f - | tail -n 1 2>/dev/null`"
+if [ -z "$DB_VER" ]; then
+       echo "Sorry, I can't seem to locate a bacula database."
+       exit 1
+fi
+
+if [ -n "$DB_VER" ]; then
+
+       if [ "$DB_VER" = "8" ]; then
+               echo "The Catalog is already at version 8. Nothing to do!"
+               exit 0
+       elif [ "$DB_VER" -ne "7" ]; then
+               echo "Sorry, this script is designed to update a version 7 database"
+               echo "and you have a version $DB_VER database."
+               exit 1
+       fi
+fi
+
+
+if $bindir/psql $* -f - <<END_OF_DATA

 \c bacula
 
 ALTER TABLE media ADD COLUMN EndFile integer;
 UPDATE media SET EndFile=0;
 ALTER TABLE media ALTER COLUMN EndFile SET NOT NULL;
 \c bacula
 
 ALTER TABLE media ADD COLUMN EndFile integer;
 UPDATE media SET EndFile=0;
 ALTER TABLE media ALTER COLUMN EndFile SET NOT NULL;

-ALTER TABLE media ADD COLUMN EndBlock integer;
+ALTER TABLE media ADD COLUMN EndBlock bigint;

 UPDATE media SET EndBlock=0;
 ALTER TABLE media ALTER COLUMN EndBlock SET NOT NULL;
 
 UPDATE media SET EndBlock=0;
 ALTER TABLE media ALTER COLUMN EndBlock SET NOT NULL;
 


@@ -44,7 +63,7 @@ create table CDImages
 
 vacuum;
 
 
 vacuum;
 

-END-OF-DATA
+END_OF_DATA

 then
    echo "Update of Bacula PostgreSQL tables succeeded."
 else
 then
    echo "Update of Bacula PostgreSQL tables succeeded."
 else

diff --git a/bacula/updatedb/update_sqlite_tables_7_to_8 b/bacula/updatedb/update_sqlite_tables_7_to_8
index 18823cc4abf4752fb75e8a3c714493f29edb21f4..15ddd3f4bf0680f5ec4b3412fee2c613b8041a51 100755 (executable)
--- a/bacula/updatedb/update_sqlite_tables_7_to_8
+++ b/bacula/updatedb/update_sqlite_tables_7_to_8
@@ -8,10 +8,38 @@ echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "
 
 echo "this script may take several minutes to run."
 echo " "
 

-bindir=/home/kern/bacula/depkgs/sqlite
-cd /home/kern/bacula/working
+bindir=/usr/bin

 
 

-$bindir/sqlite $* bacula.db <<END-OF-DATA
+# The location of your bacula working directory
+workdir=/var/lib/bacula
+
+
+cd $workdir
+
+if [ ! -r bacula.db -o ! -s bacula.db ];then
+       echo "Sorry, can't find a Bacula DB. Aborting."
+       exit 1
+fi
+
+DB_VER="`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -1 2>/dev/null`"
+if [ -n "$DB_VER" ]; then
+
+       if [ "$DB_VER" = "8" ]; then
+               echo "The Catalog is already at version 8. Nothing to do!"
+               exit 0
+       elif [ "$DB_VER" -ne "7" ]; then
+               echo "Sorry, this script is designed to update a version 7 database"
+               echo "and you have a version $DB_VER database."
+               exit 1
+       fi
+
+else
+        echo "Sorry, I can't seem to locate a bacula database."
+        exit 1
+fi
+
+
+$bindir/sqlite $* bacula.db <<END_OF_DATA

 
 BEGIN TRANSACTION;
 CREATE TEMPORARY TABLE Media_backup (
 
 BEGIN TRANSACTION;
 CREATE TEMPORARY TABLE Media_backup (


@@ -118,4 +146,4 @@ UPDATE Filename SET Name='' WHERE Name=' ';
 DELETE FROM Version;
 INSERT INTO Version (VersionId) VALUES (8);
 
 DELETE FROM Version;
 INSERT INTO Version (VersionId) VALUES (8);
 

-END-OF-DATA
+END_OF_DATA