From 9b5ebaf981fcdcd601135251620c237d15961ddb Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 11 Mar 2008 13:45:51 +0000 Subject: [PATCH] Tweak Copy job details. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6585 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/migrate.c | 13 ++++++++----- bacula/technotes-2.3 | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c index 36b357418f..c9618d5df0 100644 --- a/bacula/src/dird/migrate.c +++ b/bacula/src/dird/migrate.c @@ -29,6 +29,8 @@ * * Bacula Director -- migrate.c -- responsible for doing * migration jobs. + * + * Also handles Copy jobs (March MMVIII) * * Kern Sibbald, September MMIV * @@ -279,7 +281,8 @@ bool do_migration(JCR *jcr) } /* Print Job Start message */ - Jmsg(jcr, M_INFO, 0, _("Start Migration JobId %s, Job=%s\n"), + Jmsg(jcr, M_INFO, 0, _("Start %s JobId %s, Job=%s\n"), + jcr->JobType == JT_MIGRATE ? "Migration" : "Copy", edit_uint64(jcr->JobId, ed1), jcr->Job); @@ -364,7 +367,7 @@ bool do_migration(JCR *jcr) * to avoid two threads from using the BSOCK structure at * the same time. */ - if (!bnet_fsend(sd, "run")) { + if (!sd->fsend("run")) { return false; } @@ -389,7 +392,7 @@ bool do_migration(JCR *jcr) } migration_cleanup(jcr, jcr->JobStatus); - if (mig_jcr) { + if (jcr->JobType == JT_MIGRATE && mig_jcr) { char jobid[50]; UAContext *ua = new_ua_context(jcr); edit_uint64(jcr->previous_jr.JobId, jobid); @@ -1172,8 +1175,8 @@ void migration_cleanup(JCR *jcr, int TermCode) " Build OS: %s %s %s\n" " Prev Backup JobId: %s\n" " New Backup JobId: %s\n" -" Migration JobId: %s\n" -" Migration Job: %s\n" +" Current JobId: %s\n" +" Current Job: %s\n" " Backup Level: %s%s\n" " Client: %s\n" " FileSet: \"%s\" %s\n" diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3 index 077d8d7dce..609c8b3b36 100644 --- a/bacula/technotes-2.3 +++ b/bacula/technotes-2.3 @@ -2,6 +2,7 @@ General: 11Mar08 +kes Tweak Copy job details. kes Rework dir_find_next_appendable_volume to make a bit more effort to find a suitable volume before giving up. 10Mar08 -- 2.39.5