From ff1193b61a5c5e2de1024ff519978a5a73818670 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 23 Jun 2003 13:30:30 +0000
Subject: [PATCH] Cosmetics for Recyle Oldest Volume

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@606 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/ReleaseNotes        | 1 +
 bacula/kernstodo           | 9 ++++++++-
 bacula/src/cats/sql_find.c | 2 +-
 bacula/src/dird/catreq.c   | 2 +-
 bacula/src/version.h       | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index cd7ea3caad..f34f01dfcc 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -23,6 +23,7 @@ Major Changes this Release:
 
 
 Other Changes this Release:
+- Restore checks block numbers to ensure that no block is lost.
 - The new console var command allows testing variable expansion
   used in automatic tape name generation.
 - The new console estimate command allows you to test FileSets
diff --git a/bacula/kernstodo b/bacula/kernstodo
index a877eb8e00..d4dd548770 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  18 June 2003 
+                  22 June 2003 
 
 Documentation to do: (any release a little bit at a time)
 - Document running a test version.
@@ -34,6 +34,13 @@ Testing to do: (painful)
 - Figure out how to use ssh or stunnel to protect Bacula communications.
 
 For 1.31 release:
+- Check that Block number in JobMedia are correct.
+- Complain if record dropped in bnet_recv because too long.
+- Suppress Job Name in Jmsg for console
+- Check Jmsg in bnet, may not work, must dup bsock.
+- Use SD returned values in report -- or add them.
+- Increment DB version prior to releasing.
+- Turn off FULL_DEBUG prior to releasing.
 - Implement forward spacing block/file: position_device(bsr) --
   just before read_block_from_device();
 - On Windows with very long path names, it may be impossible to create 
diff --git a/bacula/src/cats/sql_find.c b/bacula/src/cats/sql_find.c
index b83d06fe72..7a29ac141b 100644
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -214,7 +214,7 @@ db_find_next_volume(JCR *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
 "FirstWritten,LastWritten "
 "FROM Media WHERE PoolId=%u AND MediaType='%s' AND VolStatus IN ('Full',"
 "'Recycle','Purged','Used','Append') "
-"ORDER BY LastWritten", mr->PoolId, mr->MediaType); 
+"ORDER BY LastWritten LIMIT 1", mr->PoolId, mr->MediaType); 
      item = 1;
    } else {
       /* Find next available volume */
diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index a003df9631..e2083a30ae 100644
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -118,7 +118,7 @@ next_volume:
                Dmsg0(400, "Try purge.\n");
 	       /* Try to purge oldest volume */
 	       ua = new_ua_context(jcr);
-               Jmsg(jcr, M_INFO, 0, _("Purging oldest volume \"%s\"\n"), mr.VolumeName);
+               Jmsg(jcr, M_INFO, 0, _("Recycling oldest volume \"%s\"\n"), mr.VolumeName);
 	       ok = purge_jobs_from_volume(ua, &mr);
 	       free_ua_context(ua);
 	       if (ok) {
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 59137f6c30..d11ad29c99 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.31"
 #define VSTRING "1"
-#define BDATE   "21 Jun 2003"
-#define LSMDATE "21Jun03"
+#define BDATE   "22 Jun 2003"
+#define LSMDATE "22Jun03"
 
 /* Debug flags */
 #define DEBUG 1
-- 
2.39.5