Doc updates

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index c0bee215b817d441548291a258e115eeded71d06..ed9bfd6628892bb546a2b0ef3030dd43822785d9 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,6 @@
 
+
+
 2004-04-06 Version 1.34.0 06Apr04 Release
 06Apr04
 - Turn of SIGQUIT in console.

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index c94374a8099508ed0a9fa9d0b72635e86899af58..64f5635c3cfce068627c314ba35dd7f554298349 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -367,7 +367,9 @@ if test x$support_readline = xyes; then
               CONS_LIBS="-lreadline -ltermcap"
               got_readline="yes"   
             ],
-            [ AC_MSG_ERROR([*** readline library missing]) 
+            [ echo " "
+              echo "readline.h not found. readline turned off ..."
+              echo " "
             ]
          )
          ;;
@@ -389,7 +391,9 @@ if test x$support_readline = xyes; then
                 CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
                 PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
              ],
-             [ AC_MSG_ERROR([*** readline library missing]) 
+             [ echo " "
+               echo "readline.h not found. readline turned off ..."
+               echo " "
              ]
            )
         ]

diff --git a/bacula/configure b/bacula/configure
index e2b28b9d9af3774040274ad1cf887be04164aa4e..768ed8decb507b23b33dbfc673f5f8fd083b2c4c 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -5514,9 +5514,9 @@ _ACEOF
               got_readline="yes"
 
 else
-   { { echo "$as_me:$LINENO: error: *** readline library missing" >&5
-echo "$as_me: error: *** readline library missing" >&2;}
-   { (exit 1); exit 1; }; }
+   echo " "
+              echo "readline.h not found. readline turned off ..."
+              echo " "
 
 
 fi
@@ -5811,9 +5811,9 @@ _ACEOF
                 PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
 
 else
-   { { echo "$as_me:$LINENO: error: *** readline library missing" >&5
-echo "$as_me: error: *** readline library missing" >&2;}
-   { (exit 1); exit 1; }; }
+   echo " "
+               echo "readline.h not found. readline turned off ..."
+               echo " "
 
 
 fi

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 3158e4d187f414f7e02c410255060ff2d28ebe71..78d649fbc7d676ec4daa60ab24d36b9e52df46d8 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -37,6 +37,11 @@ For 1.33 Testing/Documentation:
 - If you use restore replace=never, the directory attributes for
   non-existent directories will not be restored properly.
 
+1.34 Cleanup
+- Add ms disk example
+- Add multiple-media-types.txt
+- look at mxt-changer.html
+
 For version 1.35:
 - Finish SIGHUP work.
 - Check that all change in wait status in the SD are        

diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in
index 3c81697d89de68e0950dbc110f08e6bc43473f56..8c89385368b65cf1ee96f68570969c47fa73ad2d 100755 (executable)
--- a/bacula/src/cats/update_sqlite_tables.in
+++ b/bacula/src/cats/update_sqlite_tables.in
@@ -97,7 +97,7 @@ INSERT INTO Media (
    VolRetention, VolUseDuration, MaxVolJobs,
    MaxVolFiles, MaxVolBytes,
    InChanger, MediaAddressing,
-   VolReadTime, VolWriteTime,
+   VolReadTime, VolWriteTime)
    SELECT * FROM Media_backup;
 
 DROP TABLE Media_backup;

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 19e46c95ebd85eac08d5e74b65413f82b0aa73b7..4e79cc230bf1fd779998d4e6ab4b2aecb724b472 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -374,9 +374,8 @@ static void list_scheduled_jobs(UAContext *ua)
    UnlockRes();
    if (num_jobs == 0) {
       bsendmsg(ua, _("No Scheduled Jobs.\n"));
-   } else {
-      bsendmsg(ua, "\n");
-   }
+   } 
+   bsendmsg(ua, "====\n");
    Dmsg0(200, "Leave list_sched_jobs_runs()\n");
 }
 
@@ -390,7 +389,7 @@ static void list_running_jobs(UAContext *ua)
    bool pool_mem = false;
 
    Dmsg0(200, "enter list_run_jobs()\n");
-   bsendmsg(ua, _("\nRunning Jobs:\n"));
+   bsendmsg(ua, _("Running Jobs:\n"));
    lock_jcr_chain();
    foreach_jcr(jcr) {
       njobs++;

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 6647df43a75d099fa63027c8cef82f22e0c9c8e6..e2b2e97784c7ccb06d1dbdc4059fbdecca60e7cc 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -68,10 +68,11 @@ void list_spool_stats(BSOCK *bs)
    char ed1[30], ed2[30];
    bnet_fsend(bs, "Data spooling: %d active jobs %s bytes; %d total jobs %s max bytes/job.\n",
       spool_stats.data_jobs, edit_uint64_with_commas(spool_stats.data_size, ed1),
-      spool_stats.total_data_jobs, edit_uint64_with_commas(spool_stats.max_data_size, ed2));
+      spool_stats.total_data_jobs, 
+      edit_uint64_with_commas(spool_stats.max_data_size, ed2));
    bnet_fsend(bs, "Attr spooling: %d active jobs; %d total jobs %s max bytes/job.\n",
-      spool_stats.attr_jobs, 
-      spool_stats.total_attr_jobs, edit_uint64_with_commas(spool_stats.max_attr_size, ed2));
+      spool_stats.attr_jobs, spool_stats.total_attr_jobs, 
+      edit_uint64_with_commas(spool_stats.max_attr_size, ed1));
 }
 
 bool begin_data_spool(JCR *jcr)
@@ -142,30 +143,33 @@ static bool open_data_spool_file(JCR *jcr)
       Jmsg(jcr, M_ERROR, 0, _("Open data spool file %s failed: ERR=%s\n"), name, strerror(errno));
       free_pool_memory(name);
       return false;
-    }
-    Dmsg1(100, "Created spool file: %s\n", name);
-    free_pool_memory(name);
-    return true;
+   }
+   Dmsg1(100, "Created spool file: %s\n", name);
+   free_pool_memory(name);
+   return true;
 }
 
 static bool close_data_spool_file(JCR *jcr)
 {
-    POOLMEM *name  = get_pool_memory(PM_MESSAGE);
+   POOLMEM *name  = get_pool_memory(PM_MESSAGE);
 
-    P(mutex);
-    spool_stats.data_jobs--;
-    spool_stats.total_data_jobs++;
-    spool_stats.data_size -= jcr->dcr->spool_size;
-    V(mutex);
+   P(mutex);
+   spool_stats.data_jobs--;
+   spool_stats.total_data_jobs++;
+   spool_stats.data_size -= jcr->dcr->spool_size;
+   if (spool_stats.data_size < 0) {
+      spool_stats.data_size = 0;
+   }
+   V(mutex);
 
-    make_unique_data_spool_filename(jcr, &name);
-    close(jcr->dcr->spool_fd);
-    jcr->dcr->spool_fd = -1;
-    jcr->dcr->spooling = false;
-    unlink(name);
-    Dmsg1(100, "Deleted spool file: %s\n", name);
-    free_pool_memory(name);
-    return true;
+   make_unique_data_spool_filename(jcr, &name);
+   close(jcr->dcr->spool_fd);
+   jcr->dcr->spool_fd = -1;
+   jcr->dcr->spooling = false;
+   unlink(name);
+   Dmsg1(100, "Deleted spool file: %s\n", name);
+   free_pool_memory(name);
+   return true;
 }
 
 static bool despool_data(DCR *dcr)
@@ -221,6 +225,9 @@ static bool despool_data(DCR *dcr)
 
    P(mutex);
    spool_stats.data_size -= dcr->spool_size;
+   if (spool_stats.data_size < 0) {
+      spool_stats.data_size = 0;
+   }
    V(mutex);
    P(dcr->dev->spool_mutex);
    dcr->dev->spool_size -= dcr->spool_size;
@@ -323,6 +330,7 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block)
    }
    V(mutex);
    if (despool) {
+#ifdef xDEBUG 
       char ec1[30], ec2[30], ec3[30], ec4[30];
       Dmsg4(100, "Despool in write_block_to_spool_file max_size=%s size=%s "
             "max_job_size=%s job_size=%s\n", 
@@ -330,6 +338,7 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block)
            edit_uint64_with_commas(dcr->spool_size, ec2),
            edit_uint64_with_commas(dcr->dev->max_spool_size, ec3),
            edit_uint64_with_commas(dcr->dev->spool_size, ec4));
+#endif
       Jmsg(dcr->jcr, M_INFO, 0, _("User specified spool size reached. Despooling ...\n"));
       if (!despool_data(dcr)) {
          Dmsg0(000, "Bad return from despool in write_block.\n");

diff --git a/bacula/updatedb/update_sqlite_tables_6_to_7 b/bacula/updatedb/update_sqlite_tables_6_to_7
index 5dfd0ba9c1b6e157625eb9d13e87d8408879bcd5..f5ad8884b19fc0b2eb44f1dc2b7eb07525b9ce84 100755 (executable)
--- a/bacula/updatedb/update_sqlite_tables_6_to_7
+++ b/bacula/updatedb/update_sqlite_tables_6_to_7
@@ -14,15 +14,15 @@ bindir=/usr/lib/sqlite
 cd /var/bacula
 
 if [ -s bacula.db ];then
-       DB_VER=`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -n 1 2>/dev/null`
-       if [ -n "$DB_VER" ] && [ "$DB_VER" -ne "6" ]; then
-               echo "Sorry, this script is designed to update a version 6 database"
-               echo "and you have a version $DB_VER database."
-               exit 1
-       fi
+        DB_VER=`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -n 1 2>/dev/null`
+        if [ -n "$DB_VER" ] && [ "$DB_VER" -ne "6" ]; then
+                echo "Sorry, this script is designed to update a version 6 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
+        echo "Sorry, I can't seem to locate a bacula database."
+        exit 1
 fi
 
 $bindir/sqlite $* bacula.db <<END-OF-DATA
@@ -112,7 +112,7 @@ INSERT INTO Media (
    VolRetention, VolUseDuration, MaxVolJobs,
    MaxVolFiles, MaxVolBytes,
    InChanger, MediaAddressing,
-   VolReadTime, VolWriteTime,
+   VolReadTime, VolWriteTime)
    SELECT * FROM Media_backup;
 
 DROP TABLE Media_backup;