X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Ffd_cmds.c;h=785d6794b8e1c16fd108aa06b01ae8cb15bbe219;hb=b8224aab234012c2d127b84eceb160e99dd4a14d;hp=4a858abdc59b9b541947d3cd889666ca01f5455b;hpb=8e94b30da91f44a8a0d39de5c493983cfd08884e;p=bacula%2Fbacula diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c index 4a858abdc5..785d6794b8 100644 --- a/bacula/src/dird/fd_cmds.c +++ b/bacula/src/dird/fd_cmds.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * * Bacula Director -- fd_cmds.c -- send commands to File daemon @@ -12,20 +39,6 @@ * * Version $Id$ */ -/* - Copyright (C) 2000-2006 Kern Sibbald - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - the file LICENSE for additional details. - - */ #include "bacula.h" #include "dird.h" @@ -160,14 +173,14 @@ void get_level_since_time(JCR *jcr, char *since, int since_len) if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) { /* No job found, so upgrade this one to Full */ Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db)); - Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found. Doing FULL backup.\n")); + Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found in catalog. Doing FULL backup.\n")); bsnprintf(since, since_len, _(" (upgraded from %s)"), level_to_str(jcr->JobLevel)); jcr->JobLevel = jcr->jr.JobLevel = L_FULL; } else { if (jcr->job->rerun_failed_levels) { if (db_find_failed_job_since(jcr, jcr->db, &jcr->jr, jcr->stime, JobLevel)) { - Jmsg(jcr, M_INFO, 0, _("Prior failed job found. Upgrading to %s.\n"), + Jmsg(jcr, M_INFO, 0, _("Prior failed job found in catalog. Upgrading to %s.\n"), level_to_str(JobLevel)); bsnprintf(since, since_len, _(" (upgraded from %s)"), level_to_str(jcr->JobLevel)); @@ -274,6 +287,15 @@ static bool send_fileset(JCR *jcr) for (j=0; jnum_opts; j++) { FOPTS *fo = ie->opts_list[j]; bnet_fsend(fd, "O %s\n", fo->opts); + + bool enhanced_wild = false; + for (k=0; fo->opts[k]!='\0'; k++) { + if (fo->opts[k]=='W') { + enhanced_wild = true; + break; + } + } + for (k=0; kregex.size(); k++) { bnet_fsend(fd, "R %s\n", fo->regex.get(k)); } @@ -292,12 +314,18 @@ static bool send_fileset(JCR *jcr) for (k=0; kwildfile.size(); k++) { bnet_fsend(fd, "WF %s\n", fo->wildfile.get(k)); } + for (k=0; kwildbase.size(); k++) { + bnet_fsend(fd, "W%c %s\n", enhanced_wild ? 'B' : 'F', fo->wildbase.get(k)); + } for (k=0; kbase.size(); k++) { bnet_fsend(fd, "B %s\n", fo->base.get(k)); } for (k=0; kfstype.size(); k++) { bnet_fsend(fd, "X %s\n", fo->fstype.get(k)); } + for (k=0; kdrivetype.size(); k++) { + bnet_fsend(fd, "XD %s\n", fo->drivetype.get(k)); + } if (fo->reader) { bnet_fsend(fd, "D %s\n", fo->reader); } @@ -455,8 +483,31 @@ bool send_bootstrap_file(JCR *jcr, BSOCK *sock) return true; } +/* TODO: drop this with runscript.old_proto in bacula 1.42 */ +static char runbefore[] = "RunBeforeJob %s\n"; +static char runafter[] = "RunAfterJob %s\n"; +static char OKRunBefore[] = "2000 OK RunBefore\n"; +static char OKRunAfter[] = "2000 OK RunAfter\n"; + +int send_runscript_with_old_proto(JCR *jcr, int when, POOLMEM *msg) +{ + int ret; + Dmsg1(120, "bdird: sending old runcommand to fd '%s'\n",msg); + if (when & SCRIPT_Before) { + bnet_fsend(jcr->file_bsock, runbefore, msg); + ret = response(jcr, jcr->file_bsock, OKRunBefore, "ClientRunBeforeJob", DISPLAY_ERROR); + } else { + bnet_fsend(jcr->file_bsock, runafter, msg); + ret = response(jcr, jcr->file_bsock, OKRunAfter, "ClientRunAfterJob", DISPLAY_ERROR); + } + return ret; +} /* END OF TODO */ + /* * Send RunScripts to File daemon + * 1) We send all runscript to FD, they can be executed Before, After, or twice + * 2) Then, we send a "RunBeforeNow" command to the FD to tell him to do the + * first run_script() call. (ie ClientRunBeforeJob) */ int send_runscripts_commands(JCR *jcr) { @@ -465,6 +516,7 @@ int send_runscripts_commands(JCR *jcr) RUNSCRIPT *cmd; bool launch_before_cmd = false; POOLMEM *ehost = get_pool_memory(PM_FNAME); + int result; Dmsg0(120, "bdird: sending runscripts to fd\n"); @@ -478,31 +530,41 @@ int send_runscripts_commands(JCR *jcr) if (strcmp(ehost, jcr->client->hdr.name) == 0) { pm_strcpy(msg, cmd->command); bash_spaces(msg); - bnet_fsend(fd, runscript, cmd->on_success, - cmd->on_failure, - cmd->abort_on_error, - cmd->when, - msg); Dmsg1(120, "bdird: sending runscripts to fd '%s'\n", cmd->command); - - if (!response(jcr, fd, OKRunScript, "RunScript", DISPLAY_ERROR)) { + + /* TODO: remove this with bacula 1.42 */ + if (cmd->old_proto) { + result = send_runscript_with_old_proto(jcr, cmd->when, msg); + + } else { + bnet_fsend(fd, runscript, cmd->on_success, + cmd->on_failure, + cmd->abort_on_error, + cmd->when, + msg); + + result = response(jcr, fd, OKRunScript, "RunScript", DISPLAY_ERROR); + launch_before_cmd=true; + } + + if (!result) { set_jcr_job_status(jcr, JS_ErrorTerminated); free_pool_memory(msg); free_pool_memory(ehost); return 0; } - launch_before_cmd=true; } - /* + /* TODO : we have to play with other client */ + /* else { send command to an other client } */ } - } - - /* TODO : we have to play with other client */ + } + + /* We tell to the FD that i can execute commands (ie ClientRunBeforeJob) */ if (launch_before_cmd) { bnet_fsend(fd, runbeforenow); if (!response(jcr, fd, OKRunBeforeNow, "RunBeforeNow", DISPLAY_ERROR)) {