/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2010 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.
*
* Kern Sibbald, May MMI
*
- * Version $Id$
- *
*/
#include "bacula.h"
extern bool init_done;
/* Static variables */
-static char derrmsg[] = "3900 Invalid command\n";
+static char derrmsg[] = "3900 Invalid command:";
static char OKsetdebug[] = "3000 OK setdebug=%d\n";
static char invalid_cmd[] = "3997 Invalid command for a Director with Monitor directive enabled.\n";
+static char OK_bootstrap[] = "3000 OK bootstrap\n";
+static char ERROR_bootstrap[] = "3904 Error bootstrap\n";
/* Imported functions */
extern void terminate_child();
static bool cancel_cmd(JCR *cjcr);
static bool mount_cmd(JCR *jcr);
static bool unmount_cmd(JCR *jcr);
+//static bool action_on_purge_cmd(JCR *jcr);
static bool bootstrap_cmd(JCR *jcr);
static bool changer_cmd(JCR *sjcr);
static bool do_label(JCR *jcr, int relabel);
{"status", status_cmd, 1},
{".status", qstatus_cmd, 1},
{"unmount", unmount_cmd, 0},
+// {"action_on_purge", action_on_purge_cmd, 0},
{"use storage=", use_cmd, 0},
{"run", run_cmd, 0},
// {"query", query_cmd, 0},
char tbuf[100];
if (bs->recv() <= 0) {
- Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
+ Emsg1(M_ERROR, 0, _("Connection request from %s failed.\n"), bs->who());
bs->close();
return NULL;
}
*/
if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)) {
Dmsg1(000, "<filed: %s", bs->msg);
- Emsg1(M_ERROR, 0, _("Invalid connection. Len=%d\n"), bs->msglen);
+ Emsg2(M_ERROR, 0, _("Invalid connection from %s. Len=%d\n"), bs->who(), bs->msglen);
bs->close();
return NULL;
}
Dmsg1(200, "Do command: %s\n", cmds[i].cmd);
if (!cmds[i].func(jcr)) { /* do command */
quit = true; /* error, get out */
- Dmsg1(190, "Command %s reqeusts quit\n", cmds[i].cmd);
+ Dmsg1(190, "Command %s requests quit\n", cmds[i].cmd);
}
found = true; /* indicate command found */
break;
}
}
if (!found) { /* command not found */
- bs->fsend(derrmsg);
+ POOL_MEM err_msg;
+ Mmsg(err_msg, "%s %s\n", derrmsg, bs->msg);
+ bs->fsend(err_msg.c_str());
break;
}
}
#ifdef DEVELOPER
JCR *djcr = NULL;
int a;
- Pmsg0(000, "I have been requested to die ...");
+ BSOCK *dir = jcr->dir_bsock;
+ pthread_mutex_t m=PTHREAD_MUTEX_INITIALIZER;
+
+ if (strstr(dir->msg, "deadlock")) {
+ Pmsg0(000, "I have been requested to deadlock ...\n");
+ P(m);
+ P(m);
+ }
+
+ Pmsg1(000, "I have been requested to die ... (%s)\n", dir->msg);
a = djcr->JobId; /* ref NULL pointer */
#endif
return 0;
} else {
oldStatus = jcr->JobStatus;
set_jcr_job_status(jcr, JS_Canceled);
+ Dmsg2(800, "Cancel JobId=%d %p\n", jcr->JobId, jcr);
if (!jcr->authenticated && oldStatus == JS_WaitFD) {
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */
}
if (jcr->file_bsock) {
- bnet_sig(jcr->file_bsock, BNET_TERMINATE);
+ jcr->file_bsock->signal(BNET_TERMINATE);
+ jcr->file_bsock->set_terminated();
+ Dmsg2(800, "Term bsock jid=%d %p\n", jcr->JobId, jcr);
} else {
/* Still waiting for FD to connect, release it */
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
+ Dmsg2(800, "Signal FD connect jid=%d %p\n", jcr->JobId, jcr);
}
/* If thread waiting on mount, wake him */
if (jcr->dcr && jcr->dcr->dev && jcr->dcr->dev->waiting_for_mount()) {
Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId);
pthread_cond_broadcast(&wait_device_release);
}
- Jmsg(jcr, M_INFO, 0, _("Job %s marked to be canceled.\n"), jcr->Job);
+ Jmsg(jcr, M_INFO, 0, _("JobId=%d Job=\"%s\" marked to be canceled.\n"),
+ (int)jcr->JobId, jcr->Job);
dir->fsend(_("3000 Job %s marked to be canceled.\n"), jcr->Job);
free_jcr(jcr);
}
dev->truncating = true; /* let open() know we will truncate it */
}
/* Set old volume name for open if relabeling */
- bstrncpy(dcr->VolCatInfo.VolCatName, volname, sizeof(dcr->VolCatInfo.VolCatName));
+ dcr->setVolCatName(volname);
if (dev->open(dcr, mode) < 0) {
dir->fsend(_("3910 Unable to open device %s: ERR=%s\n"),
dev->print_name(), dev->bstrerror());
label_status = read_dev_volume_label(dcr);
/* Set new volume name */
- bstrncpy(dcr->VolCatInfo.VolCatName, newname, sizeof(dcr->VolCatInfo.VolCatName));
+ dcr->setVolCatName(newname);
switch(label_status) {
case VOL_NAME_ERROR:
case VOL_VERSION_ERROR:
/* Someone is waiting, wake him */
Dmsg0(100, "Waiting for mount. Attempting to wake thread\n");
dev->set_blocked(BST_MOUNT);
- dir->fsend("3001 OK mount. Device=%s\n",
- dev->print_name());
+ dir->fsend("3001 OK mount requested. %sDevice=%s\n",
+ slot>0?_("Specified slot ignored. "):"",
+ dev->print_name());
pthread_cond_broadcast(&dev->wait_next_vol);
Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)dcr->jcr->JobId);
pthread_cond_broadcast(&wait_device_release);
} else { /* must be file */
dir->fsend(_("3906 File device %s is always mounted.\n"),
dev->print_name());
+ pthread_cond_broadcast(&dev->wait_next_vol);
+ Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)dcr->jcr->JobId);
+ pthread_cond_broadcast(&wait_device_release);
}
break;
if (!unload_autochanger(dcr, -1)) {
/* ***FIXME**** what is this ???? */
dev->close();
+ free_volume(dev);
}
if (dev->is_unmountable() && !dev->unmount(0)) {
dir->fsend(_("3907 %s"), dev->bstrerror());
clear_thread_id(dev->no_wait_id);
if (!unload_autochanger(dcr, -1)) {
dev->close();
+ free_volume(dev);
}
if (dev->is_unmountable() && !dev->unmount(0)) {
dir->fsend(_("3907 %s"), dev->bstrerror());
return true;
}
+#if 0
+/*
+ * The truncate command will recycle a volume. The director can call this
+ * after purging a volume so that disk space will not be wasted. Only useful
+ * for File Storage, of course.
+ *
+ *
+ * It is currently disabled
+ */
+static bool action_on_purge_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+
+ char devname[MAX_NAME_LENGTH];
+ char volumename[MAX_NAME_LENGTH];
+ int action;
+
+ /* TODO: Need to find a free device and ask for slot to the director */
+ if (sscanf(dir->msg,
+ "action_on_purge %127s vol=%127s action=%d",
+ devname, volumename, &action)!= 5)
+ {
+ dir->fsend(_("3916 Error scanning action_on_purge command\n"));
+ goto done;
+ }
+ unbash_spaces(volumename);
+ unbash_spaces(devname);
+
+ /* Check if action is correct */
+ if (action & AOP_TRUNCTATE) {
+
+ }
+ /* ... */
+
+done:
+ dir->signal(BNET_EOD);
+ return true;
+}
+#endif
+
/*
* Release command from Director. This rewinds the device and if
* configured does a offline and ensures that Bacula will
return true;
}
+static pthread_mutex_t bsr_mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint32_t bsr_uniq = 0;
+
+static bool get_bootstrap_file(JCR *jcr, BSOCK *sock)
+{
+ POOLMEM *fname = get_pool_memory(PM_FNAME);
+ FILE *bs;
+ bool ok = false;
+
+ if (jcr->RestoreBootstrap) {
+ unlink(jcr->RestoreBootstrap);
+ free_pool_memory(jcr->RestoreBootstrap);
+ }
+ 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());
+ goto bail_out;
+ }
+ Dmsg0(10, "=== Bootstrap file ===\n");
+ while (sock->recv() >= 0) {
+ Dmsg1(10, "%s", sock->msg);
+ fputs(sock->msg, bs);
+ }
+ fclose(bs);
+ Dmsg0(10, "=== end bootstrap file ===\n");
+ jcr->bsr = parse_bsr(jcr, jcr->RestoreBootstrap);
+ if (!jcr->bsr) {
+ Jmsg(jcr, M_FATAL, 0, _("Error parsing bootstrap file.\n"));
+ goto bail_out;
+ }
+ if (debug_level >= 10) {
+ dump_bsr(jcr->bsr, true);
+ }
+ /* If we got a bootstrap, we are reading, so create read volume list */
+ create_restore_volume_list(jcr);
+ ok = true;
+
+bail_out:
+ unlink(jcr->RestoreBootstrap);
+ free_pool_memory(jcr->RestoreBootstrap);
+ jcr->RestoreBootstrap = NULL;
+ if (!ok) {
+ sock->fsend(ERROR_bootstrap);
+ return false;
+ }
+ return sock->fsend(OK_bootstrap);
+}
static bool bootstrap_cmd(JCR *jcr)
{
- /* If getting the bootstrap file succeeds, we do not need
- * the FD because we will be reading.
- */
- jcr->need_fd = false;
return get_bootstrap_file(jcr, jcr->dir_bsock);
}
*/
bool safe_cmd = false;
- if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) {
+ if (sscanf(dir->msg, "autochanger listall %127s", devname.c_str()) == 1) {
+ cmd = "listall";
+ safe_cmd = ok = true;
+ } else if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) {
cmd = "list";
safe_cmd = ok = true;
} else if (sscanf(dir->msg, "autochanger slots %127s", devname.c_str()) == 1) {
projects / bacula / bacula / blobdiff