[pkg-bacula-commits] [bacula] 04/04: Imported Upstream version 9.0.3+dfsg
Carsten Leonhardt
leo at moszumanska.debian.org
Mon Aug 14 19:26:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch upstream
in repository bacula.
commit 514cffffdcb625936ce8d781fbd02b5da4527e41
Author: Carsten Leonhardt <leo at debian.org>
Date: Mon Aug 14 21:25:24 2017 +0200
Imported Upstream version 9.0.3+dfsg
---
ChangeLog | 51 ++++++++++++++++++++++++++++++++++++++++++++++-
ReleaseNotes | 37 +++++++++++++++++++++++++++++++++-
src/dird/ua_cmds.c | 7 ++-----
src/dird/verify.c | 8 +++++++-
src/lib/bsys.c | 2 +-
src/plugins/fd/bpipe-fd.c | 2 +-
src/stored/reserve.c | 4 ++--
src/version.h | 6 +++---
8 files changed, 102 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75cf0ed..951ff1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,54 @@
- Changelog on version 9.0.2
+ Changelog on version 9.0.3
+Release 9.0.3
+
+
+06Aug17
+ - baculum: Fix access denied error on api install wizard page
+ - baculum: Remove assigning to api host when user is deleted
+ - baculum: Fix empty admin setting
+ - baculum: Add ability to assign host to specific user
+ - baculum: Fix bconsole test connection for new api host that works with new
+ director
+
+05Aug17
+ - baculum: Fix sqlite db support
+
+03Aug17
+ - Fix bug #2301 Solaris Available space incorrectly reported by turning off the
+ output for Solaris
+ - Fix bug #2300 mount/unmount/release of single tape drive does not work
+
+01Aug17
+ - baculum: Fix bconsole connection test in config wizard
+ - baculum: Fix writing config for schedule and message names with space
+
+31Jul17
+ - bpipe: Fix compiler warning
+ - baculum: Fix drag & drop file version elements
+
+30Jul17
+ - baculum: Add fileset info endpoint and use it in restore wizard
+ - baculum: Use client name instead of clientid and start using fileset to
+ prepare restore tree
+ - baculum: Remove fileset parameter from run restore
+ - baculum: Fix lstat regex pattern
+ - baculum: Get the most recent jobs by client and fileset or by clientid and
+ filesetid
+ - Fix: bug #3048: jobs are stuck in endless loop in reserve.c
+ - Add total time to test.out file
+
+29Jul17
+ - baculum: Add restore job selection in restore job wizard
+
+26Jul17
+ - Enhance verify job report from bug 2249
+
+Bugs fixed/closed since last release:
+2300 2301 3048
+
+
+======================================================
Release 9.0.2
23Jul17
diff --git a/ReleaseNotes b/ReleaseNotes
index 669f098..282259f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,5 +1,40 @@
- Release Notes for Bacula 9.0.2
+ Release Notes for Bacula 9.0.3
+
+This is a minor bug fix release.
+
+086Aug17
+ - baculum: Fix access denied error on api install wizard page
+ - baculum: Remove assigning to api host when user is deleted
+ - baculum: Fix empty admin setting
+ - baculum: Add ability to assign host to specific user
+ - baculum: Fix bconsole test connection for new api host that works with new
+ director
+ - baculum: Fix sqlite db support
+ - Fix bug #2301 Solaris Available space incorrectly reported by turning off the
+ output for Solaris
+ - Fix bug #2300 mount/unmount/release of single tape drive does not work
+ - baculum: Fix bconsole connection test in config wizard
+ - baculum: Fix writing config for schedule and message names with space
+ - bpipe: Fix compiler warning
+ - baculum: Fix drag & drop file version elements
+ - baculum: Add fileset info endpoint and use it in restore wizard
+ - baculum: Use client name instead of clientid and start using fileset to
+ prepare restore tree
+ - baculum: Remove fileset parameter from run restore
+ - baculum: Fix lstat regex pattern
+ - baculum: Get the most recent jobs by client and fileset or by clientid and
+ filesetid
+ - Fix: bug #3048: jobs are stuck in endless loop in reserve.c
+ - Add total time to test.out file
+ - baculum: Add restore job selection in restore job wizard
+ - Enhance verify job report from bug 2249
+
+Bugs fixed/closed since last release:
+2300 2301 3048
+
+
+===============================================================
This is a minor bug fix release, but a few of the bugs are important.
The main items fixed are:
diff --git a/src/dird/ua_cmds.c b/src/dird/ua_cmds.c
index 9f2a832..78b0bd6 100644
--- a/src/dird/ua_cmds.c
+++ b/src/dird/ua_cmds.c
@@ -1743,9 +1743,6 @@ static void do_storage_cmd(UAContext *ua, const char *command)
} else {
slot = get_storage_slot(ua, store.store);
}
- if (slot < 0) {
- return;
- }
/* Users may set a device name directly on the command line */
if ((i = find_arg_with_value(ua, "device")) > 0) {
POOLMEM *errmsg = get_pool_memory(PM_NAME);
@@ -1893,7 +1890,7 @@ int cloud_volumes_cmd(UAContext *ua, const char *cmd, const char *mode)
}
if (!ok) {
ua->warning_msg(_("Unable to %s for volume \"%s\"\n"), action, mr.VolumeName);
- }
+ }
}
bail_out:
@@ -2547,7 +2544,7 @@ bool open_db(UAContext *ua)
ua->catalog->db_ssl_mode, ua->catalog->db_ssl_key,
ua->catalog->db_ssl_cert, ua->catalog->db_ssl_ca,
ua->catalog->db_ssl_capath, ua->catalog->db_ssl_cipher,
- mult_db_conn, ua->catalog->disable_batch_insert);
+ mult_db_conn, ua->catalog->disable_batch_insert);
if (!ua->db || !db_open_database(ua->jcr, ua->db)) {
ua->error_msg(_("Could not open catalog database \"%s\".\n"),
ua->catalog->db_name);
diff --git a/src/dird/verify.c b/src/dird/verify.c
index 76031dd..93bee22 100644
--- a/src/dird/verify.c
+++ b/src/dird/verify.c
@@ -435,10 +435,11 @@ bail_out:
void verify_cleanup(JCR *jcr, int TermCode)
{
char sdt[50], edt[50];
- char ec1[30], ec2[30];
+ char ec1[30], ec2[30], elapsed[50];
char term_code[100], fd_term_msg[100], sd_term_msg[100];
const char *term_msg;
int msg_type;
+ utime_t RunTime;
const char *Name;
// Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);
@@ -492,6 +493,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
}
bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);
+ RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
if (jcr->verify_job) {
Name = jcr->verify_job->hdr.name;
} else {
@@ -516,6 +518,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
" Verify Job: %s\n"
" Start time: %s\n"
" End time: %s\n"
+" Elapsed time: %s\n"
" Accurate: %s\n"
" Files Expected: %s\n"
" Files Examined: %s\n"
@@ -535,6 +538,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
Name,
sdt,
edt,
+ edit_utime(RunTime, elapsed, sizeof(elapsed)),
accurate,
edit_uint64_with_commas(jcr->ExpectedFiles, ec1),
edit_uint64_with_commas(jcr->JobFiles, ec2),
@@ -555,6 +559,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
" Verify Job: %s\n"
" Start time: %s\n"
" End time: %s\n"
+" Elapsed time: %s\n"
" Files Examined: %s\n"
" Non-fatal FD errors: %d\n"
" FD termination status: %s\n"
@@ -570,6 +575,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
Name,
sdt,
edt,
+ edit_utime(RunTime, elapsed, sizeof(elapsed)),
edit_uint64_with_commas(jcr->JobFiles, ec1),
jcr->JobErrors,
fd_term_msg,
diff --git a/src/lib/bsys.c b/src/lib/bsys.c
index ab5ebe5..21a8f69 100644
--- a/src/lib/bsys.c
+++ b/src/lib/bsys.c
@@ -1029,7 +1029,7 @@ void stack_trace() {}
int fs_get_free_space(const char *path, int64_t *freeval, int64_t *totalval)
{
-#ifndef HAVE_WIN32
+#if !defined(HAVE_WIN32) && !defined(HAVE_SUN_OS)
struct statvfs st;
if (statvfs(path, &st) == 0) {
diff --git a/src/plugins/fd/bpipe-fd.c b/src/plugins/fd/bpipe-fd.c
index 6f17444..76f1875 100644
--- a/src/plugins/fd/bpipe-fd.c
+++ b/src/plugins/fd/bpipe-fd.c
@@ -459,7 +459,7 @@ static bRC createFile(bpContext *ctx, struct restore_pkt *rp)
if (strlen(rp->where) > 512) {
printf("Restore target dir too long. Restricting to first 512 bytes.\n");
}
- strncpy(((struct plugin_ctx *)ctx->pContext)->where, rp->where, 513);
+ strncpy(((struct plugin_ctx *)ctx->pContext)->where, rp->where, 512);
((struct plugin_ctx *)ctx->pContext)->replace = rp->replace;
rp->create_status = CF_EXTRACT;
return bRC_OK;
diff --git a/src/stored/reserve.c b/src/stored/reserve.c
index eb04e62..5e0143a 100644
--- a/src/stored/reserve.c
+++ b/src/stored/reserve.c
@@ -403,8 +403,8 @@ static bool use_device_cmd(JCR *jcr)
* This can happen if one job reserves a drive or finishes using
* a drive at the same time a second job wants it.
*/
- if (repeat++ > 1) { /* try algorithm 3 times */
- bmicrosleep(30, 0); /* wait a bit */
+ if (repeat++ < 20) { /* try sleeping 20 times */
+ bmicrosleep(30, 0); /* wait 30 secs */
Dmsg1(dbglvl, "repeat reserve algorithm JobId=%d\n", jcr->JobId);
} else if (!rctx.suitable_device || !wait_for_any_device(jcr, wait_for_device_retries)) {
Dmsg0(dbglvl, "Fail. !suitable_device || !wait_for_device\n");
diff --git a/src/version.h b/src/version.h
index b532788..50ef8e2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -5,9 +5,9 @@
#define COMMUNITY 1 /* Define to create a Windows community binary */
/* Note: there can be only *one* VERSION in this file */
-#define VERSION "9.0.2"
-#define BDATE "24 July 2017"
-#define LSMDATE "24Jul17"
+#define VERSION "9.0.3"
+#define BDATE "08 August 2017"
+#define LSMDATE "08Aug17"
#define RELEASE 1 /* Use ONLY in rpms */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list