Add a test for error return from bnet_wait... in heartbeat.c

  in FD to avoid CPU loop.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 94a37d23b135af9f1be9ef58b51a35df78041b03..918d932f65192bac8fdf457b3990f10723e6e058 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -10,25 +10,56 @@ VSS                         Thorsten Engel (in beta testing)
 Version 1.37                Kern (see below)
 ========================================================
 
-1.37 Major Projects:
+Final items for 1.37 before release:
+- --without-openssl breaks at least on Solaris.
+1. Fix the remaining bugs that I am aware of and new ones that come up 
+    during testing.
+3. Document all the new features (about half done).
+6. Build and test the Volume Shadow Copy (VSS) for Win32. 
+7. Write a bacula-web document
+8. Take one more try at making DVD writing work.
+9. Run the regression scripts on Solaris and FreeBSD
+
+Document:
+- Document cleaning up the spool files.
+- Add better documentation on how restores can be done
+- Document details of ANSI/IBM labels
+- Document that Bootstrap files can be written with cataloging
+  turned off.
+- Pruning with Admin job.
+- OS linux 2.4
+  1) ADIC, DLT, FastStor 4000, 7*20GB
+  2) Sun, DDS, (Suns name unknown - Archive Python DDS drive), 1.2GB
+  3) Wangtek, QIC, 6525ES, 525MB (fixed block size 1k, block size etc. 
+  driver dependent - aic7xxx works, ncr53c8xx with problems)
+  4) HP, DDS-2, C1553A, 6*4GB
+- Doc the following
+  to activate, check or disable the hardware compression feature on my 
+  exb-8900 i use the exabyte "MammothTool" you can get it here:
+  http://www.exabyte.com/support/online/downloads/index.cfm
+  There is a solaris version of this tool. With option -C 0 or 1 you can 
+  disable or activate compression. Start this tool without any options for 
+  a small reference.
+- Linux Sony LIB-D81, AIT-3 library works.
+- Document PostgreSQL performance problems bug 131.
+- Document testing
+- Document that ChangerDevice is used for Alert command.
+- Document new CDROM directory.
+- Document Heartbeat Interval in the dealing with firewalls section.
+- Document the multiple-drive-changer.txt script.
+
+
+1.xx Major Projects:
 #3   Migration (Move, Copy, Archive Jobs)
      (probably not this version)
 #7   Single Job Writing to Multiple Storage Devices
      (probably not this version)
 
-##   Create a new GUI chapter explaining all the GUI programs.
-
-Autochangers:
--    Make "update slots" when pointing to Autochanger, remove
-     all Volumes from other drives.  "update slots all-drives"?
-
-For 1.37:
+For 1.39:
 - update volume=xxx --- add status=Full
 - Remove old spool files on startup.
 - Exclude SD spool/working directory.
-- Finish TLS implementation.
 - Refuse to prune last valid Full backup. Same goes for Catalog.
-- --without-openssl breaks at least on Solaris.
 - Python:
   - Make a callback when Rerun failed levels is called.
   - Give Python program access to Scheduled jobs.
@@ -47,35 +78,7 @@ For 1.37:
   resources were locked. 
 - The last part is left in the spool dir.
 
-Document:
-- Port limiting -m in iptables to prevent DoS attacks
-  could cause broken pipes on Bacula.
-- Document that Bootstrap files can be written with cataloging
-  turned off.
-- Pruning with Admin job.
-- Add better documentation on how restores can be done
-- OS linux 2.4
-  1) ADIC, DLT, FastStor 4000, 7*20GB
-  2) Sun, DDS, (Suns name unknown - Archive Python DDS drive), 1.2GB
-  3) Wangtek, QIC, 6525ES, 525MB (fixed block size 1k, block size etc. 
-  driver dependent - aic7xxx works, ncr53c8xx with problems)
-  4) HP, DDS-2, C1553A, 6*4GB
-- Doc the following
-  to activate, check or disable the hardware compression feature on my 
-  exb-8900 i use the exabyte "MammothTool" you can get it here:
-  http://www.exabyte.com/support/online/downloads/index.cfm
-  There is a solaris version of this tool. With option -C 0 or 1 you can 
-  disable or activate compression. Start this tool without any options for 
-  a small reference.
-- Linux Sony LIB-D81, AIT-3 library works.
-- Document PostgreSQL performance problems bug 131.
-- Document testing
-- Document that ChangerDevice is used for Alert command.
-- Document new CDROM directory.
-- Document Heartbeat Interval in the dealing with firewalls section.
-- Document the multiple-drive-changer.txt script.
 
-Maybe in 1.37:
 - In restore don't compare byte count on a raw device -- directory
   entry does not contain bytes.
 - To mark files as deleted, run essentially a Verify to disk, and
@@ -1346,4 +1349,11 @@ Block Position: 0
   1997 Volume "DLT-13Feb04" not in catalog.
   04-Jul 13:01 MainSD: Please mount Volume "DLT-04Jul05" on Storage Device 
      "HP DLT 80" (/dev/nst0) for Job Rufus.2005-07-04_01.05.02
-
+##   Create a new GUI chapter explaining all the GUI programs.
+-    Make "update slots" when pointing to Autochanger, remove
+     all Volumes from other drives.  "update slots all-drives"?
+     No, this is done by modifying mtx-changer to list what is
+     in the drives.
+- Finish TLS implementation.
+- Port limiting -m in iptables to prevent DoS attacks
+  could cause broken pipes on Bacula.

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 3c649f87ab413bd434df44d58644819550e1bd37..4b01474a426d793a536abd59b8e0df9f9f186689 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -5,6 +5,8 @@ General:
 
 Changes to 1.37.28:
 09Jul05
+- Add a test for error return from bnet_wait... in heartbeat.c
+  in FD to avoid CPU loop.
 - Implement TLS in gnome console and wx-console.
 08Jul05
 - Correct a NULL pointer reference in the mount command.

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index 7432dafd4b7044008ef5165295025593310f2d60..23f72eca85e9519fd7015d1f991c1a773448b3b5 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -74,7 +74,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
             last_heartbeat = now;
          }
       }
-      if (is_bnet_stop(sd)) {
+      if (n < 0 || is_bnet_stop(sd)) {
          break;
       }
       if (n == 1) {                   /* input waiting */
@@ -85,7 +85,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
             Dmsg2(100, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
          }
       }
-      Dmsg2(000, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
+      Dmsg2(100, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
    }
    bnet_close(sd);
    bnet_close(dir);