- Inhibit printing of FileSet for a restore as it is misleading.

- Cleaned up a number of minor scripting problems with the CDROM
  creation.
- Fixed a race condition causing a Director crash on termination,
  if a large number of SIGHUPs were sent during a multiple concurrent
  set of backups.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index eda59bac150f53b8d460d034b565b83551ab69d1..7482507aee3791a296c519d929c35915d3f1bbe1 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -58,6 +58,49 @@ Documentation to do: (any release a little bit at a time)
 - Lookup HP tape replacement recommendations (see trouble shooting autochanger)
 - Add more obvious documentation of @ for conf files.
 - Document doing table repair
+- New IP address specification is used as follows:
+    [sdaddresses|diraddresses|fdaddresses] = { [[ip|ipv4|ipv6] = { 
+           [[addr|port] = [^ ]+[\n;]+] }] }
+
+  so it could look for example like this:
+     SDaddresses  = { ip = {
+            addr = 1.2.3.4; port = 1205; }
+        ipv4 = {
+            addr = 1.2.3.4; port = http; }
+        ipv6 = {
+            addr = 1.2.3.4;
+            port = 1205;
+        }
+        ip = {
+            addr = 1.2.3.4
+            port = 1205
+        }
+        ip = {
+            addr = 1.2.3.4
+        }
+        ip = {
+            addr = 201:220:222::2
+        }
+        ip = {
+            addr = bluedot.thun.net
+        }
+     }
+  as a consequence, you can now specify multiple IP addresses and
+  ports to be used. In the case of a server, it will listen on
+  all those that you specify. In the case of connecting to the server,
+  Bacula will attempt connecting to one at a time until it succeeds.
+  And, in a few other special cases, Bacula will use only the first
+  address specified.
+
+  The default port numbers are still the same and the services and hosts 
+  are also resolved by name. So now  you could use the real names for the 
+  port numbers.
+
+  An ip section will allow resolution to either an ipv4 or an ipv6 address.
+  An ipv4 section forces the resolution to be only ipv4, and an ipv6 section
+  forces the resolution to be only ipv6.
+
+  
           
 Testing to do: (painful)
 
@@ -69,6 +112,55 @@ For 1.37 Testing/Documentation:
 - If you use restore replace=never, the directory attributes for
   non-existent directories will not be restored properly.
 
+Fix:
+   Kern,
+
+   mt status and tapeinfo output are attached. Default blocksize was
+   originally 512 bytes. I ran the following test on my machine:
+
+   - set defblksize to 512
+   - started bacula, labelled tape, ran job
+   - job completes with the following in log
+           SD termination status:  OK
+           Termination:            Backup OK
+   - restore attempts with blocksize set to 0 or 512 result in the familiar
+           "Volume data error! Wanted block-id BB02, got . Buffer discarded."
+
+
+   # tapeinfo -f /dev/sg0
+   Product Type: Tape Drive
+   Vendor ID: 'SONY    '
+   Product ID: 'TSL-11000       '
+   Revision: 'L100'
+   Attached Changer: Yes
+   SerialNumber: '0010000443'
+   MinBlock:1
+   MaxBlock:16777215
+   SCSI ID: 1
+   SCSI LUN: 0
+   Ready: yes
+   BufferedMode: yes
+   Medium Type: Not Loaded
+   Density Code: 0x26
+   BlockSize: 512
+   DataCompEnabled: no
+   DataCompCapable: yes
+   DataDeCompEnabled: yes
+   CompType: 0x20
+   DeCompType: 0x20
+   BOP: yes
+   Block Position: 0
+
+   # mt -f /dev/nst0 status
+   SCSI 2 tape drive:
+   File number=0, block number=132, partition=0.
+   Tape block size 512 bytes. Density code 0x26 (DDS-4 or QIC-4GB).
+   Soft error count since last status=0
+   General status bits on (1010000):
+    ONLINE IM_REP_EN
+
+
+
 Wish list:  
 - see lzma401.zip in others directory for new compression
   algorithm/library.

diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index 4f02bf6648925d1a750f60d1c8887973b86b035c..fcf5acc76e22a908807bc42c33e9079501a8aae5 100644 (file)
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -534,7 +534,6 @@ JobName:    %s\n\
 Bootstrap:  %s\n\
 Where:      %s\n\
 Replace:    %s\n\
-FileSet:    %s\n\
 Client:     %s\n\
 Storage:    %s\n\
 JobId:      %s\n\
@@ -544,7 +543,6 @@ Priority:   %d\n"),
              NPRT(jcr->RestoreBootstrap),
              jcr->where?jcr->where:NPRT(job->RestoreWhere),
              replace,
-             jcr->fileset->hdr.name,
              jcr->client->hdr.name,
              jcr->store->hdr.name, 
               jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1), 

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 8519389e9f2c1560bc9f60cbf7dc4a0f1e09c004..74cb46a2b9a0f762f5399200c8d613cb621c89e4 100755 (executable)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -87,6 +87,8 @@ static bool trace = false;
 
 /* Static storage */
 
+/* Used to allow only one thread close the daemon messages at a time */
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static MSGS *daemon_msgs;             /* global messages */
 
 /* Define if e_msg must exit when M_ERROR_TERM is received */
@@ -416,6 +418,7 @@ void close_msg(JCR *jcr)
 
    if (jcr == NULL) {               /* NULL -> global chain */
       msgs = daemon_msgs;
+      P(mutex);                      /* only one thread walking the chain */
    } else {
       msgs = jcr->jcr_msgs;
       jcr->jcr_msgs = NULL;
@@ -502,6 +505,8 @@ rem_temp_file:
    if (jcr) {
       free_msgs_res(msgs);
       msgs = NULL;
+   } else {
+      V(mutex);
    }
    Dmsg0(150, "===End close msg resource\n");
 }