/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2000-2011 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 three of the GNU Affero General Public
- License as published by the Free Software Foundation and included
- 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 Affero 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 Kern Sibbald.
- The licensor of Bacula is the Free Software Foundation Europe
- (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
- Switzerland, email:ftf@fsfeurope.org.
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2017 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
* Bacula File Daemon Job processing
*
- * Kern Sibbald, October MM
- *
+ * Written by Kern Sibbald, October MM
*/
#include "bacula.h"
#include "filed.h"
-
-#if defined(WIN32_VSS)
+#include "ch.h"
+#ifdef WIN32_VSS
#include "vss.h"
-
static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER;
-static int enable_vss = 0;
#endif
-/**
- * As Windows saves ACLs as part of the standard backup stream
- * we just pretend here that is has implicit acl support.
- */
-#if defined(HAVE_ACL) || defined(HAVE_WIN32)
-const bool have_acl = true;
-#else
-const bool have_acl = false;
-#endif
+/* Globals */
+bool win32decomp = false;
+bool no_win32_write_errors = false;
-#if defined(HAVE_XATTR)
-const bool have_xattr = true;
-#else
-const bool have_xattr = false;
+/* Static variables */
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+#ifdef HAVE_WIN32
+const bool have_win32 = true;
+#else
+const bool have_win32 = false;
#endif
+#ifdef HAVE_ACL
+const bool have_acl = true;
+#else
+const bool have_acl = false;
+#endif
+
+#if HAVE_XATTR
+const bool have_xattr = true;
+#else
+const bool have_xattr = false;
+#endif
+
extern CLIENT *me; /* our client resource */
/* Imported functions */
/* Forward referenced functions */
static int backup_cmd(JCR *jcr);
-static int bootstrap_cmd(JCR *jcr);
+static int component_cmd(JCR *jcr);
static int cancel_cmd(JCR *jcr);
static int setdebug_cmd(JCR *jcr);
+static int setbandwidth_cmd(JCR *jcr);
static int estimate_cmd(JCR *jcr);
static int hello_cmd(JCR *jcr);
static int job_cmd(JCR *jcr);
static int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd);
static void filed_free_jcr(JCR *jcr);
static int open_sd_read_session(JCR *jcr);
-static int send_bootstrap_file(JCR *jcr);
static int runscript_cmd(JCR *jcr);
static int runbefore_cmd(JCR *jcr);
static int runafter_cmd(JCR *jcr);
static int set_options(findFOPTS *fo, const char *opts);
static void set_storage_auth_key(JCR *jcr, char *key);
static int sm_dump_cmd(JCR *jcr);
+static int proxy_cmd(JCR *jcr);
+static int fd_testnetwork_cmd(JCR *jcr);
#ifdef DEVELOPER
static int exit_cmd(JCR *jcr);
#endif
/* Exported functions */
-struct s_cmds {
- const char *cmd;
- int (*func)(JCR *);
- int monitoraccess; /* specify if monitors have access to this function */
-};
+#define ACCESS_MONITOR 1
+#define ACCESS_REMOTE 2
-/**
+/*
* The following are the recognized commands from the Director.
*/
-static struct s_cmds cmds[] = {
+struct s_cmds cmds[] = {
{"backup", backup_cmd, 0},
- {"cancel", cancel_cmd, 0},
+ {"cancel", cancel_cmd, ACCESS_REMOTE},
{"setdebug=", setdebug_cmd, 0},
+ {"setbandwidth=",setbandwidth_cmd, ACCESS_REMOTE},
+ {"snapshot", snapshot_cmd, 0},
{"estimate", estimate_cmd, 0},
{"Hello", hello_cmd, 1},
{"fileset", fileset_cmd, 0},
{"restore ", restore_cmd, 0},
{"endrestore", end_restore_cmd, 0},
{"session", session_cmd, 0},
- {"status", status_cmd, 1},
- {".status", qstatus_cmd, 1},
+ {"status", status_cmd, ACCESS_MONITOR|ACCESS_REMOTE},
+ {".status", qstatus_cmd, ACCESS_MONITOR|ACCESS_REMOTE},
{"storage ", storage_cmd, 0},
{"verify", verify_cmd, 0},
- {"bootstrap", bootstrap_cmd, 0},
+ {"component", component_cmd, 0},
{"RunBeforeNow", runbeforenow_cmd, 0},
{"RunBeforeJob", runbefore_cmd, 0},
{"RunAfterJob", runafter_cmd, 0},
{"accurate", accurate_cmd, 0},
{"restoreobject", restore_object_cmd, 0},
{"sm_dump", sm_dump_cmd, 0},
+ {"stop", cancel_cmd, ACCESS_REMOTE},
+ {"proxy", proxy_cmd, ACCESS_REMOTE},
+ {"testnetwork", fd_testnetwork_cmd, 0},
#ifdef DEVELOPER
{"exit", exit_cmd, 0},
#endif
static char storaddr[] = "storage address=%s port=%d ssl=%d Authorization=%100s";
static char storaddr_v1[] = "storage address=%s port=%d ssl=%d";
static char sessioncmd[] = "session %127s %ld %ld %ld %ld %ld %ld\n";
-static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n";
+
static char restorecmd1[] = "restore replace=%c prelinks=%d where=\n";
-static char restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=%s\n";
-static char restoreobjcmd[] = "restoreobject JobId=%u %d,%d,%d,%d,%d,%d\n";
+static char restorefcmd1[] = "restore files=%d replace=%c prelinks=%d where=\n";
+
+/* The following restore commands may have a big where=/regexwhere= parameter
+ * the bsscanf is limiting the default %s to 1000c. To allow more than 1000 bytes,
+ * we can specify %xxxxs where xxxx is the size expected in bytes.
+ *
+ * So, the code will add %s\n to the end of the following restore commands
+ */
+static char restorecmd[] = "restore replace=%c prelinks=%d where=";
+static char restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=";
+static char restorefcmd[] = "restore files=%d replace=%c prelinks=%d where=";
+static char restorefcmdR[] = "restore files=%d replace=%c prelinks=%d regexwhere=";
+
+static char restoreobjcmd[] = "restoreobject JobId=%u %d,%d,%d,%d,%d,%d,%s";
+static char restoreobjcmd1[] = "restoreobject JobId=%u %d,%d,%d,%d,%d,%d\n";
static char endrestoreobjectcmd[] = "restoreobject end\n";
static char verifycmd[] = "verify level=%30s";
static char estimatecmd[] = "estimate listing=%d";
static char runbefore[] = "RunBeforeJob %s";
static char runafter[] = "RunAfterJob %s";
static char runscript[] = "Run OnSuccess=%d OnFailure=%d AbortOnError=%d When=%d Command=%s";
+static char setbandwidth[]= "setbandwidth=%lld Job=%127s";
/* Responses sent to Director */
static char errmsg[] = "2999 Invalid command\n";
static char no_auth[] = "2998 No Authorization\n";
static char invalid_cmd[] = "2997 Invalid command for a Director with Monitor directive enabled.\n";
+static char OKBandwidth[] = "2000 OK Bandwidth\n";
static char OKinc[] = "2000 OK include\n";
static char OKest[] = "2000 OK estimate files=%s bytes=%s\n";
static char OKlevel[] = "2000 OK level\n";
static char OKbackup[] = "2000 OK backup\n";
-static char OKbootstrap[] = "2000 OK bootstrap\n";
static char OKverify[] = "2000 OK verify\n";
static char OKrestore[] = "2000 OK restore\n";
static char OKsession[] = "2000 OK session\n";
static char OKstore[] = "2000 OK storage\n";
static char OKstoreend[] = "2000 OK storage end\n";
static char OKjob[] = "2000 OK Job %s (%s) %s,%s,%s";
-static char OKsetdebug[] = "2000 OK setdebug=%d trace=%d hangup=%d\n";
+static char OKsetdebug[] = "2000 OK setdebug=%ld trace=%ld hangup=%ld"
+ " blowup=%ld options=%s tags=%s\n";
static char BADjob[] = "2901 Bad Job\n";
-static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u ReadBytes=%s"
- " JobBytes=%s Errors=%u VSS=%d Encrypt=%d\n";
+static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%d ReadBytes=%lld"
+ " JobBytes=%lld Errors=%d VSS=%d Encrypt=%d"
+ " CommBytes=%lld CompressCommBytes=%lld\n";
static char OKRunBefore[] = "2000 OK RunBefore\n";
static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n";
static char OKRunAfter[] = "2000 OK RunAfter\n";
static char OKRunScript[] = "2000 OK RunScript\n";
static char BADcmd[] = "2902 Bad %s\n";
static char OKRestoreObject[] = "2000 OK ObjectRestored\n";
+static char OKComponentInfo[] = "2000 OK ComponentInfo\n";
/* Responses received from Storage Daemon */
static char OK_open[] = "3000 OK open ticket = %d\n";
static char OK_data[] = "3000 OK data\n";
static char OK_append[] = "3000 OK append data\n";
-static char OKSDbootstrap[]= "3000 OK bootstrap\n";
/* Commands sent to Storage Daemon */
static char read_open[] = "read open session = %s %ld %ld %ld %ld %ld %ld\n";
static char read_data[] = "read data %d\n";
static char read_close[] = "read close session %d\n";
+static char read_ctrl[] = "read control %d\n";
-/**
+/* Should tell us if a command is authorized or not */
+static bool access_ok(struct s_cmds *cmd, DIRRES* dir)
+{
+ if ((cmd->access & ACCESS_MONITOR) && dir->monitor) {
+ return true;
+ }
+ if ((cmd->access & ACCESS_REMOTE) && dir->remote) {
+ return true;
+ }
+ if (!dir->remote && !dir->monitor) {
+ return true;
+ }
+ return false;
+}
+
+/*
* Accept requests from a Director
*
* NOTE! We are running as a separate thread
* 4. FD connects to SD
* 5. FD gets/runs ClientRunBeforeJob and sends ClientRunAfterJob
* 6. Dir sends include/exclude
- * 7. FD sends data to SD
- * 8. SD/FD disconnects while SD despools data and attributes (optional)
+ * 7. FD sends the file data to SD
+ * 8. SD/FD disconnects while the SD despools data and attributes (optional)
* 9. FD runs ClientRunAfterJob
*/
-void *handle_client_request(void *dirp)
+static void *handle_director_request(BSOCK *dir)
{
int i;
bool found, quit;
+ bool first = true;
JCR *jcr;
- BSOCK *dir = (BSOCK *)dirp;
const char jobname[12] = "*Director*";
-// saveCWD save_cwd;
+ prevent_os_suspensions(); /* do not suspend during backup/restore */
jcr = new_jcr(sizeof(JCR), filed_free_jcr); /* create JCR */
+ jcr->sd_calls_client_bsock = NULL;
+ jcr->sd_calls_client = false;
jcr->dir_bsock = dir;
jcr->ff = init_find_files();
-// save_cwd.save(jcr);
jcr->start_time = time(NULL);
jcr->RunScripts = New(alist(10, not_owned_by_alist));
jcr->last_fname = get_pool_memory(PM_FNAME);
jcr->crypto.pki_keypair = me->pki_keypair;
jcr->crypto.pki_signers = me->pki_signers;
jcr->crypto.pki_recipients = me->pki_recipients;
+
dir->set_jcr(jcr);
+ jcr->set_killable(true); /* allow dir to kill/cancel job */
+ /* Initialize SD start condition variable */
+ int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+ if (errstat != 0) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.bstrerror(errstat));
+ goto bail_out;
+ }
enable_backup_privileges(NULL, 1 /* ignore_errors */);
- /**********FIXME******* add command handler error code */
-
for (quit=false; !quit;) {
- /* Read command */
- if (dir->recv() < 0) {
- break; /* connection terminated */
+ if (!first) { /* first call the read is done */
+ /* Read command */
+ if (dir->recv() < 0) {
+ break; /* connection terminated */
+ }
}
+ if (dir->msglen == 0) { /* Bad connection */
+ break;
+ }
+ first = false;
dir->msg[dir->msglen] = 0;
Dmsg1(100, "<dird: %s", dir->msg);
found = false;
dir->signal(BNET_EOD);
break;
}
- if ((jcr->authenticated) && (!cmds[i].monitoraccess) && (jcr->director->monitor)) {
+ if (jcr->authenticated && !access_ok(&cmds[i], jcr->director)) {
Dmsg1(100, "Command \"%s\" is invalid.\n", cmds[i].cmd);
dir->fsend(invalid_cmd);
dir->signal(BNET_EOD);
break;
}
- Dmsg1(100, "Executing %s command.\n", cmds[i].cmd);
+ if ((me->disabled_cmds_array && me->disabled_cmds_array[i]) ||
+ (jcr->director && jcr->director->disabled_cmds_array &&
+ jcr->director->disabled_cmds_array[i])) {
+ Jmsg(jcr, M_FATAL, 0, _("Command: \"%s\" is disabled.\n"), cmds[i].cmd);
+ quit = true;
+ break;
+ }
+ Dmsg2(100, "Executing %s Dir %s command.\n", cmds[i].cmd, dir->msg);
if (!cmds[i].func(jcr)) { /* do command */
quit = true; /* error or fully terminated, get out */
Dmsg1(100, "Quit command loop. Canceled=%d\n", job_canceled(jcr));
/* Run the after job */
run_scripts(jcr, jcr->RunScripts, "ClientAfterJob");
+ /* send any queued messages before reporting the jobstatus to the director */
+ dequeue_messages(jcr);
+
if (jcr->JobId) { /* send EndJob if running a job */
- char ed1[50], ed2[50];
+ uint64_t CommBytes, CommCompressedBytes;
+ uint32_t vss, encrypt;
/* Send termination status back to Dir */
+ if (jcr->store_bsock) {
+ CommBytes = jcr->store_bsock->CommBytes();
+ CommCompressedBytes = jcr->store_bsock->CommCompressedBytes();
+ } else {
+ CommBytes = CommCompressedBytes = 0;
+ }
+ encrypt = jcr->crypto.pki_encrypt;
+ vss = jcr->Snapshot;
dir->fsend(EndJob, jcr->JobStatus, jcr->JobFiles,
- edit_uint64(jcr->ReadBytes, ed1),
- edit_uint64(jcr->JobBytes, ed2), jcr->JobErrors, jcr->VSS,
- jcr->crypto.pki_encrypt);
- Dmsg1(110, "End FD msg: %s\n", dir->msg);
+ jcr->ReadBytes, jcr->JobBytes, jcr->JobErrors, vss,
+ encrypt, CommBytes, CommCompressedBytes);
+ //Dmsg0(0, dir->msg);
}
generate_daemon_event(jcr, "JobEnd");
generate_plugin_event(jcr, bEventJobEnd);
- dequeue_messages(jcr); /* send any queued messages */
+bail_out:
+ dequeue_messages(jcr); /* send any queued messages, will no longer impact
+ * the job status... */
/* Inform Director that we are done */
dir->signal(BNET_TERMINATE);
- free_plugins(jcr); /* release instantiated plugins */
free_and_null_pool_memory(jcr->job_metadata);
/* Clean up fileset */
findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
for (j=0; j<incexe->opts_list.size(); j++) {
findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
+ if (fo->plugin) {
+ free(fo->plugin);
+ }
for (k=0; k<fo->regex.size(); k++) {
regfree((regex_t *)fo->regex.get(k));
}
free(fileset);
}
ff->fileset = NULL;
+ ff->mount_points.destroy();
Dmsg0(100, "Calling term_find_files\n");
term_find_files(jcr->ff);
-// save_cwd.restore(jcr);
-// save_cwd.release();
jcr->ff = NULL;
Dmsg0(100, "Done with term_find_files\n");
+ pthread_cond_destroy(&jcr->job_start_wait);
free_jcr(jcr); /* destroy JCR record */
Dmsg0(100, "Done with free_jcr\n");
- Dsm_check(1);
+ allow_os_suspensions(); /* FD can now be suspended */
+ Dsm_check(100);
garbage_collect_memory_pool();
return NULL;
}
+
+/*
+ * Accept requests from a Director or a Storage daemon
+ */
+void *handle_connection_request(void *caller)
+{
+ BSOCK *bs = (BSOCK *)caller;
+
+ if (bs->recv() > 0) {
+ if (strncmp(bs->msg, "Ping", 4) == 0) {
+ bs->fsend("2000 Ping OK\n");
+ bs->destroy();
+ return NULL;
+ }
+ if (bs->msglen < 25 || bs->msglen > 500) {
+ goto bail_out;
+ }
+ if (strncmp(bs->msg, "Hello FD: Bacula Storage", 20) ==0) {
+ return handle_storage_connection(bs);
+ }
+ if (strncmp(bs->msg, "Hello ", 5) == 0) {
+ return handle_director_request(bs);
+ }
+ }
+bail_out:
+ Dmsg2(100, "Bad command from %s. Len=%d.\n", bs->who(), bs->msglen);
+ char addr[64];
+ char *who = bs->get_peer(addr, sizeof(addr)) ? bs->who() : addr;
+ Jmsg2(NULL, M_FATAL, 0, _("Bad command from %s. Len=%d.\n"), who, bs->msglen);
+ bs->destroy();
+ return NULL;
+}
+
+
+/*
+ * Test the Network between FD/SD
+ */
+static int fd_testnetwork_cmd(JCR *jcr)
+{
+ bool can_compress, ok=true;
+ BSOCK *sd = jcr->store_bsock;
+ int64_t nb=0, nb2=0;
+ char ed1[50];
+ btime_t start, end;
+
+ if (!sd || !jcr->dir_bsock) {
+ return 1;
+ }
+ if (sscanf(jcr->dir_bsock->msg, "testnetwork bytes=%lld", &nb) != 1 || nb <= 0) {
+ sd->fsend("2999 testnetwork command error\n");
+ return 1;
+ }
+
+ /* We disable the comline compression, else all numbers will be wrong */
+ can_compress = sd->can_compress();
+
+ sd->fsend("testnetwork bytes=%lld\n", nb);
+ sd->clear_compress();
+
+ /* In the first step, we send X bytes to the SD */
+ memset(sd->msg, 0xAA, sizeof_pool_memory(sd->msg));
+ sd->msglen = sizeof_pool_memory(sd->msg);
+
+ start = get_current_btime();
+ for (nb2 = nb ; nb2 > 0 && ok ; nb2 -= sd->msglen) {
+ if (nb2 < sd->msglen) {
+ sd->msglen = nb2;
+ }
+ ok = sd->send();
+ }
+ sd->signal(BNET_EOD);
+ end = get_current_btime() + 1;
+
+ if (!ok) {
+ goto bail_out;
+ }
+
+ jcr->dir_bsock->fsend("2000 OK bytes=%lld duration=%lldms write_speed=%sB/s\n",
+ nb, end/1000 - start/1000,
+ edit_uint64_with_suffix(nb * 1000000 / (end - start), ed1));
+
+ /* Now we receive X bytes from the SD */
+ start = get_current_btime();
+ for (nb2 = 0; sd->recv() > 0; nb2 += sd->msglen) { }
+ end = get_current_btime() + 1;
+
+ jcr->dir_bsock->fsend("2000 OK bytes=%lld duration=%lldms read_speed=%sB/s\n",
+ nb2, end/1000 - start/1000,
+ edit_uint64_with_suffix(nb2 * 1000000 / (end - start), ed1));
+
+ jcr->dir_bsock->signal(BNET_CMD_OK);
+
+bail_out:
+ if (can_compress) {
+ sd->set_compress();
+ }
+ if (!ok) {
+ jcr->dir_bsock->fsend("2999 network test failed ERR=%s\n", sd->errmsg);
+ jcr->dir_bsock->signal(BNET_CMD_FAILED);
+ }
+
+ return 1;
+}
+
+static int proxy_cmd(JCR *jcr)
+{
+ bool OK=true, fdcalled = false;
+ BSOCK *cons_bsock;
+ CONSRES *cons = jcr->director->console;
+ int v, maxfd;
+ fd_set fdset;
+ struct timeval tv;
+
+ if (!cons) {
+ cons = (CONSRES *)GetNextRes(R_CONSOLE, NULL);
+ }
+ /* Here, dir_bsock is not really the director, this is a console */
+ cons_bsock = connect_director(jcr, cons);
+ if (!cons_bsock) {
+ jcr->dir_bsock->signal(BNET_ERROR_MSG);
+ jcr->dir_bsock->fsend("2999 proxy error. ERR=%s\n", jcr->errmsg);
+ jcr->dir_bsock->signal(BNET_MAIN_PROMPT);
+ /* Error during the connect */
+ return 1;
+ }
+
+ /* Inform the console that the command is OK */
+ jcr->dir_bsock->fsend("2000 proxy OK.\n");
+ jcr->dir_bsock->signal(BNET_MAIN_PROMPT);
+
+ maxfd = MAX(cons_bsock->m_fd, jcr->dir_bsock->m_fd) + 1;
+
+ /* Start to forward events from one to the other
+ * It can be done with 2 threads, or with a select
+ */
+ do {
+ FD_ZERO(&fdset);
+ FD_SET((unsigned)cons_bsock->m_fd, &fdset);
+ FD_SET((unsigned)jcr->dir_bsock->m_fd, &fdset);
+
+ tv.tv_sec = 5;
+ tv.tv_usec = 0;
+ switch ((v = select(maxfd, &fdset, NULL, NULL, &tv))) {
+ case 0: /* timeout */
+ OK = !jcr->is_canceled();
+ break;
+ case -1:
+ Dmsg1(0, "Bad call to select ERR=%d\n", errno);
+ OK = false;
+ default:
+#ifdef HAVE_TLS
+ if (cons_bsock->tls && !tls_bsock_probe(cons_bsock)) {
+ /* maybe a session key negotiation waked up the socket */
+ FD_CLR(cons_bsock->m_fd, &fdset);
+ }
+ if (jcr->dir_bsock->tls && !tls_bsock_probe(jcr->dir_bsock)) {
+ /* maybe a session key negotiation waked up the socket */
+ FD_CLR(jcr->dir_bsock->m_fd, &fdset);
+ }
+#endif
+ break;
+ }
+ Dmsg1(DT_NETWORK, "select = %d\n", v);
+ if (OK) {
+ if (FD_ISSET(cons_bsock->m_fd, &fdset)) {
+ v = cons_bsock->recv();
+ if (v == BNET_SIGNAL) {
+ if (cons_bsock->msglen == BNET_FDCALLED) {
+ OK = false;
+ fdcalled = true;
+ } else {
+ jcr->dir_bsock->signal(cons_bsock->msglen);
+ }
+
+ } else if (v >= 0) {
+ jcr->dir_bsock->fsend("%s", cons_bsock->msg);
+
+ } else {
+ /* We should not have such kind of message */
+ OK = false;
+ }
+ }
+ if (FD_ISSET(jcr->dir_bsock->m_fd, &fdset)) {
+ v = jcr->dir_bsock->recv();
+ if (v == BNET_SIGNAL) {
+ cons_bsock->signal(jcr->dir_bsock->msglen);
+ } else if (v >= 0) {
+ cons_bsock->fsend("%s", jcr->dir_bsock->msg);
+ } else {
+ /* We should not have such kind of message */
+ OK = false;
+ }
+ }
+ }
+ if (cons_bsock->is_error() || jcr->dir_bsock->is_error()) {
+ OK = false;
+ }
+ } while (OK && !jcr->is_canceled());
+
+ /* Close the socket, nothing more will come */
+ jcr->dir_bsock->signal(BNET_TERMINATE);
+ jcr->dir_bsock->close();
+ if (fdcalled) {
+ handle_connection_request(cons_bsock); /* will release the socket */
+ } else {
+ free_bsock(cons_bsock);
+ }
+ return 1;
+}
+
static int sm_dump_cmd(JCR *jcr)
{
close_memory_pool();
}
#endif
-
-/**
+/*
* Hello from Director he must identify himself and provide his
* password.
*/
static int hello_cmd(JCR *jcr)
{
Dmsg0(120, "Calling Authenticate\n");
+ if (!validate_dir_hello(jcr)) {
+ return 0;
+ }
if (!authenticate_director(jcr)) {
return 0;
}
Dmsg0(120, "OK Authenticate\n");
jcr->authenticated = true;
+
+ dequeue_messages(jcr); /* dequeue any daemon messages */
return 1;
}
-/**
+/*
* Cancel a Job
*/
static int cancel_cmd(JCR *jcr)
BSOCK *dir = jcr->dir_bsock;
char Job[MAX_NAME_LENGTH];
JCR *cjcr;
+ int status;
+ const char *reason;
if (sscanf(dir->msg, "cancel Job=%127s", Job) == 1) {
- if (!(cjcr=get_jcr_by_full_name(Job))) {
+ status = JS_Canceled;
+ reason = "canceled";
+ } else if (sscanf(dir->msg, "stop Job=%127s", Job) == 1) {
+ status = JS_Incomplete;
+ reason = "stopped";
+ } else {
+ dir->fsend(_("2902 Error scanning cancel command.\n"));
+ goto bail_out;
+ }
+ if (!(cjcr=get_jcr_by_full_name(Job))) {
+ dir->fsend(_("2901 Job %s not found.\n"), Job);
+ } else {
+ generate_plugin_event(cjcr, bEventCancelCommand, NULL);
+ cjcr->setJobStatus(status);
+ if (cjcr->store_bsock) {
+ cjcr->store_bsock->cancel();
+ }
+ cjcr->my_thread_send_signal(TIMEOUT_SIGNAL);
+ free_jcr(cjcr);
+ dir->fsend(_("2001 Job \"%s\" marked to be %s.\n"),
+ Job, reason);
+ }
+
+bail_out:
+ dir->signal(BNET_EOD);
+ return 1;
+}
+
+/**
+ * Set bandwidth limit as requested by the Director
+ *
+ */
+static int setbandwidth_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+ int64_t bw=0;
+ JCR *cjcr;
+ char Job[MAX_NAME_LENGTH];
+ *Job=0;
+
+ if (sscanf(dir->msg, setbandwidth, &bw, Job) != 2 || bw < 0) {
+ pm_strcpy(jcr->errmsg, dir->msg);
+ dir->fsend(_("2991 Bad setbandwidth command: %s\n"), jcr->errmsg);
+ return 0;
+ }
+
+ if (*Job) {
+ if(!(cjcr=get_jcr_by_full_name(Job))) {
dir->fsend(_("2901 Job %s not found.\n"), Job);
} else {
- generate_plugin_event(cjcr, bEventCancelCommand, NULL);
- set_jcr_job_status(cjcr, JS_Canceled);
+ cjcr->max_bandwidth = bw;
if (cjcr->store_bsock) {
- cjcr->store_bsock->set_timed_out();
- cjcr->store_bsock->set_terminated();
- cjcr->my_thread_send_signal(TIMEOUT_SIGNAL);
+ cjcr->store_bsock->set_bwlimit(bw);
}
free_jcr(cjcr);
- dir->fsend(_("2001 Job %s marked to be canceled.\n"), Job);
}
- } else {
- dir->fsend(_("2902 Error scanning cancel command.\n"));
+
+ } else { /* No job requested, apply globally */
+ me->max_bandwidth_per_job = bw; /* Overwrite directive */
+ foreach_jcr(cjcr) {
+ cjcr->max_bandwidth = bw;
+ if (cjcr->store_bsock) {
+ cjcr->store_bsock->set_bwlimit(bw);
+ }
+ }
+ endeach_jcr(cjcr);
}
- dir->signal(BNET_EOD);
- return 1;
-}
+ return dir->fsend(OKBandwidth);
+}
/**
* Set debug level as requested by the Director
static int setdebug_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- int32_t level, trace, hangup;
+ int32_t trace, lvl;
+ int32_t hangup = -1;
+ int32_t blowup = -1;
+ int64_t level, level_tags = 0;
int scan;
+ char options[60];
+ char tags[512];
Dmsg1(50, "setdebug_cmd: %s", dir->msg);
- scan = sscanf(dir->msg, "setdebug=%d trace=%d hangup=%d",
- &level, &trace, &hangup);
- if (scan != 3) {
- Dmsg2(20, "sscanf failed: msg=%s scan=%d\n", dir->msg, scan);
- if (sscanf(dir->msg, "setdebug=%d trace=%d", &level, &trace) != 2) {
- pm_strcpy(jcr->errmsg, dir->msg);
- dir->fsend(_("2991 Bad setdebug command: %s\n"), jcr->errmsg);
- return 0;
- } else {
- hangup = -1;
+ tags[0] = options[0] = 0;
+ scan = sscanf(dir->msg, "setdebug=%ld trace=%ld hangup=%ld blowup=%ld"
+ " options=%55s tags=%511s",
+ &lvl, &trace, &hangup, &blowup, options, tags);
+ if (scan != 6) {
+ scan = sscanf(dir->msg, "setdebug=%ld trace=%ld hangup=%ld",
+ &lvl, &trace, &hangup);
+ if (scan != 3) {
+ Dmsg2(20, "sscanf failed: msg=%s scan=%d\n", dir->msg, scan);
+ if (sscanf(dir->msg, "setdebug=%ld trace=%ld", &lvl, &trace) != 2) {
+ pm_strcpy(jcr->errmsg, dir->msg);
+ dir->fsend(_("2991 Bad setdebug command: %s\n"), jcr->errmsg);
+ return 0;
+ } else {
+ hangup = -1;
+ }
}
}
+ level = lvl;
+ set_trace(trace);
+ set_hangup(hangup);
+ set_blowup(blowup);
+ if (!debug_parse_tags(tags, &level_tags)) {
+ *tags = 0;
+ }
if (level >= 0) {
debug_level = level;
}
- set_trace(trace);
- set_hangup(hangup);
- Dmsg3(50, "level=%d trace=%d hangup=%d\n", level, get_trace(), get_hangup());
- return dir->fsend(OKsetdebug, level, get_trace(), get_hangup());
+ debug_level_tags = level_tags;
+
+ /* Parse specific FD options */
+ for (char *p = options; *p ; p++) {
+ switch(*p) {
+ case 'i':
+ /* Turn on/off ignore bwrite() errors on restore */
+ no_win32_write_errors = true;
+ break;
+ case 'd':
+ /* Turn on/off decomp of BackupRead() streams */
+ win32decomp = true;
+ break;
+ }
+ }
+
+ /* handle other options */
+ set_debug_flags(options);
+
+ Dmsg6(150, "level=%ld trace=%ld hangup=%ld blowup=%d options=%s tags=%s\n",
+ lvl, get_trace(), get_hangup(), get_blowup(), options, tags);
+ return dir->fsend(OKsetdebug, lvl, get_trace(), get_hangup(),
+ get_blowup(), options, tags);
}
sd_auth_key.check_size(dir->msglen);
if (sscanf(dir->msg, jobcmd, &jcr->JobId, jcr->Job,
- &jcr->VolSessionId, &jcr->VolSessionTime,
+ &jcr->VolSessionId, &jcr->VolSessionTime,
sd_auth_key.c_str()) != 5) {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad Job Command: %s"), jcr->errmsg);
dir->fsend(BADjob);
return 0;
}
+ set_jcr_in_tsd(jcr);
set_storage_auth_key(jcr, sd_auth_key.c_str());
Dmsg2(120, "JobId=%d Auth=%s\n", jcr->JobId, jcr->sd_auth_key);
Mmsg(jcr->errmsg, "JobId=%d Job=%s", jcr->JobId, jcr->Job);
new_plugins(jcr); /* instantiate plugins for this jcr */
generate_plugin_event(jcr, bEventJobStart, (void *)jcr->errmsg);
- return dir->fsend(OKjob, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER);
+#ifdef HAVE_WIN32
+ return dir->fsend(OKjob, VERSION, LSMDATE, win_os, DISTNAME, DISTVER);
+#else
+ return dir->fsend(OKjob, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER);
+#endif
+}
+
+extern "C" char *job_code_callback_filed(JCR *jcr, const char* param, char *buf, int buflen)
+{
+ switch (param[0]) {
+ case 'D':
+ if (jcr->director) {
+ return jcr->director->hdr.name;
+ }
+ break;
+ case 'S':
+ return jcr->PrevJob;
+ }
+ return NULL;
+
}
static int runbefore_cmd(JCR *jcr)
/* Run the command now */
script = new_runscript();
+ script->set_job_code_callback(job_code_callback_filed);
script->set_command(cmd);
script->when = SCRIPT_Before;
ok = script->run(jcr, "ClientRunBeforeJob");
unbash_spaces(msg);
cmd = new_runscript();
+ cmd->set_job_code_callback(job_code_callback_filed);
cmd->set_command(msg);
cmd->on_success = true;
cmd->on_failure = false;
int on_success, on_failure, fail_on_error;
RUNSCRIPT *cmd = new_runscript() ;
+ cmd->set_job_code_callback(job_code_callback_filed);
Dmsg1(100, "runscript_cmd: '%s'\n", dir->msg);
/* Note, we cannot sscanf into bools */
- if (sscanf(dir->msg, runscript, &on_success,
+ if (sscanf(dir->msg, runscript, &on_success,
&on_failure,
&fail_on_error,
&cmd->when,
memset(&rop, 0, sizeof(rop));
rop.pkt_size = sizeof(rop);
rop.pkt_end = sizeof(rop);
+
Dmsg1(100, "Enter restoreobject_cmd: %s", dir->msg);
if (strcmp(dir->msg, endrestoreobjectcmd) == 0) {
+ Dmsg0(20, "Got endrestoreobject\n");
generate_plugin_event(jcr, bEventRestoreObject, NULL);
return dir->fsend(OKRestoreObject);
}
- if (sscanf(dir->msg, restoreobjcmd, &rop.JobId, &rop.object_len,
- &rop.object_full_len, &rop.object_index,
- &rop.object_type, &rop.object_compression, &FileIndex) != 7) {
- Dmsg0(5, "Bad restore object command\n");
- pm_strcpy(jcr->errmsg, dir->msg);
- Jmsg1(jcr, M_FATAL, 0, _("Bad RestoreObject command: %s\n"), jcr->errmsg);
- goto bail_out;
+ rop.plugin_name = (char *)malloc(dir->msglen);
+ *rop.plugin_name = 0;
+
+ if (sscanf(dir->msg, restoreobjcmd, &rop.JobId, &rop.object_len,
+ &rop.object_full_len, &rop.object_index,
+ &rop.object_type, &rop.object_compression, &FileIndex,
+ rop.plugin_name) != 8) {
+
+ /* Old version, no plugin_name */
+ if (sscanf(dir->msg, restoreobjcmd1, &rop.JobId, &rop.object_len,
+ &rop.object_full_len, &rop.object_index,
+ &rop.object_type, &rop.object_compression, &FileIndex) != 7) {
+ Dmsg0(5, "Bad restore object command\n");
+ pm_strcpy(jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad RestoreObject command: %s\n"), jcr->errmsg);
+ goto bail_out;
+ }
}
- Dmsg6(100, "Recv object: JobId=%u objlen=%d full_len=%d objinx=%d objtype=%d FI=%d\n",
- rop.JobId, rop.object_len, rop.object_full_len,
- rop.object_index, rop.object_type, FileIndex);
+ unbash_spaces(rop.plugin_name);
+
+ Dmsg7(100, "Recv object: JobId=%u objlen=%d full_len=%d objinx=%d objtype=%d "
+ "FI=%d plugin_name=%s\n",
+ rop.JobId, rop.object_len, rop.object_full_len,
+ rop.object_index, rop.object_type, FileIndex, rop.plugin_name);
/* Read Object name */
if (dir->recv() < 0) {
goto bail_out;
rop.object_len = out_len;
}
Dmsg2(100, "Recv Object: len=%d Object=%s\n", rop.object_len, rop.object);
- /* Special Job meta data */
+ /* we still need to do this to detect a vss restore */
if (strcmp(rop.object_name, "job_metadata.xml") == 0) {
Dmsg0(100, "got job metadata\n");
- free_and_null_pool_memory(jcr->job_metadata);
- jcr->job_metadata = rop.object;
- rop.object = NULL;
- } else {
- /* pass to plugin */
- generate_plugin_event(jcr, bEventRestoreObject, (void *)&rop);
+ jcr->got_metadata = true;
}
+ generate_plugin_event(jcr, bEventRestoreObject, (void *)&rop);
+
if (rop.object_name) {
free(rop.object_name);
}
if (rop.object) {
free_pool_memory(rop.object);
}
+ if (rop.plugin_name) {
+ free(rop.plugin_name);
+ }
Dmsg1(100, "Send: %s", OKRestoreObject);
return 1;
return true;
}
-static void append_file(JCR *jcr, findINCEXE *incexe,
+static void append_file(JCR *jcr, findINCEXE *incexe,
const char *buf, bool is_file)
{
if (is_file) {
+#ifdef HAVE_WIN32
+ /* Special case for / under Win32,
+ * user is requesting to include all local drives
+ */
+ if (strcmp(buf, "/") == 0) {
+ //list_drives(&incexe->name_list);
+
+ } else {
+ incexe->name_list.append(new_dlistString(buf));
+ }
+#else
incexe->name_list.append(new_dlistString(buf));
+#endif /* HAVE_WIN32 */
} else if (me->plugin_directory) {
generate_plugin_event(jcr, bEventPluginCommand, (void *)buf);
incexe->plugin_list.append(new_dlistString(buf));
-
} else {
- Jmsg(jcr, M_FATAL, 0,
+ Jmsg(jcr, M_FATAL, 0,
_("Plugin Directory not defined. Cannot use plugin: \"%s\"\n"),
buf);
}
case '|':
p++; /* skip over | */
fn = get_pool_memory(PM_FNAME);
- fn = edit_job_codes(jcr, fn, p, "");
+ fn = edit_job_codes(jcr, fn, p, "", job_code_callback_filed);
bpipe = open_bpipe(fn, 0, "r");
if (!bpipe) {
berrno be;
p++; /* skip over < */
if ((ffd = fopen(p, "rb")) == NULL) {
berrno be;
- Jmsg(jcr, M_FATAL, 0,
+ Jmsg(jcr, M_FATAL, 0,
_("Cannot open FileSet input file: %s. ERR=%s\n"),
p, be.bstrerror());
return;
}
}
+findINCEXE *get_incexe(JCR *jcr)
+{
+ if (jcr->ff && jcr->ff->fileset) {
+ return jcr->ff->fileset->incexe;
+ }
+ return NULL;
+}
+
void set_incexe(JCR *jcr, findINCEXE *incexe)
{
findFILESET *fileset = jcr->ff->fileset;
// current_opts->writer = bstrdup(item); /* deprecated */
state = state_options;
break;
+ case 'G': /* Plugin command for this Option block */
+ current_opts = start_options(ff);
+ current_opts->plugin = bstrdup(item);
+ state = state_options;
+ break;
default:
Jmsg(jcr, M_FATAL, 0, _("Invalid FileSet command: %s\n"), item);
state = state_error;
}
}
dlistString *node;
- foreach_dlist(node, incexe->name_list) {
+ foreach_dlist(node, &incexe->name_list) {
Dmsg1(400, "F %s\n", node->c_str());
}
foreach_dlist(node, &incexe->plugin_list) {
char strip[100];
// Commented out as it is not backward compatible - KES
-#ifdef HAVE_WIN32
-// fo->flags |= FO_IGNORECASE; /* always ignorecase under windows */
-#endif
for (p=opts; *p; p++) {
switch (*p) {
case 'W':
fo->flags |= FO_ENHANCEDWILD;
break;
- case 'Z': /* gzip compression */
- fo->flags |= FO_GZIP;
- fo->GZIP_level = *++p - '0';
+ case 'Z': /* compression */
+ p++; /* skip Z */
+ if (*p >= '0' && *p <= '9') {
+ fo->flags |= FO_COMPRESS;
+ fo->Compress_algo = COMPRESS_GZIP;
+ fo->Compress_level = *p - '0';
+ }
+ else if (*p == 'o') {
+ fo->flags |= FO_COMPRESS;
+ fo->Compress_algo = COMPRESS_LZO1X;
+ fo->Compress_level = 1; /* not used with LZO */
+ }
break;
case 'K':
fo->flags |= FO_NOATIME;
fo->flags |= FO_XATTR;
break;
default:
- Emsg1(M_ERROR, 0, _("Unknown include/exclude option: %c\n"), *p);
+ Jmsg1(NULL, M_ERROR, 0, _("Unknown include/exclude option: %c\n"), *p);
break;
}
}
*/
static int fileset_cmd(JCR *jcr)
{
+ POOL_MEM buf(PM_MESSAGE);
BSOCK *dir = jcr->dir_bsock;
int rtnstat;
-#if defined(WIN32_VSS)
- int vss = 0;
-
- sscanf(dir->msg, "fileset vss=%d", &vss);
- enable_vss = vss;
+#if HAVE_WIN32
+ jcr->Snapshot = (strstr(dir->msg, "vss=1") != NULL);
+#else
+ jcr->Snapshot = (strstr(dir->msg, "snap=1") != NULL);
#endif
-
if (!init_fileset(jcr)) {
return 0;
}
while (dir->recv() >= 0) {
strip_trailing_junk(dir->msg);
Dmsg1(500, "Fileset: %s\n", dir->msg);
- add_fileset(jcr, dir->msg);
+ pm_strcpy(buf, dir->msg);
+ add_fileset(jcr, buf.c_str());
}
if (!term_fileset(jcr)) {
return 0;
return rtnstat;
}
-static void free_bootstrap(JCR *jcr)
-{
- if (jcr->RestoreBootstrap) {
- unlink(jcr->RestoreBootstrap);
- free_pool_memory(jcr->RestoreBootstrap);
- jcr->RestoreBootstrap = NULL;
- }
-}
-
-static pthread_mutex_t bsr_mutex = PTHREAD_MUTEX_INITIALIZER;
-static uint32_t bsr_uniq = 0;
-
-/**
- * The Director sends us the bootstrap file, which
- * we will in turn pass to the SD.
- * Deprecated. The bsr is now sent directly from the
- * Director to the SD.
+/*
+ * The Director sends us the component info file, which
+ * we will in turn pass to the VSS plugin.
*/
-static int bootstrap_cmd(JCR *jcr)
+static int component_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- POOLMEM *fname = get_pool_memory(PM_FNAME);
- FILE *bs;
-
- free_bootstrap(jcr);
- P(bsr_mutex);
- bsr_uniq++;
- Mmsg(fname, "%s/%s.%s.%d.bootstrap", me->working_directory, me->hdr.name,
- jcr->Job, bsr_uniq);
- V(bsr_mutex);
- Dmsg1(400, "bootstrap=%s\n", fname);
- jcr->RestoreBootstrap = fname;
- bs = fopen(fname, "a+b"); /* create file */
- if (!bs) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"),
- jcr->RestoreBootstrap, be.bstrerror());
- /*
- * Suck up what he is sending to us so that he will then
- * read our error message.
- */
- while (dir->recv() >= 0)
- { }
- free_bootstrap(jcr);
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
while (dir->recv() >= 0) {
- Dmsg1(200, "filed<dird: bootstrap: %s", dir->msg);
- fputs(dir->msg, bs);
+ Dmsg1(200, "filed<dird: component: %s", dir->msg);
+ generate_plugin_event(jcr, bEventComponentInfo, (void *)dir->msg);
}
- fclose(bs);
- /*
- * Note, do not free the bootstrap yet -- it needs to be
- * sent to the SD
- */
- return dir->fsend(OKbootstrap);
+ return dir->fsend(OKComponentInfo);
}
/**
* Get backup level from Director
*
+ * Note: there are odd things such as accurate_differential,
+ * and accurate_incremental that are passed in level, thus
+ * the calls to strstr() below.
+ *
*/
static int level_cmd(JCR *jcr)
{
if (strstr(dir->msg, "accurate")) {
jcr->accurate = true;
}
- if (strstr(dir->msg, "incomplete")) {
- jcr->incomplete = true;
+ if (strstr(dir->msg, "rerunning")) {
+ jcr->rerunning = true;
}
if (sscanf(dir->msg, "level = %s ", level) != 1) {
goto bail_out;
}
/* Base backup requested? */
- if (strcmp(level, "base") == 0) {
+ if (strcasecmp(level, "base") == 0) {
jcr->setJobLevel(L_BASE);
/* Full backup requested? */
- } else if (strcmp(level, "full") == 0) {
+ } else if (strcasecmp(level, "full") == 0) {
jcr->setJobLevel(L_FULL);
} else if (strstr(level, "differential")) {
jcr->setJobLevel(L_DIFFERENTIAL);
* We get his UTC since time, then sync the clocks and correct it
* to agree with our clock.
*/
- } else if (strcmp(level, "since_utime") == 0) {
+ } else if (strcasecmp(level, "since_utime") == 0) {
buf = get_memory(dir->msglen+1);
utime_t since_time, adj;
- btime_t his_time, bt_start, rt=0, bt_adj=0;
+ btime_t his_time, bt_start, rt=0, bt_adj=0, his_time_prev=0, n=0;
if (jcr->getJobLevel() == L_NONE) {
jcr->setJobLevel(L_SINCE); /* if no other job level set, do it now */
}
- if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d",
- buf, &mtime_only) != 2) {
- goto bail_out;
+ if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d prev_job=%127s",
+ buf, &mtime_only, jcr->PrevJob) != 3) {
+ if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d",
+ buf, &mtime_only) != 2) {
+ goto bail_out;
+ }
}
since_time = str_to_uint64(buf); /* this is the since time */
- Dmsg1(100, "since_time=%lld\n", since_time);
+ Dmsg2(100, "since_time=%lld prev_job=%s\n", since_time, jcr->PrevJob);
char ed1[50], ed2[50];
/*
* Sync clocks by polling him for the time. We take
if (sscanf(dir->msg, "btime %s", buf) != 1) {
goto bail_out;
}
- if (i < 2) { /* toss first two results */
- continue;
- }
his_time = str_to_uint64(buf);
rt = get_current_btime() - bt_start; /* compute round trip time */
+ /* skip first two results and check for leap second */
+ /* if any of the FD or DIR went back in time, skip this iteration */
+ if (i < 2 || (his_time_prev > 0 && his_time < his_time_prev) || rt<0) {
+ his_time_prev = his_time;
+ continue;
+ }
+ his_time_prev = his_time;
+ n++;
Dmsg2(100, "Dirtime=%s FDtime=%s\n", edit_uint64(his_time, ed1),
edit_uint64(bt_start, ed2));
bt_adj += bt_start - his_time - rt/2;
Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2));
}
-
- bt_adj = bt_adj / 8; /* compute average time */
- Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2));
- adj = btime_to_utime(bt_adj);
- since_time += adj; /* adjust for clock difference */
+ adj = 0;
+ if (n > 0) { /* Should be 1 in the worst case */
+ bt_adj = bt_adj / n; /* compute average time */
+ Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2));
+ adj = btime_to_utime(bt_adj);
+ since_time += adj; /* adjust for clock difference */
+ }
/* Don't notify if time within 3 seconds */
if (adj > 3 || adj < -3) {
int type;
if (buf) {
free_memory(buf);
}
- generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel());
+ generate_plugin_event(jcr, bEventLevel, (void*)(intptr_t)jcr->getJobLevel());
return dir->fsend(OKlevel);
bail_out:
static void set_storage_auth_key(JCR *jcr, char *key)
{
/* if no key don't update anything */
- if (!*key) {
+ if (!*key) {
return;
}
/**
* We can be contacting multiple storage daemons.
- * So, make sure that any old jcr->store_bsock is cleaned up.
+ * So, make sure that any old jcr->store_bsock is cleaned up.
*/
- if (jcr->store_bsock) {
- jcr->store_bsock->destroy();
- jcr->store_bsock = NULL;
- }
+ free_bsock(jcr->store_bsock);
/**
* We can be contacting multiple storage daemons.
- * So, make sure that any old jcr->sd_auth_key is cleaned up.
+ * So, make sure that any old jcr->sd_auth_key is cleaned up.
*/
if (jcr->sd_auth_key) {
/*
}
jcr->sd_auth_key = bstrdup(key);
- Dmsg0(5, "set sd auth key\n");
+ Dmsg1(200, "set sd auth key %s\n", jcr->sd_auth_key);
}
/**
*/
static int storage_cmd(JCR *jcr)
{
- int stored_port; /* storage daemon port */
+ int stored_port = 0; /* storage daemon port */
int enable_ssl; /* enable ssl to sd */
POOL_MEM sd_auth_key(PM_MESSAGE);
BSOCK *dir = jcr->dir_bsock;
- BSOCK *sd = new_bsock(); /* storage daemon bsock */
-
+ BSOCK *sd;
Dmsg1(100, "StorageCmd: %s", dir->msg);
sd_auth_key.check_size(dir->msglen);
- if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port,
- &enable_ssl, sd_auth_key.c_str()) != 4) {
- if (sscanf(dir->msg, storaddr_v1, &jcr->stored_addr,
+ if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port,
+ &enable_ssl, sd_auth_key.c_str()) == 4) {
+ Dmsg1(100, "Set auth key %s\n", sd_auth_key.c_str());
+ set_storage_auth_key(jcr, sd_auth_key.c_str());
+ } else if (sscanf(dir->msg, storaddr_v1, &jcr->stored_addr,
&stored_port, &enable_ssl) != 3) {
- pm_strcpy(jcr->errmsg, dir->msg);
- Jmsg(jcr, M_FATAL, 0, _("Bad storage command: %s"), jcr->errmsg);
- goto bail_out;
- }
+ pm_strcpy(jcr->errmsg, dir->msg);
+ Jmsg(jcr, M_FATAL, 0, _("Bad storage command: %s"), jcr->errmsg);
+ Pmsg1(010, "Bad storage command: %s", jcr->errmsg);
+ goto bail_out;
}
- set_storage_auth_key(jcr, sd_auth_key.c_str());
- Dmsg3(110, "Open storage: %s:%d ssl=%d\n", jcr->stored_addr, stored_port,
- enable_ssl);
- /* Open command communications with Storage daemon */
- /* Try to connect for 1 hour at 10 second intervals */
+ /* TODO: see if we put limit on restore and backup... */
+ if (!jcr->max_bandwidth) {
+ if (jcr->director->max_bandwidth_per_job) {
+ jcr->max_bandwidth = jcr->director->max_bandwidth_per_job;
+
+ } else if (me->max_bandwidth_per_job) {
+ jcr->max_bandwidth = me->max_bandwidth_per_job;
+ }
+ }
- sd->set_source_address(me->FDsrc_addr);
- if (!sd->connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval,
+ if (stored_port != 0) { /* We are doing the connecting */
+ Dmsg3(110, "Connect to storage: %s:%d ssl=%d\n", jcr->stored_addr, stored_port,
+ enable_ssl);
+ jcr->sd_calls_client = false;
+ sd = new_bsock();
+ /* Open command communications with Storage daemon */
+ /* Try to connect for 1 hour at 10 second intervals */
+ sd->set_source_address(me->FDsrc_addr);
+ if (!sd->connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval,
_("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1)) {
- sd->destroy();
- sd = NULL;
+ /* destroy() OK because sd is local */
+ sd->destroy();
+ Jmsg2(jcr, M_FATAL, 0, _("Failed to connect to Storage daemon: %s:%d\n"),
+ jcr->stored_addr, stored_port);
+ Dmsg2(100, "Failed to connect to Storage daemon: %s:%d\n",
+ jcr->stored_addr, stored_port);
+ goto bail_out;
+ }
+
+ Dmsg0(110, "Connection OK to SD.\n");
+ jcr->store_bsock = sd;
+ } else { /* The storage daemon called us */
+ struct timeval tv;
+ struct timezone tz;
+ struct timespec timeout;
+ int errstat;
+
+ free_bsock(jcr->store_bsock);
+ jcr->sd_calls_client = true;
+
+ /*
+ * Wait for the Storage daemon to contact us to start the Job,
+ * when he does, we will be released, unless the 30 minutes
+ * expires.
+ */
+ gettimeofday(&tv, &tz);
+ timeout.tv_nsec = tv.tv_usec * 1000;
+ timeout.tv_sec = tv.tv_sec + 30 * 60; /* wait 30 minutes */
+ P(mutex);
+ while (jcr->sd_calls_client_bsock == NULL && !jcr->is_job_canceled()) {
+ errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
+ if (errstat == ETIMEDOUT || errstat == EINVAL || errstat == EPERM) {
+ break;
+ }
+ Dmsg1(800, "=== Auth cond errstat=%d\n", errstat);
+ }
+ V(mutex);
+ Dmsg2(800, "Auth fail or cancel for jid=%d %p\n", jcr->JobId, jcr);
+
+ /* We should already have a storage connection! */
+ if (jcr->sd_calls_client_bsock == NULL) {
+ Pmsg0(000, "Failed connect from Storage daemon. SD bsock=NULL.\n");
+ Pmsg1(000, "Storagecmd: %s", dir->msg);
+ Jmsg0(jcr, M_FATAL, 0, _("Failed connect from Storage daemon. SD bsock=NULL.\n"));
+ goto bail_out;
+ }
+ if (jcr->is_job_canceled()) {
+ goto bail_out;
+ }
+ /* Assign the new socket to the main one */
+ jcr->lock_auth();
+ jcr->store_bsock = jcr->sd_calls_client_bsock;
+ jcr->sd_calls_client_bsock = NULL;
+ jcr->unlock_auth();
}
+ jcr->store_bsock->set_bwlimit(jcr->max_bandwidth);
- if (sd == NULL) {
- Jmsg(jcr, M_FATAL, 0, _("Failed to connect to Storage daemon: %s:%d\n"),
- jcr->stored_addr, stored_port);
- Dmsg2(100, "Failed to connect to Storage daemon: %s:%d\n",
- jcr->stored_addr, stored_port);
+ if (!send_hello_sd(jcr, jcr->Job)) {
goto bail_out;
}
- Dmsg0(110, "Connection OK to SD.\n");
-
- jcr->store_bsock = sd;
- sd->fsend("Hello Start Job %s\n", jcr->Job);
if (!authenticate_storagedaemon(jcr)) {
- Jmsg(jcr, M_FATAL, 0, _("Failed to authenticate Storage daemon.\n"));
goto bail_out;
}
+ memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
Dmsg0(110, "Authenticated with SD.\n");
/* Send OK to Director */
bail_out:
dir->fsend(BADcmd, "storage");
return 0;
+}
+#ifdef HAVE_WIN32
+/* TODO: merge find.c ? */
+static bool is_excluded(findFILESET *fileset, char *path)
+{
+ int fnm_flags=FNM_CASEFOLD;
+ int fnmode=0;
+
+ /* Now apply the Exclude { } directive */
+ for (int i=0; i<fileset->exclude_list.size(); i++) {
+ findINCEXE *incexe = (findINCEXE *)fileset->exclude_list.get(i);
+ dlistString *node;
+
+ foreach_dlist(node, &incexe->name_list) {
+ char *fname = node->c_str();
+ Dmsg2(DT_VOLUME|50, "Testing %s against %s\n", path, fname);
+ if (fnmatch(fname, path, fnmode|fnm_flags) == 0) {
+ Dmsg1(050, "Reject wild2: %s\n", path);
+ return true;
+ }
+ /* On windows, the path separator is a bit complex to handle. For
+ * example, in fnmatch(), \ is written as \\\\ in the config file / is
+ * different from \ So we have our own little strcmp for filenames
+ */
+ char *p;
+ bool same=true;
+ for (p = path; *p && *fname && same ; p++, fname++) {
+ if (!((IsPathSeparator(*p) && IsPathSeparator(*fname)) ||
+ (tolower(*p) == tolower(*fname)))) {
+ same = false; /* Stop after the first one */
+ }
+ }
+
+ if (same) {
+ /* End of the for loop, strings looks to be identical */
+ Dmsg1(DT_VOLUME|50, "Reject: %s\n", path);
+ return true;
+ }
+
+ /* Looks to be the same string, but with a trailing slash */
+ if (fname[0] && IsPathSeparator(fname[0]) && fname[1] == '\0'
+ && p[0] == '\0')
+ {
+ Dmsg1(DT_VOLUME|50, "Reject: %s\n", path);
+ return true;
+ }
+ }
+ }
+ return false;
}
+/*
+ * For VSS we need to know which windows drives
+ * are used, because we create a snapshot of all used
+ * drives before operation
+ *
+ */
+static int
+get_win32_driveletters(JCR *jcr, FF_PKT *ff, char* szDrives)
+{
+ int nCount = 0;
-/**
+ findFILESET *fileset = ff->fileset;
+ int flags = 0;
+ char drive[4];
+
+ MTab mtab;
+ mtab.get(); /* read the disk structure */
+
+ /* Keep this part for compatibility reasons */
+ strcpy(drive, "c:\\");
+ for (int i=0; szDrives[i] ; i++) {
+ drive[0] = szDrives[i];
+ if (mtab.addInSnapshotSet(drive)) { /* When all volumes are selected, we can stop */
+ Dmsg0(DT_VOLUME|50, "All Volumes are marked, stopping the loop here\n");
+ goto all_included;
+ }
+ }
+
+ if (fileset) {
+ dlistString *node;
+
+ for (int i=0; i<fileset->include_list.size(); i++) {
+
+ findFOPTS *fo;
+ findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
+
+ /* look through all files */
+ foreach_dlist(node, &incexe->name_list) {
+ char *fname = node->c_str();
+ if (mtab.addInSnapshotSet(fname)) {
+ /* When all volumes are selected, we can stop */
+ Dmsg0(DT_VOLUME|50, "All Volumes are marked, stopping the loop here\n");
+ goto all_included;
+ }
+ }
+
+ foreach_alist(fo, &incexe->opts_list) {
+ flags |= fo->flags; /* We are looking for FO_MULTIFS and recurse */
+ }
+ }
+
+ /* TODO: it needs to be done Include by Include, but in the worst case,
+ * we take too much snapshots...
+ */
+ if (flags & FO_MULTIFS) {
+ /* Need to add subdirectories */
+ POOLMEM *fn = get_pool_memory(PM_FNAME);
+ MTabEntry *elt, *elt2;
+ int len;
+
+ Dmsg0(DT_VOLUME|50, "OneFS is set, looking for remaining volumes\n");
+
+ foreach_rblist(elt, mtab.entries) {
+ if (elt->in_SnapshotSet) {
+ continue; /* Already in */
+ }
+ /* A volume can have multiple mount points */
+ for (wchar_t *p = elt->first() ; p && *p ; p = elt->next(p)) {
+ wchar_2_UTF8(&fn, p);
+
+ Dmsg1(DT_VOLUME|50, "Looking for path %s\n", fn);
+
+ /* First case, root drive (c:/, e:/, d:/), not a submount point */
+ len = strlen(fn);
+ if (len <= 3) {
+ Dmsg1(DT_VOLUME|50, "Skiping %s\n", fn);
+ continue;
+ }
+
+ /* First thing is to look in the exclude list to see if this directory
+ * is explicitely excluded
+ */
+ if (is_excluded(fileset, fn)) {
+ Dmsg1(DT_VOLUME|50, "Looks to be excluded %s\n", fn);
+ continue;
+ }
+
+ /* c:/vol/vol2/vol3
+ * will look c:/, then c:/vol/, then c:/vol2/ and if one of them
+ * is selected, the sub volume will be directly marked.
+ */
+ for (char *p1 = fn ; *p1 && !elt->in_SnapshotSet ; p1++) {
+ if (IsPathSeparator(*p1)) {
+
+ char c = *(p1 + 1);
+ *(p1 + 1) = 0;
+
+ /* We look for the previous directory, and if marked, we mark
+ * the current one as well
+ */
+ Dmsg1(DT_VOLUME|50, "Looking for %s\n", fn);
+ elt2 = mtab.search(fn);
+ if (elt2 && elt2->in_SnapshotSet) {
+ Dmsg0(DT_VOLUME|50, "Put volume in SnapshotSet\n");
+ elt->setInSnapshotSet();
+ }
+
+ *(p1 + 1) = c; /* restore path separator */
+ }
+ }
+ }
+ }
+ free_pool_memory(fn);
+ }
+ all_included:
+ /* Now, we look the volume list to know which one to include */
+ MTabEntry *elt;
+ foreach_rblist(elt, mtab.entries) {
+ if (elt->in_SnapshotSet) {
+ Dmsg1(DT_VOLUME|50,"Adding volume in mount_points list %ls\n",elt->volumeName);
+ nCount++;
+ ff->mount_points.append(bwcsdup(elt->volumeName));
+ }
+ }
+ }
+
+ return nCount;
+}
+#endif /* HAVE_WIN32 */
+
+/*
* Do a backup.
*/
static int backup_cmd(JCR *jcr)
int SDJobStatus;
int32_t FileIndex;
-#if defined(WIN32_VSS)
- // capture state here, if client is backed up by multiple directors
- // and one enables vss and the other does not then enable_vss can change
- // between here and where its evaluated after the job completes.
- jcr->VSS = g_pVSSClient && enable_vss;
- if (jcr->VSS) {
- /* Run only one at a time */
- P(vss_mutex);
- }
-#endif
-
if (sscanf(dir->msg, "backup FileIndex=%ld\n", &FileIndex) == 1) {
jcr->JobFiles = FileIndex;
Dmsg1(100, "JobFiles=%ld\n", jcr->JobFiles);
}
- /**
- * Validate some options given to the backup make sense for the compiled in
- * options of this filed.
- */
- if (jcr->ff->flags & FO_ACL && !have_acl) {
- Jmsg(jcr, M_FATAL, 0, _("ACL support not configured for your machine.\n"));
- goto cleanup;
- }
- if (jcr->ff->flags & FO_XATTR && !have_xattr) {
- Jmsg(jcr, M_FATAL, 0, _("XATTR support not configured for your machine.\n"));
- goto cleanup;
- }
-
- set_jcr_job_status(jcr, JS_Blocked);
+ /*
+ * If explicitly requesting FO_ACL or FO_XATTR, fail job if it
+ * is not available on Client machine
+ */
+ if (jcr->ff->flags & FO_ACL && !(have_acl||have_win32)) {
+ Jmsg(jcr, M_FATAL, 0, _("ACL support not configured for Client.\n"));
+ goto cleanup;
+ }
+ if (jcr->ff->flags & FO_XATTR && !have_xattr) {
+ Jmsg(jcr, M_FATAL, 0, _("XATTR support not configured for Client.\n"));
+ goto cleanup;
+ }
+ jcr->setJobStatus(JS_Blocked);
jcr->setJobType(JT_BACKUP);
Dmsg1(100, "begin backup ff=%p\n", jcr->ff);
-
if (sd == NULL) {
Jmsg(jcr, M_FATAL, 0, _("Cannot contact Storage daemon\n"));
dir->fsend(BADcmd, "backup");
dir->fsend(OKbackup);
Dmsg1(110, "filed>dird: %s", dir->msg);
- /**
+ /*
* Send Append Open Session to Storage daemon
*/
sd->fsend(append_open);
if (!response(jcr, sd, OK_data, "Append Data")) {
goto cleanup;
}
-
+
generate_daemon_event(jcr, "JobStart");
generate_plugin_event(jcr, bEventStartBackupJob);
+ if (jcr->Snapshot) {
#if defined(WIN32_VSS)
+ P(vss_mutex);
/* START VSS ON WIN32 */
- if (jcr->VSS) {
- if (g_pVSSClient->InitializeForBackup(jcr)) {
- generate_plugin_event(jcr, bEventVssBackupAddComponents);
- /* tell vss which drives to snapshot */
- char szWinDriveLetters[27];
- *szWinDriveLetters=0;
- generate_plugin_event(jcr, bEventVssPrepareSnapshot, szWinDriveLetters);
- if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) {
- Jmsg(jcr, M_INFO, 0, _("Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"), g_pVSSClient->GetDriverName(), szWinDriveLetters);
- if (!g_pVSSClient->CreateSnapshots(szWinDriveLetters)) {
+ jcr->pVSSClient = VSSInit();
+ if (jcr->pVSSClient->InitializeForBackup(jcr)) {
+ generate_plugin_event(jcr, bEventVssBackupAddComponents);
+ /* tell vss which drives to snapshot */
+ char szWinDriveLetters[27];
+ *szWinDriveLetters=0;
+ generate_plugin_event(jcr, bEventVssPrepareSnapshot, szWinDriveLetters);
+ if (get_win32_driveletters(jcr, jcr->ff, szWinDriveLetters)) {
+ Jmsg(jcr, M_INFO, 0, _("Generate VSS snapshots. Driver=\"%s\"\n"),
+ jcr->pVSSClient->GetDriverName());
+
+ if (!jcr->pVSSClient->CreateSnapshots(&jcr->ff->mount_points)) {
berrno be;
- Jmsg(jcr, M_FATAL, 0, _("Generate VSS snapshots failed. ERR=%s\n"), be.bstrerror());
+ Jmsg(jcr, M_FATAL, 0, _("VSS CreateSnapshots failed. ERR=%s\n"),
+ be.bstrerror());
} else {
- /* tell user if snapshot creation of a specific drive failed */
- int i;
- for (i=0; i < (int)strlen(szWinDriveLetters); i++) {
- if (islower(szWinDriveLetters[i])) {
- Jmsg(jcr, M_FATAL, 0, _("Generate VSS snapshot of drive \"%c:\\\" failed.\n"), szWinDriveLetters[i]);
- }
- }
/* inform user about writer states */
- for (i=0; i < (int)g_pVSSClient->GetWriterCount(); i++) {
- if (g_pVSSClient->GetWriterState(i) < 1) {
- Jmsg(jcr, M_INFO, 0, _("VSS Writer (PrepareForBackup): %s\n"), g_pVSSClient->GetWriterInfo(i));
- }
+ for (int i=0; i < (int)jcr->pVSSClient->GetWriterCount(); i++) {
+ if (jcr->pVSSClient->GetWriterState(i) < 1) {
+ Jmsg(jcr, M_INFO, 0, _("VSS Writer (PrepareForBackup): %s\n"),
+ jcr->pVSSClient->GetWriterInfo(i));
+ }
}
}
- } else {
- Jmsg(jcr, M_FATAL, 0, _("No drive letters found for generating VSS snapshots.\n"));
- }
+ } else {
+ Jmsg(jcr, M_WARNING, 0, _("No drive letters found for generating VSS snapshots.\n"));
+ }
} else {
berrno be;
- Jmsg(jcr, M_FATAL, 0, _("VSS was not initialized properly. ERR=%s\n"), be.bstrerror());
- }
- run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS");
- }
+ Jmsg(jcr, M_FATAL, 0, _("VSS was not initialized properly. ERR=%s\n"),
+ be.bstrerror());
+ }
+ V(vss_mutex);
+#else
+ Dmsg0(10, "Open a snapshot session\n");
+ /* TODO: See if we abort the job */
+ jcr->Snapshot = open_snapshot_backup_session(jcr);
#endif
+ }
+ /* Call RunScript just after the Snapshot creation, usually, we restart services */
+ run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS");
- /**
+ /*
* Send Files to Storage daemon
*/
Dmsg1(110, "begin blast ff=%p\n", (FF_PKT *)jcr->ff);
if (!blast_data_to_storage_daemon(jcr, NULL)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- bnet_suppress_error_messages(sd, 1);
+ jcr->setJobStatus(JS_ErrorTerminated);
+ sd->suppress_error_messages(true);
Dmsg0(110, "Error in blast_data.\n");
} else {
- set_jcr_job_status(jcr, JS_Terminated);
+ jcr->setJobStatus(JS_Terminated);
/* Note, the above set status will not override an error */
if (!(jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings)) {
- bnet_suppress_error_messages(sd, 1);
+ sd->suppress_error_messages(true);
goto cleanup; /* bail out now */
}
/**
* Expect to get response to append_data from Storage daemon
*/
if (!response(jcr, sd, OK_append, "Append Data")) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ jcr->setJobStatus(JS_ErrorTerminated);
goto cleanup;
}
sd->fsend(append_end, jcr->Ticket);
/* Get end OK */
if (!response(jcr, sd, OK_end, "Append End")) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ jcr->setJobStatus(JS_ErrorTerminated);
goto cleanup;
}
Jmsg(jcr, M_FATAL, 0, _("Append Close with SD failed.\n"));
goto cleanup;
}
- if (!(SDJobStatus == JS_Terminated || SDJobStatus == JS_Warnings)) {
- Jmsg(jcr, M_FATAL, 0, _("Bad status %d returned from Storage Daemon.\n"),
- SDJobStatus);
+ if (!(SDJobStatus == JS_Terminated || SDJobStatus == JS_Warnings ||
+ SDJobStatus == JS_Incomplete)) {
+ Jmsg(jcr, M_FATAL, 0, _("Bad status %d %c returned from Storage Daemon.\n"),
+ SDJobStatus, (char)SDJobStatus);
}
}
cleanup:
#if defined(WIN32_VSS)
- if (jcr->VSS) {
+ if (jcr->Snapshot) {
Win32ConvCleanupCache();
- g_pVSSClient->DestroyWriterInfo();
- V(vss_mutex);
+ if (jcr->pVSSClient) {
+ jcr->pVSSClient->DestroyWriterInfo();
+ }
}
#endif
-
generate_plugin_event(jcr, bEventEndBackupJob);
return 0; /* return and stop command loop */
}
dir->fsend(OKverify);
generate_daemon_event(jcr, "JobStart");
- generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel());
+ generate_plugin_event(jcr, bEventLevel,(void *)(intptr_t)jcr->getJobLevel());
generate_plugin_event(jcr, bEventStartVerifyJob);
Dmsg1(110, "filed>dird: %s", dir->msg);
case L_VERIFY_CATALOG:
do_verify(jcr);
break;
+ case L_VERIFY_DATA:
case L_VERIFY_VOLUME_TO_CATALOG:
if (!open_sd_read_session(jcr)) {
return 0;
return 0; /* return and terminate command loop */
}
-#ifdef WIN32_VSS
-static bool vss_restore_init_callback(JCR *jcr, int init_type)
-{
- switch (init_type) {
- case VSS_INIT_RESTORE_AFTER_INIT:
- generate_plugin_event(jcr, bEventVssRestoreLoadComponentMetadata);
- return true;
- case VSS_INIT_RESTORE_AFTER_GATHER:
- generate_plugin_event(jcr, bEventVssRestoreSetComponentsSelected);
- return true;
- default:
- return false;
- break;
- }
-}
-#endif
-
-/**
+/*
* Do a Restore for Director
*
*/
{
BSOCK *dir = jcr->dir_bsock;
BSOCK *sd = jcr->store_bsock;
- POOLMEM *args;
+ POOLMEM *args=NULL, *restore_where=NULL, *restore_rwhere=NULL;
bool use_regexwhere=false;
int prefix_links;
char replace;
+ bool scan_ok = true;
+ int files;
+ int ret = 0;
/**
* Scan WHERE (base directory for restore) from command
/**
* No need to enable VSS for restore if we do not have plugin
- * data to restore
+ * data to restore
*/
- enable_vss = jcr->job_metadata != NULL;
-
- Dmsg2(50, "g_pVSSClient = %p, enable_vss = %d\n", g_pVSSClient, enable_vss);
- // capture state here, if client is backed up by multiple directors
- // and one enables vss and the other does not then enable_vss can change
- // between here and where its evaluated after the job completes.
- jcr->VSS = g_pVSSClient && enable_vss;
- if (jcr->VSS) {
- /* Run only one at a time */
- P(vss_mutex);
- }
+ jcr->Snapshot = jcr->got_metadata;
#endif
+
/* Pickup where string */
args = get_memory(dir->msglen+1);
*args = 0;
- if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, args) != 3) {
- if (sscanf(dir->msg, restorecmdR, &replace, &prefix_links, args) != 3){
- if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) {
- pm_strcpy(jcr->errmsg, dir->msg);
- Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg);
- return 0;
+ restore_where = get_pool_memory(PM_FNAME);
+ restore_rwhere = get_pool_memory(PM_FNAME);
+
+ /* We don't know the size of where/rwhere in advance,
+ * where= -> where=%202s\n
+ */
+ Mmsg(restore_where, "%s%%%ds\n", restorefcmd, dir->msglen);
+ Mmsg(restore_rwhere, "%s%%%ds\n", restorefcmdR, dir->msglen);
+
+ Dmsg2(200, "where=%srwhere=%s", restore_where, restore_rwhere);
+
+ /* Scan for new form with number of files to restore */
+ if (sscanf(dir->msg, restore_where, &files, &replace, &prefix_links, args) != 4) {
+ if (sscanf(dir->msg, restore_rwhere, &files, &replace, &prefix_links, args) != 4) {
+ if (sscanf(dir->msg, restorefcmd1, &files, &replace, &prefix_links) != 3) {
+ scan_ok = false;
+ }
+ *args = 0; /* No where argument */
+ } else {
+ use_regexwhere = true;
+ }
+ }
+
+ if (scan_ok) {
+ jcr->ExpectedFiles = files;
+ } else {
+ /* Scan for old form without number of files */
+ jcr->ExpectedFiles = 0;
+
+ /* where= -> where=%202s\n */
+ Mmsg(restore_where, "%s%%%ds\n", restorecmd, dir->msglen);
+ Mmsg(restore_rwhere, "%s%%%ds\n", restorecmdR, dir->msglen);
+
+ if (sscanf(dir->msg, restore_where, &replace, &prefix_links, args) != 3) {
+ if (sscanf(dir->msg, restore_rwhere, &replace, &prefix_links, args) != 3){
+ if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) {
+ pm_strcpy(jcr->errmsg, dir->msg);
+ Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg);
+ goto free_mempool;
+ }
+ jcr->RegexWhere = bstrdup(args);
+ *args = 0; /* No where argument */
+ } else {
+ use_regexwhere = true;
}
- *args = 0;
}
- use_regexwhere = true;
}
+
/* Turn / into nothing */
if (IsPathSeparator(args[0]) && args[1] == '\0') {
args[0] = '\0';
Dmsg2(150, "Got replace %c, where=%s\n", replace, args);
unbash_spaces(args);
+ /* Keep track of newly created directories to apply them correct attributes */
+ if (replace == REPLACE_NEVER || replace == REPLACE_IFNEWER) {
+ jcr->keep_path_list = true;
+ }
+
if (use_regexwhere) {
jcr->where_bregexp = get_bregexps(args);
if (!jcr->where_bregexp) {
Jmsg(jcr, M_FATAL, 0, _("Bad where regexp. where=%s\n"), args);
- free_pool_memory(args);
- return 0;
+ goto free_mempool;
}
} else {
jcr->where = bstrdup(args);
}
- free_pool_memory(args);
jcr->replace = replace;
jcr->prefix_links = prefix_links;
jcr->setJobType(JT_RESTORE);
- set_jcr_job_status(jcr, JS_Blocked);
+ jcr->setJobStatus(JS_Blocked);
if (!open_sd_read_session(jcr)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ jcr->setJobStatus(JS_ErrorTerminated);
goto bail_out;
}
- set_jcr_job_status(jcr, JS_Running);
+ jcr->setJobStatus(JS_Running);
/**
* Do restore of files and data
#if defined(WIN32_VSS)
/* START VSS ON WIN32 */
- if (jcr->VSS) {
- if (g_pVSSClient->InitializeForRestore(jcr, vss_restore_init_callback,
- (WCHAR *)jcr->job_metadata)) {
-
- /* inform user about writer states */
- int i;
- for (i=0; i < (int)g_pVSSClient->GetWriterCount(); i++) {
- if (g_pVSSClient->GetWriterState(i) < 1) {
- Jmsg(jcr, M_INFO, 0, _("VSS Writer (PreRestore): %s\n"), g_pVSSClient->GetWriterInfo(i));
- //jcr->JobErrors++;
- }
- }
- } else {
-/*
- int fd = open("C:\\eric.xml", O_CREAT | O_WRONLY | O_TRUNC, 0777);
- write(fd, (WCHAR *)jcr->job_metadata, wcslen((WCHAR *)jcr->job_metadata) * sizeof(WCHAR));
- close(fd);
-*/
+ if (jcr->Snapshot) {
+ jcr->pVSSClient = VSSInit();
+ if (!jcr->pVSSClient->InitializeForRestore(jcr)) {
berrno be;
Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support is disabled. ERR=%s\n"), be.bstrerror());
}
- free_and_null_pool_memory(jcr->job_metadata);
+ //free_and_null_pool_memory(jcr->job_metadata);
run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS");
}
#endif
- do_restore(jcr);
+ if (!jcr->is_canceled()) {
+ do_restore(jcr);
+ }
+
stop_dir_heartbeat(jcr);
- set_jcr_job_status(jcr, JS_Terminated);
+ jcr->setJobStatus(JS_Terminated);
if (jcr->JobStatus != JS_Terminated) {
- bnet_suppress_error_messages(sd, 1);
+ sd->suppress_error_messages(true);
}
/**
/* STOP VSS ON WIN32 */
/* tell vss to close the restore session */
Dmsg0(100, "About to call CloseRestore\n");
- if (jcr->VSS) {
+ if (jcr->Snapshot) {
+#if 0
generate_plugin_event(jcr, bEventVssBeforeCloseRestore);
+#endif
Dmsg0(100, "Really about to call CloseRestore\n");
- if (g_pVSSClient->CloseRestore()) {
+ if (jcr->pVSSClient->CloseRestore()) {
Dmsg0(100, "CloseRestore success\n");
+#if 0
/* inform user about writer states */
- for (int i=0; i<(int)g_pVSSClient->GetWriterCount(); i++) {
+ for (int i=0; i<(int)jcr->pVSSClient->GetWriterCount(); i++) {
int msg_type = M_INFO;
- if (g_pVSSClient->GetWriterState(i) < 1) {
+ if (jcr->pVSSClient->GetWriterState(i) < 1) {
//msg_type = M_WARNING;
//jcr->JobErrors++;
}
- Jmsg(jcr, msg_type, 0, _("VSS Writer (RestoreComplete): %s\n"), g_pVSSClient->GetWriterInfo(i));
+ Jmsg(jcr, msg_type, 0, _("VSS Writer (RestoreComplete): %s\n"),
+ jcr->pVSSClient->GetWriterInfo(i));
}
+#endif
}
- else
+ else {
Dmsg1(100, "CloseRestore fail - %08x\n", errno);
- V(vss_mutex);
+ }
}
#endif
bail_out:
bfree_and_null(jcr->where);
+ bfree_and_null(jcr->RegexWhere);
if (jcr->JobErrors) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ jcr->setJobStatus(JS_ErrorTerminated);
}
Dmsg0(100, "Done in job.c\n");
- int ret;
if (jcr->multi_restore) {
Dmsg0(100, OKstoreend);
dir->fsend(OKstoreend);
ret = 1; /* we continue the loop, waiting for next part */
} else {
- end_restore_cmd(jcr);
ret = 0; /* we stop here */
}
ret = 0; /* we stop here */
}
+ if (ret == 0) {
+ end_restore_cmd(jcr); /* stopping so send bEventEndRestoreJob */
+ }
+
+free_mempool:
+ free_and_null_pool_memory(args);
+ free_and_null_pool_memory(restore_where);
+ free_and_null_pool_memory(restore_rwhere);
+
return ret;
}
-static int end_restore_cmd(JCR *jcr)
+static int end_restore_cmd(JCR *jcr)
{
Dmsg0(5, "end_restore_cmd\n");
generate_plugin_event(jcr, bEventEndRestoreJob);
return 0;
}
- if (!send_bootstrap_file(jcr)) {
- return 0;
+ /*
+ * Use interactive session for the current restore
+ */
+ if (jcr->interactive_session) {
+ sd->fsend(read_ctrl, jcr->Ticket);
+ Dmsg1(110, ">stored: %s", sd->msg);
}
/*
*/
static void filed_free_jcr(JCR *jcr)
{
+ if (jcr->dir_bsock) {
+ free_bsock(jcr->dir_bsock);
+ jcr->dir_bsock = NULL;
+ }
+ if (jcr->sd_calls_client_bsock) {
+ free_bsock(jcr->sd_calls_client_bsock);
+ jcr->sd_calls_client_bsock = NULL;
+ }
if (jcr->store_bsock) {
- jcr->store_bsock->close();
+ free_bsock(jcr->store_bsock);
+ jcr->store_bsock = NULL;
}
- free_bootstrap(jcr);
if (jcr->last_fname) {
free_pool_memory(jcr->last_fname);
}
+#ifdef WIN32_VSS
+ VSSCleanup(jcr->pVSSClient);
+#endif
+ free_plugins(jcr); /* release instantiated plugins */
free_runscripts(jcr->RunScripts);
delete jcr->RunScripts;
+ free_path_list(jcr);
- if (jcr->JobId != 0)
+ if (jcr->JobId != 0) {
write_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
-
+ }
return;
}
*/
int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd)
{
+ int ret;
+
if (sd->errors) {
return 0;
}
- if (bget_msg(sd) > 0) {
+ if ((ret = bget_msg(sd)) > 0) {
Dmsg0(110, sd->msg);
if (strcmp(sd->msg, resp) == 0) {
return 1;
if (job_canceled(jcr)) {
return 0; /* if canceled avoid useless error messages */
}
- if (is_bnet_error(sd)) {
+ if (sd->is_error()) {
Jmsg2(jcr, M_FATAL, 0, _("Comm error with SD. bad response to %s. ERR=%s\n"),
- cmd, bnet_strerror(sd));
+ cmd, sd->bstrerror());
} else {
- Jmsg3(jcr, M_FATAL, 0, _("Bad response to %s command. Wanted %s, got %s\n"),
- cmd, resp, sd->msg);
+ char buf[256];
+ if (ret > 0) {
+ Jmsg4(jcr, M_FATAL, 0, _("Bad response from SD to %s command. Wanted %s, got len=%ld msg=\"%s\"\n"),
+ cmd, resp, sd->msglen, smartdump(sd->msg, sd->msglen, buf, sizeof(buf)));
+ } else {
+ Jmsg3(jcr, M_FATAL, 0, _("Bad response from SD to %s command. Wanted %s, got SIGNAL %s\n"),
+ cmd, resp, bnet_sig_to_ascii(ret));
+ }
}
return 0;
}
-
-static int send_bootstrap_file(JCR *jcr)
-{
- FILE *bs;
- char buf[2000];
- BSOCK *sd = jcr->store_bsock;
- const char *bootstrap = "bootstrap\n";
- int stat = 0;
-
- Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap);
- if (!jcr->RestoreBootstrap) {
- return 1;
- }
- bs = fopen(jcr->RestoreBootstrap, "rb");
- if (!bs) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
- jcr->RestoreBootstrap, be.bstrerror());
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- goto bail_out;
- }
- sd->msglen = pm_strcpy(sd->msg, bootstrap);
- sd->send();
- while (fgets(buf, sizeof(buf), bs)) {
- sd->msglen = Mmsg(sd->msg, "%s", buf);
- sd->send();
- }
- sd->signal(BNET_EOD);
- fclose(bs);
- if (!response(jcr, sd, OKSDbootstrap, "Bootstrap")) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- goto bail_out;
- }
- stat = 1;
-
-bail_out:
- free_bootstrap(jcr);
- return stat;
-}
projects / bacula / bacula / blobdiff