-/*
- *
- * Bacula Director -- User Agent Commands
- *
- * Kern Sibbald, September MM
- *
- * Version $Id$
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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.
+ 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 General Public License
+ 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 John Walker.
+ 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 Director -- User Agent Commands
+ *
+ * Kern Sibbald, September MM
+ *
+ * Version $Id$
+ */
+
#include "bacula.h"
#include "dird.h"
+#ifdef HAVE_PYTHON
+
+#undef _POSIX_C_SOURCE
+#include <Python.h>
+
+#include "lib/pythonlib.h"
+
+/* Imported Functions */
+extern PyObject *job_getattr(PyObject *self, char *attrname);
+extern int job_setattr(PyObject *self, char *attrname, PyObject *value);
+
+#endif /* HAVE_PYTHON */
+
/* Imported subroutines */
/* Imported variables */
-extern int r_first;
-extern int r_last;
-extern struct s_res resources[];
extern jobq_t job_queue; /* job queue */
/* Imported functions */
-extern int status_cmd(UAContext *ua, const char *cmd);
+extern int autodisplay_cmd(UAContext *ua, const char *cmd);
+extern int gui_cmd(UAContext *ua, const char *cmd);
+extern int label_cmd(UAContext *ua, const char *cmd);
extern int list_cmd(UAContext *ua, const char *cmd);
extern int llist_cmd(UAContext *ua, const char *cmd);
-extern int show_cmd(UAContext *ua, const char *cmd);
extern int messagescmd(UAContext *ua, const char *cmd);
-extern int autodisplay_cmd(UAContext *ua, const char *cmd);
-extern int gui_cmd(UAContext *ua, const char *cmd);
-extern int sqlquerycmd(UAContext *ua, const char *cmd);
-extern int querycmd(UAContext *ua, const char *cmd);
-extern int retentioncmd(UAContext *ua, const char *cmd);
extern int prunecmd(UAContext *ua, const char *cmd);
extern int purgecmd(UAContext *ua, const char *cmd);
-extern int restore_cmd(UAContext *ua, const char *cmd);
-extern int label_cmd(UAContext *ua, const char *cmd);
+extern int querycmd(UAContext *ua, const char *cmd);
extern int relabel_cmd(UAContext *ua, const char *cmd);
+extern int restore_cmd(UAContext *ua, const char *cmd);
+extern int retentioncmd(UAContext *ua, const char *cmd);
+extern int show_cmd(UAContext *ua, const char *cmd);
+extern int sqlquerycmd(UAContext *ua, const char *cmd);
+extern int status_cmd(UAContext *ua, const char *cmd);
extern int update_cmd(UAContext *ua, const char *cmd);
/* Forward referenced functions */
static int add_cmd(UAContext *ua, const char *cmd);
-static int create_cmd(UAContext *ua, const char *cmd);
+static int automount_cmd(UAContext *ua, const char *cmd);
static int cancel_cmd(UAContext *ua, const char *cmd);
-static int enable_cmd(UAContext *ua, const char *cmd);
+static int create_cmd(UAContext *ua, const char *cmd);
+static int delete_cmd(UAContext *ua, const char *cmd);
static int disable_cmd(UAContext *ua, const char *cmd);
-static int setdebug_cmd(UAContext *ua, const char *cmd);
-static int trace_cmd(UAContext *ua, const char *cmd);
-static int var_cmd(UAContext *ua, const char *cmd);
+static int enable_cmd(UAContext *ua, const char *cmd);
static int estimate_cmd(UAContext *ua, const char *cmd);
static int help_cmd(UAContext *ua, const char *cmd);
-static int delete_cmd(UAContext *ua, const char *cmd);
-static int use_cmd(UAContext *ua, const char *cmd);
+static int memory_cmd(UAContext *ua, const char *cmd);
+static int mount_cmd(UAContext *ua, const char *cmd);
+static int python_cmd(UAContext *ua, const char *cmd);
+static int release_cmd(UAContext *ua, const char *cmd);
+static int reload_cmd(UAContext *ua, const char *cmd);
+static int setdebug_cmd(UAContext *ua, const char *cmd);
+static int setip_cmd(UAContext *ua, const char *cmd);
+static int time_cmd(UAContext *ua, const char *cmd);
+static int trace_cmd(UAContext *ua, const char *cmd);
static int unmount_cmd(UAContext *ua, const char *cmd);
+static int use_cmd(UAContext *ua, const char *cmd);
+static int var_cmd(UAContext *ua, const char *cmd);
static int version_cmd(UAContext *ua, const char *cmd);
-static int automount_cmd(UAContext *ua, const char *cmd);
-static int time_cmd(UAContext *ua, const char *cmd);
-static int reload_cmd(UAContext *ua, const char *cmd);
+static int wait_cmd(UAContext *ua, const char *cmd);
+
+static void do_job_delete(UAContext *ua, JobId_t JobId);
+static bool delete_job_id_range(UAContext *ua, char *tok);
static int delete_volume(UAContext *ua);
static int delete_pool(UAContext *ua);
static void delete_job(UAContext *ua);
-static int mount_cmd(UAContext *ua, const char *cmd);
-static int release_cmd(UAContext *ua, const char *cmd);
-static int wait_cmd(UAContext *ua, const char *cmd);
-static int setip_cmd(UAContext *ua, const char *cmd);
-static int python_cmd(UAContext *ua, const char *cmd);
-static void do_job_delete(UAContext *ua, JobId_t JobId);
-static void delete_job_id_range(UAContext *ua, char *tok);
int qhelp_cmd(UAContext *ua, const char *cmd);
int quit_cmd(UAContext *ua, const char *cmd);
-
-struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; };
-static struct cmdstruct commands[] = {
- { NT_("add"), add_cmd, _("add media to a pool")},
- { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")},
- { NT_("automount"), automount_cmd, _("automount [on|off] -- after label")},
- { NT_("cancel"), cancel_cmd, _("cancel [<jobid=nnn> | <job=name>] -- cancel a job")},
- { NT_("create"), create_cmd, _("create DB Pool from resource")},
- { NT_("delete"), delete_cmd, _("delete [pool=<pool-name> | media volume=<volume-name>]")},
- { NT_("disable"), disable_cmd, _("disable <job=name> -- disable a job")},
- { NT_("enable"), enable_cmd, _("enable <job=name> -- enable a job")},
- { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")},
- { NT_("exit"), quit_cmd, _("exit = quit")},
- { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode")},
- { NT_("help"), help_cmd, _("print this command")},
- { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media <pool=pool-name> | files <jobid=nn>]; from catalog")},
- { NT_("label"), label_cmd, _("label a tape")},
- { NT_("llist"), llist_cmd, _("full or long list like list command")},
- { NT_("messages"), messagescmd, _("messages")},
- { NT_("mount"), mount_cmd, _("mount <storage-name>")},
- { NT_("prune"), prunecmd, _("prune expired records from catalog")},
- { NT_("purge"), purgecmd, _("purge records from catalog")},
- { NT_("python"), python_cmd, _("python control commands")},
- { NT_("quit"), quit_cmd, _("quit")},
- { NT_("query"), querycmd, _("query catalog")},
- { NT_("restore"), restore_cmd, _("restore files")},
- { NT_("relabel"), relabel_cmd, _("relabel a tape")},
- { NT_("release"), release_cmd, _("release <storage-name>")},
- { NT_("reload"), reload_cmd, _("reload conf file")},
- { NT_("run"), run_cmd, _("run <job-name>")},
- { NT_("status"), status_cmd, _("status [storage | client]=<name>")},
- { NT_("setdebug"), setdebug_cmd, _("sets debug level")},
- { NT_("setip"), setip_cmd, _("sets new client address -- if authorized")},
- { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")},
- { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")},
- { NT_("time"), time_cmd, _("print current time")},
- { NT_("trace"), trace_cmd, _("turn on/off trace to file")},
- { NT_("unmount"), unmount_cmd, _("unmount <storage-name>")},
- { NT_("umount"), unmount_cmd, _("umount <storage-name> for old-time Unix guys")},
- { NT_("update"), update_cmd, _("update Volume, Pool or slots")},
- { NT_("use"), use_cmd, _("use catalog xxx")},
- { NT_("var"), var_cmd, _("does variable expansion")},
- { NT_("version"), version_cmd, _("print Director version")},
- { NT_("wait"), wait_cmd, _("wait until no jobs are running [<jobname=name> | <jobid=nnn> | <ujobid=complete_name>]")},
- };
-#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
+/* not all in alphabetical order. New commands are added after existing commands with similar letters
+ to prevent breakage of existing user scripts. */
+struct cmdstruct {
+ const char *key; /* command */
+ int (*func)(UAContext *ua, const char *cmd); /* handler */
+ const char *help; /* main purpose */
+ const char *usage; /* all arguments to build usage */
+ const bool use_in_rs; /* Can use it in Console RunScript */
+};
+static struct cmdstruct commands[] = { /* Can use it in Console RunScript*/
+ { NT_("add"), add_cmd, _("Add media to a pool"), NT_("pool=<pool-name> storage=<storage> jobid=<JobId>"), false},
+ { NT_("autodisplay"), autodisplay_cmd,_("Autodisplay console messages"), NT_("on | off"), false},
+ { NT_("automount"), automount_cmd, _("Automount after label"), NT_("on | off"), false},
+ { NT_("cancel"), cancel_cmd, _("Cancel a job"), NT_("jobid=<number> job=<job-name> ujobid=<unique-jobid>"), false},
+ { NT_("create"), create_cmd, _("Create DB Pool from resource"), NT_("pool=<pool-name>"), false},
+ { NT_("delete"), delete_cmd, _("Delete volume, pool or job"), NT_("volume=<vol-name> pool=<pool-name> jobid=<id>"), true},
+ { NT_("disable"), disable_cmd, _("Disable a job"), NT_("job=<name>"), true},
+ { NT_("enable"), enable_cmd, _("Enable a job"), NT_("job=<name>"), true},
+ { NT_("estimate"), estimate_cmd, _("Performs FileSet estimate, listing gives full listing"),
+ NT_("fileset=<fs> client=<cli> level=<level> accurate=<yes/no> job=<job> listing"), true},
+
+ { NT_("exit"), quit_cmd, _("Terminate Bconsole session"), NT_(""), false},
+ { NT_("gui"), gui_cmd, _("Non-interactive gui mode"), NT_("on | off"), false},
+ { NT_("help"), help_cmd, _("Print help on specific command"),
+ NT_("add autodisplay automount cancel create delete disable\n\tenable estimate exit gui label list llist"
+ "\n\tmessages memory mount prune purge python quit query\n\trestore relabel release reload run status"
+ "\n\tsetdebug setip show sqlquery time trace unmount umount\n\tupdate use var version wait"), false},
+
+ { NT_("label"), label_cmd, _("Label a tape"), NT_("storage=<storage> volume=<vol> pool=<pool>"), false},
+ { NT_("list"), list_cmd, _("List objects from catalog"),
+ NT_("pools | jobs | jobtotals | volume | media <pool=pool-name> | files jobid=<nn> | copies jobid=<nn>"), true},
+
+ { NT_("llist"), llist_cmd, _("Full or long list like list command"),
+ NT_("pools | jobs | jobtotals | media <pool=pool-name> | files jobid=<nn> | copies jobid=<nn>"), true},
+
+ { NT_("messages"), messagescmd, _("Display pending messages"), NT_(""), false},
+ { NT_("memory"), memory_cmd, _("Print current memory usage"), NT_(""), true},
+ { NT_("mount"), mount_cmd, _("Mount storage"),
+ NT_("storage=<storage-name> slot=<num> drive=<num> [ jobid=<id> | job=<job-name> ]"), false},
+
+ { NT_("prune"), prunecmd, _("Prune expired records from catalog"),
+ NT_("files | jobs | pool=<pool> | client=<client-name> | volume=<volume-name> "), true},
+
+ { NT_("purge"), purgecmd, _("Purge records from catalog"), NT_("files jobs volume=<vol> [action=<action> devicetype=<type> pool=<pool> allpools storage=<st> drive=<num>]"), true},
+ { NT_("python"), python_cmd, _("Python control commands"), NT_(""), false},
+ { NT_("quit"), quit_cmd, _("Terminate Bconsole session"), NT_(""), false},
+ { NT_("query"), querycmd, _("Query catalog"), NT_(""), false},
+ { NT_("restore"), restore_cmd, _("Restore files"),
+ NT_("where=</path> client=<client> storage=<storage> bootstrap=<file>"
+ "\n\tcomment=<text> jobid=<jobid> done select all"), false},
+
+ { NT_("relabel"), relabel_cmd, _("Relabel a tape"),
+ NT_("storage=<storage-name> oldvolume=<old-volume-name>\n\tvolume=<newvolume-name> pool=<pool>"), false},
+
+ { NT_("release"), release_cmd, _("Release storage"), NT_("storage-name"), false},
+ { NT_("reload"), reload_cmd, _("Reload conf file"), NT_(""), true},
+ { NT_("run"), run_cmd, _("Run a job"),
+ NT_("job=<job-name> client=<client-name>\n\tfileset=<FileSet-name> level=<level-keyword>\n\tstorage=<storage-name>"
+ "where=<directory-prefix>\n\twhen=<universal-time-specification>\n\tcomment=<text> yes"), false},
+
+ { NT_("status"), status_cmd, _("Report status"),
+ NT_("all | dir=<dir-name> | director | client=<client-name> | storage=<storage-name> slots | days=nnn"), true},
+
+ { NT_("setdebug"), setdebug_cmd, _("Sets debug level"),
+ NT_("level=<nn> trace=0/1 client=<client-name> | dir | storage=<storage-name> | all"), true},
+
+ { NT_("setip"), setip_cmd, _("Sets new client address -- if authorized"), NT_(""), false},
+ { NT_("show"), show_cmd, _("Show resource records"),
+ NT_("job=<xxx> | pool=<yyy> | fileset=<aaa> schedule=<sss> | client=<zzz> | disabled | all"), true},
+
+ { NT_("sqlquery"), sqlquerycmd, _("Use SQL to query catalog"), NT_(""), false},
+ { NT_("time"), time_cmd, _("Print current time"), NT_(""), true},
+ { NT_("trace"), trace_cmd, _("Turn on/off trace to file"), NT_("on | off"), true},
+ { NT_("unmount"), unmount_cmd, _("Unmount storage"),
+ NT_("storage=<storage-name> [ drive=<num> ] | jobid=<id> | job=<job-name>"), false},
+
+ { NT_("umount"), unmount_cmd, _("Umount - for old-time Unix guys, see unmount"),
+ NT_("storage=<storage-name> [ drive=<num> ] | jobid=<id> | job=<job-name>"), false},
+
+ { NT_("update"), update_cmd, _("Update volume, pool or stats"),
+ NT_("stats\n\tpool=<poolname>\n\tslots storage=<storage> scan"
+ "\n\tvolume=<volname> volstatus=<status> volretention=<time-def>"
+ "\n\t pool=<pool> recycle=<yes/no> slot=<number>\n\t inchanger=<yes/no>"
+ "\n\t maxvolbytes=<size> maxvolfiles=<nb> maxvoljobs=<nb>"
+ "\n\t enable=<yes/no> recyclepool=<pool> actiononpurge=<action>"),true},
+ { NT_("use"), use_cmd, _("Use catalog xxx"), NT_(""), false},
+ { NT_("var"), var_cmd, _("Does variable expansion"), NT_(""), false},
+ { NT_("version"), version_cmd, _("Print Director version"), NT_(""), true},
+ { NT_("wait"), wait_cmd, _("Wait until no jobs are running"),
+ NT_("jobname=<name> | jobid=<nnn> | ujobid=<complete_name>"), false}
+};
+
+#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct)))
/*
* Execute a command from the UA
*/
-int do_a_command(UAContext *ua, const char *cmd)
+bool do_a_command(UAContext *ua)
{
- unsigned int i;
- int len, stat;
+ int i;
+ int len;
+ bool ok = false;
bool found = false;
+ BSOCK *user = ua->UA_sock;
- stat = 1;
- Dmsg1(900, "Command: %s\n", ua->UA_sock->msg);
+ Dmsg1(900, "Command: %s\n", ua->argk[0]);
if (ua->argc == 0) {
- return 1;
+ return false;
}
while (ua->jcr->wstorage->size()) {
!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) {
break;
}
- stat = (*commands[i].func)(ua, cmd); /* go execute command */
+ /* Check if this command is authorized in RunScript */
+ if (ua->runscript && !commands[i].use_in_rs) {
+ ua->error_msg(_("Can't use %s command in a runscript"), ua->argk[0]);
+ break;
+ }
+ if (ua->api) user->signal(BNET_CMD_BEGIN);
+ ok = (*commands[i].func)(ua, ua->cmd); /* go execute command */
+ if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
found = true;
break;
}
}
if (!found) {
- bnet_fsend(ua->UA_sock, _("%s: is an invalid command.\n"), ua->argk[0]);
+ ua->error_msg(_("%s: is an invalid command.\n"), ua->argk[0]);
+ ok = false;
}
- return stat;
+ return ok;
}
/*
mr->Recycle = pr->Recycle;
mr->VolRetention = pr->VolRetention;
mr->VolUseDuration = pr->VolUseDuration;
+ mr->ActionOnPurge = pr->ActionOnPurge;
+ mr->RecyclePoolId = pr->RecyclePoolId;
mr->MaxVolJobs = pr->MaxVolJobs;
mr->MaxVolFiles = pr->MaxVolFiles;
mr->MaxVolBytes = pr->MaxVolBytes;
STORE *store;
int Slot = 0, InChanger = 0;
- bsendmsg(ua, _(
+ ua->send_msg(_(
"You probably don't want to be using this command since it\n"
"creates database records without labeling the Volumes.\n"
"You probably want to use the \"label\" command.\n\n"));
pr.MaxVols, pr.PoolType);
while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
- bsendmsg(ua, _("Pool already has maximum volumes=%d\n"), pr.MaxVols);
- for (;;) {
- if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) {
- return 1;
- }
- pr.MaxVols = ua->pint32_val;
+ ua->warning_msg(_("Pool already has maximum volumes=%d\n"), pr.MaxVols);
+ if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) {
+ return 1;
}
+ pr.MaxVols = ua->pint32_val;
}
/* Get media type */
}
num = ua->pint32_val;
if (num < 0 || num > max) {
- bsendmsg(ua, _("The number must be between 0 and %d\n"), max);
+ ua->warning_msg(_("The number must be between 0 and %d\n"), max);
continue;
}
break;
}
-getVolName:
- if (num == 0) {
- if (!get_cmd(ua, _("Enter Volume name: "))) {
- return 1;
+
+ for (;;) {
+ if (num == 0) {
+ if (!get_cmd(ua, _("Enter Volume name: "))) {
+ return 1;
+ }
+ } else {
+ if (!get_cmd(ua, _("Enter base volume name: "))) {
+ return 1;
+ }
}
- } else {
- if (!get_cmd(ua, _("Enter base volume name: "))) {
- return 1;
+ /* Don't allow | in Volume name because it is the volume separator character */
+ if (!is_volume_name_legal(ua, ua->cmd)) {
+ continue;
}
- }
- /* Don't allow | in Volume name because it is the volume separator character */
- if (!is_volume_name_legal(ua, ua->cmd)) {
- goto getVolName;
- }
- if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) {
- bsendmsg(ua, _("Volume name too long.\n"));
- goto getVolName;
- }
- if (strlen(ua->cmd) == 0) {
- bsendmsg(ua, _("Volume name must be at least one character long.\n"));
- goto getVolName;
+ if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) {
+ ua->warning_msg(_("Volume name too long.\n"));
+ continue;
+ }
+ if (strlen(ua->cmd) == 0) {
+ ua->warning_msg(_("Volume name must be at least one character long.\n"));
+ continue;
+ }
+ break;
}
bstrncpy(name, ua->cmd, sizeof(name));
}
startnum = ua->pint32_val;
if (startnum < 1) {
- bsendmsg(ua, _("Start number must be greater than zero.\n"));
+ ua->warning_msg(_("Start number must be greater than zero.\n"));
continue;
}
break;
mr.Enabled = 1;
Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
return 1;
}
if (i == startnum) {
pr.NumVols += num;
Dmsg0(200, "Update pool record.\n");
if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->warning_msg("%s", db_strerror(ua->db));
return 1;
}
- bsendmsg(ua, _("%d Volumes created in pool %s\n"), num, pr.Name);
+ ua->send_msg(_("%d Volumes created in pool %s\n"), num, pr.Name);
return 1;
}
for (i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
uint32_t JobId;
- if (!ua->argv[i]) {
+ JobId = str_to_int64(ua->argv[i]);
+ if (!JobId) {
break;
}
- JobId = str_to_int64(ua->argv[i]);
if (!(jcr=get_jcr_by_id(JobId))) {
- bsendmsg(ua, _("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]);
+ ua->error_msg(_("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]);
return 1;
}
break;
break;
}
if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) {
- bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+ ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
jcr = new_jcr(sizeof(JCR), dird_free_jcr);
bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
}
break;
}
if (!(jcr=get_jcr_by_full_name(ua->argv[i]))) {
- bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+ ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
jcr = new_jcr(sizeof(JCR), dird_free_jcr);
bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
}
}
if (jcr) {
if (jcr->job && !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
- bsendmsg(ua, _("Unauthorized command from this console.\n"));
+ ua->error_msg(_("Unauthorized command from this console.\n"));
return 1;
}
} else {
if (njobs == 0) { /* no authorized */
if (tjobs == 0) {
- bsendmsg(ua, _("No Jobs running.\n"));
+ ua->send_msg(_("No Jobs running.\n"));
} else {
- bsendmsg(ua, _("None of your jobs are running.\n"));
+ ua->send_msg(_("None of your jobs are running.\n"));
}
return 1;
}
if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), buf, sizeof(buf)) < 0) {
return 1;
}
- if (njobs == 1) {
- if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) {
+ if (ua->api && njobs == 1) {
+ char nbuf[1000];
+ bsnprintf(nbuf, sizeof(nbuf), _("Cancel: %s\n\n%s"), buf,
+ _("Confirm cancel?"));
+ if (!get_yesno(ua, nbuf) || ua->pint32_val == 0) {
return 1;
}
+ } else {
+ if (njobs == 1) {
+ if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) {
+ return 1;
+ }
+ }
}
sscanf(buf, "JobId=%d Job=%127s", &njobs, JobName);
jcr = get_jcr_by_full_name(JobName);
if (!jcr) {
- bsendmsg(ua, _("Job \"%s\" not found.\n"), JobName);
+ ua->warning_msg(_("Job \"%s\" not found.\n"), JobName);
return 1;
}
}
* the setting of MaxVols and NumVols slightly differently
* depending on if we are creating the Pool or we are
* simply bringing it into agreement with the resource (updage).
+ *
+ * Caution : RecyclePoolId isn't setup in this function.
+ * You can use set_pooldbr_recyclepoolid();
+ *
*/
void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op)
{
pr->MaxVolFiles = pool->MaxVolFiles;
pr->MaxVolBytes = pool->MaxVolBytes;
pr->AutoPrune = pool->AutoPrune;
+ pr->ActionOnPurge = pool->action_on_purge;
pr->Recycle = pool->Recycle;
if (pool->label_format) {
bstrncpy(pr->LabelFormat, pool->label_format, sizeof(pr->LabelFormat));
}
}
+/* set/update Pool.RecyclePoolId and Pool.ScratchPoolId in Catalog */
+int update_pool_references(JCR *jcr, B_DB *db, POOL *pool)
+{
+ POOL_DBR pr;
+
+ if (!pool->RecyclePool && !pool->ScratchPool) {
+ return 1;
+ }
+
+ memset(&pr, 0, sizeof(POOL_DBR));
+ bstrncpy(pr.Name, pool->name(), sizeof(pr.Name));
+
+ if (!db_get_pool_record(jcr, db, &pr)) {
+ return -1; /* not exists in database */
+ }
+
+ set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE);
+
+ if (!set_pooldbr_references(jcr, db, &pr, pool)) {
+ return -1; /* error */
+ }
+
+ if (!db_update_pool_record(jcr, db, &pr)) {
+ return -1; /* error */
+ }
+ return 1;
+}
+
+/* set POOL_DBR.RecyclePoolId and POOL_DBR.ScratchPoolId from Pool resource
+ * works with set_pooldbr_from_poolres
+ */
+bool set_pooldbr_references(JCR *jcr, B_DB *db, POOL_DBR *pr, POOL *pool)
+{
+ POOL_DBR rpool;
+ bool ret = true;
+
+ if (pool->RecyclePool) {
+ memset(&rpool, 0, sizeof(POOL_DBR));
+
+ bstrncpy(rpool.Name, pool->RecyclePool->name(), sizeof(rpool.Name));
+ if (db_get_pool_record(jcr, db, &rpool)) {
+ pr->RecyclePoolId = rpool.PoolId;
+ } else {
+ Jmsg(jcr, M_WARNING, 0,
+ _("Can't set %s RecyclePool to %s, %s is not in database.\n" \
+ "Try to update it with 'update pool=%s'\n"),
+ pool->name(), rpool.Name, rpool.Name,pool->name());
+
+ ret = false;
+ }
+ } else { /* no RecyclePool used, set it to 0 */
+ pr->RecyclePoolId = 0;
+ }
+
+ if (pool->ScratchPool) {
+ memset(&rpool, 0, sizeof(POOL_DBR));
+
+ bstrncpy(rpool.Name, pool->ScratchPool->name(), sizeof(rpool.Name));
+ if (db_get_pool_record(jcr, db, &rpool)) {
+ pr->ScratchPoolId = rpool.PoolId;
+ } else {
+ Jmsg(jcr, M_WARNING, 0,
+ _("Can't set %s ScratchPool to %s, %s is not in database.\n" \
+ "Try to update it with 'update pool=%s'\n"),
+ pool->name(), rpool.Name, rpool.Name,pool->name());
+ ret = false;
+ }
+ } else { /* no ScratchPool used, set it to 0 */
+ pr->ScratchPoolId = 0;
+ }
+
+ return ret;
+}
+
/*
* Create a pool record from a given Pool resource
/* Pool Exists */
if (op == POOL_OP_UPDATE) { /* update request */
set_pooldbr_from_poolres(&pr, pool, op);
+ set_pooldbr_references(jcr, db, &pr, pool);
db_update_pool_record(jcr, db, &pr);
}
return 0; /* exists */
}
set_pooldbr_from_poolres(&pr, pool, op);
+ set_pooldbr_references(jcr, db, &pr, pool);
if (!db_create_pool_record(jcr, db, &pr)) {
return -1; /* error */
switch (create_pool(ua->jcr, ua->db, pool, POOL_OP_CREATE)) {
case 0:
- bsendmsg(ua, _("Error: Pool %s already exists.\n"
+ ua->error_msg(_("Error: Pool %s already exists.\n"
"Use update to change it.\n"), pool->name());
break;
case -1:
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
break;
default:
break;
}
- bsendmsg(ua, _("Pool %s created.\n"), pool->name());
+ ua->send_msg(_("Pool %s created.\n"), pool->name());
return 1;
}
extern DIRRES *director;
+extern char *configfile;
/*
* Python control command
*/
static int python_cmd(UAContext *ua, const char *cmd)
{
+#ifdef HAVE_PYTHON
+ init_python_interpreter_args python_args;
+
if (ua->argc >= 2 && strcasecmp(ua->argk[1], NT_("restart")) == 0) {
term_python_interpreter();
- init_python_interpreter(director->name(),
- director->scripts_directory, "DirStartUp");
- bsendmsg(ua, _("Python interpreter restarted.\n"));
+
+ python_args.progname = director->name();
+ python_args.scriptdir = director->scripts_directory;
+ python_args.modulename = "DirStartUp";
+ python_args.configfile = configfile;
+ python_args.workingdir = director->working_directory;
+ python_args.job_getattr = job_getattr;
+ python_args.job_setattr = job_setattr;
+
+ init_python_interpreter(&python_args);
+
+ ua->send_msg(_("Python interpreter restarted.\n"));
} else {
- bsendmsg(ua, _("Nothing done.\n"));
+#endif /* HAVE_PYTHON */
+ ua->warning_msg(_("Nothing done.\n"));
+#ifdef HAVE_PYTHON
}
+#endif /* HAVE_PYTHON */
return 1;
}
CLIENT *client;
char buf[1024];
if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->name())) {
- bsendmsg(ua, _("Unauthorized command from this console.\n"));
+ ua->error_msg(_("Unauthorized command from this console.\n"));
return 1;
}
LockRes();
- client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->name());
+ client = GetClientResWithName(ua->cons->name());
if (!client) {
- bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->name());
+ ua->error_msg(_("Client \"%s\" not found.\n"), ua->cons->name());
goto get_out;
}
if (client->address) {
/* MA Bug 6 remove ifdef */
sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf));
client->address = bstrdup(buf);
- bsendmsg(ua, _("Client \"%s\" address set to %s\n"),
+ ua->send_msg(_("Client \"%s\" address set to %s\n"),
client->name(), client->address);
get_out:
UnlockRes();
i = find_arg_with_value(ua, NT_("job"));
if (i < 0) {
- job = select_job_resource(ua);
+ job = select_enable_disable_job_resource(ua, setting);
if (!job) {
return;
}
} else {
LockRes();
- job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+ job = GetJobResWithName(ua->argv[i]);
UnlockRes();
}
if (!job) {
- bsendmsg(ua, _("Job \"%s\" not found.\n"), ua->argv[i]);
+ ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]);
return;
}
if (!acl_access_ok(ua, Job_ACL, job->name())) {
- bsendmsg(ua, _("Unauthorized command from this console.\n"));
+ ua->error_msg(_("Unauthorized command from this console.\n"));
return;
}
job->enabled = setting;
- bsendmsg(ua, _("Job \"%s\" %sabled\n"), job->name(), setting?"en":"dis");
+ ua->send_msg(_("Job \"%s\" %sabled\n"), job->name(), setting?"en":"dis");
return;
}
pm_strcpy(lstore.store_source, _("unknown source"));
set_wstorage(jcr, &lstore);
/* Try connecting for up to 15 seconds */
- bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"),
+ ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"),
store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return;
}
Dmsg0(120, _("Connected to storage daemon\n"));
sd = jcr->store_bsock;
- bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag);
- if (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ sd->fsend("setdebug=%d trace=%d\n", level, trace_flag);
+ if (sd->recv() >= 0) {
+ ua->send_msg("%s", sd->msg);
}
- bnet_sig(sd, BNET_TERMINATE);
- bnet_close(sd);
+ sd->signal(BNET_TERMINATE);
+ sd->close();
jcr->store_bsock = NULL;
return;
}
ua->jcr->client = client;
/* Try to connect for 15 seconds */
- bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
+ ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
client->name(), client->address, client->FDport);
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Client.\n"));
+ ua->error_msg(_("Failed to connect to Client.\n"));
return;
}
Dmsg0(120, "Connected to file daemon\n");
fd = ua->jcr->file_bsock;
- bnet_fsend(fd, "setdebug=%d trace=%d\n", level, trace_flag);
- if (bnet_recv(fd) >= 0) {
- bsendmsg(ua, "%s", fd->msg);
+ fd->fsend("setdebug=%d trace=%d\n", level, trace_flag);
+ if (fd->recv() >= 0) {
+ ua->send_msg("%s", fd->msg);
}
- bnet_sig(fd, BNET_TERMINATE);
- bnet_close(fd);
+ fd->signal(BNET_TERMINATE);
+ fd->close();
ua->jcr->file_bsock = NULL;
return;
}
int trace_flag = -1;
int i;
- if (!open_client_db(ua)) {
- return 1;
- }
Dmsg1(120, "setdebug:%s:\n", cmd);
level = -1;
strcasecmp(ua->argk[i], "fd") == 0) {
client = NULL;
if (ua->argv[i]) {
- client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+ client = GetClientResWithName(ua->argv[i]);
if (client) {
do_client_setdebug(ua, client, level, trace_flag);
return 1;
strcasecmp(ua->argk[i], NT_("sd")) == 0) {
store = NULL;
if (ua->argv[i]) {
- store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
+ store = GetStoreResWithName(ua->argv[i]);
if (store) {
do_storage_setdebug(ua, store, level, trace_flag);
return 1;
}
Dmsg1(100, "Var=%s:\n", var);
variable_expansion(ua->jcr, var, &val);
- bsendmsg(ua, "%s\n", val);
+ ua->send_msg("%s\n", val);
free_pool_memory(val);
return 1;
}
int listing = 0;
char since[MAXSTRING];
JCR *jcr = ua->jcr;
+ int accurate=-1;
- jcr->JobLevel = L_FULL;
+ jcr->set_JobLevel(L_FULL);
for (int i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], NT_("client")) == 0 ||
strcasecmp(ua->argk[i], NT_("fd")) == 0) {
if (ua->argv[i]) {
- client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+ client = GetClientResWithName(ua->argv[i]);
+ if (!client) {
+ ua->error_msg(_("Client \"%s\" not found.\n"), ua->argv[i]);
+ return 1;
+ }
+ if (!acl_access_ok(ua, Client_ACL, client->name())) {
+ ua->error_msg(_("No authorization for Client \"%s\"\n"), client->name());
+ return 1;
+ }
continue;
+ } else {
+ ua->error_msg(_("Client name missing.\n"));
+ return 1;
}
}
if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
if (ua->argv[i]) {
- job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
- if (job && !acl_access_ok(ua, Job_ACL, job->name())) {
- bsendmsg(ua, _("No authorization for Job \"%s\"\n"), job->name());
+ job = GetJobResWithName(ua->argv[i]);
+ if (!job) {
+ ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]);
+ return 1;
+ }
+ if (!acl_access_ok(ua, Job_ACL, job->name())) {
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name());
return 1;
}
continue;
+ } else {
+ ua->error_msg(_("Job name missing.\n"));
+ return 1;
}
+
}
if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) {
if (ua->argv[i]) {
- fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]);
- if (fileset && !acl_access_ok(ua, FileSet_ACL, fileset->name())) {
- bsendmsg(ua, _("No authorization for FileSet \"%s\"\n"), fileset->name());
+ fileset = GetFileSetResWithName(ua->argv[i]);
+ if (!fileset) {
+ ua->error_msg(_("Fileset \"%s\" not found.\n"), ua->argv[i]);
+ return 1;
+ }
+ if (!acl_access_ok(ua, FileSet_ACL, fileset->name())) {
+ ua->error_msg(_("No authorization for FileSet \"%s\"\n"), fileset->name());
return 1;
}
continue;
+ } else {
+ ua->error_msg(_("Fileset name missing.\n"));
+ return 1;
}
}
if (strcasecmp(ua->argk[i], NT_("listing")) == 0) {
continue;
}
if (strcasecmp(ua->argk[i], NT_("level")) == 0) {
- if (!get_level_from_name(ua->jcr, ua->argv[i])) {
- bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]);
+ if (ua->argv[i]) {
+ if (!get_level_from_name(ua->jcr, ua->argv[i])) {
+ ua->error_msg(_("Level \"%s\" not valid.\n"), ua->argv[i]);
+ }
+ continue;
+ } else {
+ ua->error_msg(_("Level value missing.\n"));
+ return 1;
+ }
+ }
+ if (strcasecmp(ua->argk[i], NT_("accurate")) == 0) {
+ if (!is_yesno(ua->argv[i], &accurate)) {
+ ua->error_msg(_("Invalid value for accurate. "
+ "It must be yes or no.\n"));
}
- continue;
}
}
if (!job && !(client && fileset)) {
}
}
if (!job) {
- job = (JOB *)GetResWithName(R_JOB, ua->argk[1]);
+ job = GetJobResWithName(ua->argk[1]);
if (!job) {
- bsendmsg(ua, _("No job specified.\n"));
+ ua->error_msg(_("No job specified.\n"));
return 1;
}
if (!acl_access_ok(ua, Job_ACL, job->name())) {
- bsendmsg(ua, _("No authorization for Job \"%s\"\n"), job->name());
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name());
return 1;
}
}
jcr->client = client;
jcr->fileset = fileset;
close_db(ua);
- ua->catalog = client->catalog;
+ if (job->pool->catalog) {
+ ua->catalog = job->pool->catalog;
+ } else {
+ ua->catalog = client->catalog;
+ }
if (!open_db(ua)) {
return 1;
}
jcr->job = job;
- jcr->JobType = JT_BACKUP;
+ jcr->set_JobType(JT_BACKUP);
init_jcr_job_record(jcr);
if (!get_or_create_client_record(jcr)) {
get_level_since_time(ua->jcr, since, sizeof(since));
- bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
- job->client->name(), job->client->address, job->client->FDport);
+ ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
+ jcr->client->name(), jcr->client->address, jcr->client->FDport);
if (!connect_to_file_daemon(jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Client.\n"));
+ ua->error_msg(_("Failed to connect to Client.\n"));
return 1;
}
if (!send_include_list(jcr)) {
- bsendmsg(ua, _("Error sending include list.\n"));
+ ua->error_msg(_("Error sending include list.\n"));
goto bail_out;
}
if (!send_exclude_list(jcr)) {
- bsendmsg(ua, _("Error sending exclude list.\n"));
+ ua->error_msg(_("Error sending exclude list.\n"));
goto bail_out;
}
+ /* The level string change if accurate mode is enabled */
+ if (accurate >= 0) {
+ jcr->accurate = accurate;
+ } else {
+ jcr->accurate = job->accurate;
+ }
+
if (!send_level_command(jcr)) {
goto bail_out;
}
+ /*
+ * If the job is in accurate mode, we send the list of
+ * all files to FD.
+ */
+ Dmsg1(40, "estimate accurate=%d\n", jcr->accurate);
+ if (!send_accurate_current_files(jcr)) {
+ goto bail_out;
+ }
+
bnet_fsend(jcr->file_bsock, "estimate listing=%d\n", listing);
while (bnet_recv(jcr->file_bsock) >= 0) {
- bsendmsg(ua, "%s", jcr->file_bsock->msg);
+ ua->send_msg("%s", jcr->file_bsock->msg);
}
bail_out:
if (jcr->file_bsock) {
- bnet_sig(jcr->file_bsock, BNET_TERMINATE);
- bnet_close(jcr->file_bsock);
+ jcr->file_bsock->signal(BNET_TERMINATE);
+ jcr->file_bsock->close();
jcr->file_bsock = NULL;
}
return 1;
struct tm tm;
(void)localtime_r(&ttime, &tm);
strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
- bsendmsg(ua, "%s\n", sdt);
+ ua->send_msg("%s\n", sdt);
return 1;
}
break;
}
- bsendmsg(ua, _(
+ ua->warning_msg(_(
"In general it is not a good idea to delete either a\n"
"Pool or a Volume since they may contain data.\n\n"));
delete_job(ua);
return 1;
default:
- bsendmsg(ua, _("Nothing done.\n"));
+ ua->warning_msg(_("Nothing done.\n"));
break;
}
return 1;
sep = strchr(tok, ',');
while (sep != NULL) {
*sep = '\0';
- if (strchr(tok, '-')) {
- delete_job_id_range(ua, tok);
- } else {
+ if (!delete_job_id_range(ua, tok)) {
JobId = str_to_int64(tok);
do_job_delete(ua, JobId);
}
sep = strchr(tok, ',');
}
/* pick up the last token */
- if (strchr(tok, '-')) {
- delete_job_id_range(ua, tok);
- } else {
+ if (!delete_job_id_range(ua, tok)) {
JobId = str_to_int64(tok);
do_job_delete(ua, JobId);
}
/*
* we call delete_job_id_range to parse range tokens and iterate over ranges
*/
-static void delete_job_id_range(UAContext *ua, char *tok)
+static bool delete_job_id_range(UAContext *ua, char *tok)
{
char *tok2;
JobId_t j,j1,j2;
tok2 = strchr(tok, '-');
+ if (!tok2) {
+ return false;
+ }
*tok2 = '\0';
tok2++;
j1 = str_to_int64(tok);
for (j=j1; j<=j2; j++) {
do_job_delete(ua, j);
}
+ return true;
}
/*
* do_job_delete now performs the actual delete operation atomically
*/
-
static void do_job_delete(UAContext *ua, JobId_t JobId)
{
- POOL_MEM query(PM_MESSAGE);
char ed1[50];
- purge_files_from_job(ua, JobId);
- purge_job_from_catalog(ua, JobId);
- bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1));
+ edit_int64(JobId, ed1);
+ purge_jobs_from_catalog(ua, ed1);
+ ua->send_msg(_("Job %s and associated records deleted from the catalog.\n"), ed1);
}
/*
static int delete_volume(UAContext *ua)
{
MEDIA_DBR mr;
+ char buf[1000];
if (!select_media_dbr(ua, &mr)) {
return 1;
}
- bsendmsg(ua, _("\nThis command will delete volume %s\n"
+ ua->warning_msg(_("\nThis command will delete volume %s\n"
"and all Jobs saved on that volume from the Catalog\n"),
mr.VolumeName);
- if (!get_yesno(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) {
- return 1;
+ if (find_arg(ua, "yes") >= 0) {
+ ua->pint32_val = 1; /* Have "yes" on command line already" */
+ } else {
+ bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Volume \"%s\"? (yes/no): "),
+ mr.VolumeName);
+ if (!get_yesno(ua, buf)) {
+ return 1;
+ }
}
if (ua->pint32_val) {
db_delete_media_record(ua->jcr, ua->db, &mr);
static int delete_pool(UAContext *ua)
{
POOL_DBR pr;
+ char buf[200];
memset(&pr, 0, sizeof(pr));
if (!get_pool_dbr(ua, &pr)) {
return 1;
}
- if (!get_yesno(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) {
+ bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Pool \"%s\"? (yes/no): "),
+ pr.Name);
+ if (!get_yesno(ua, buf)) {
return 1;
}
if (ua->pint32_val) {
return 1;
}
+int memory_cmd(UAContext *ua, const char *cmd)
+{
+ list_dir_status_header(ua);
+ sm_dump(false, true);
+ return 1;
+}
static void do_mount_cmd(UAContext *ua, const char *command)
{
Dmsg2(120, "%s: %s\n", command, ua->UA_sock->msg);
store.store = get_storage_resource(ua, true/*arg is storage*/);
- pm_strcpy(store.store_source, _("unknown source"));
if (!store.store) {
return;
}
+ pm_strcpy(store.store_source, _("unknown source"));
set_wstorage(jcr, &store);
drive = get_storage_drive(ua, store.store);
if (strcmp(command, "mount") == 0) {
store.store->media_type, store.store->dev_name(), drive);
if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return;
}
sd = jcr->store_bsock;
bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive);
}
while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
}
bnet_sig(sd, BNET_TERMINATE);
bnet_close(sd);
ua->catalog = catalog;
}
if (open_db(ua)) {
- bsendmsg(ua, _("Using Catalog name=%s DB=%s\n"),
+ ua->send_msg(_("Using Catalog name=%s DB=%s\n"),
ua->catalog->name(), ua->catalog->db_name);
}
return 1;
int quit_cmd(UAContext *ua, const char *cmd)
{
- ua->quit = TRUE;
+ ua->quit = true;
return 1;
}
int wait_cmd(UAContext *ua, const char *cmd)
{
JCR *jcr;
+ int i;
+ time_t stop_time = 0;
- /* no args
+ /*
+ * no args
* Wait until no job is running
*/
if (ua->argc == 1) {
return 1;
}
+ i = find_arg_with_value(ua, NT_("timeout"));
+ if (i > 0 && ua->argv[i]) {
+ stop_time = time(NULL) + str_to_int64(ua->argv[i]);
+ }
+
/* we have jobid, jobname or ujobid argument */
uint32_t jobid = 0 ;
if (!open_client_db(ua)) {
- bsendmsg(ua, _("ERR: Can't open db\n")) ;
+ ua->error_msg(_("ERR: Can't open db\n")) ;
return 1;
}
free_jcr(jcr);
}
break;
+ /* Wait for a mount request */
+ } else if (strcasecmp(ua->argk[i], "mount") == 0) {
+ for (bool waiting=false; !waiting; ) {
+ foreach_jcr(jcr) {
+ if (jcr->JobId != 0 &&
+ (jcr->JobStatus == JS_WaitMedia || jcr->JobStatus == JS_WaitMount)) {
+ waiting = true;
+ break;
+ }
+ }
+ endeach_jcr(jcr);
+ if (waiting) {
+ break;
+ }
+ if (stop_time && (time(NULL) >= stop_time)) {
+ ua->warning_msg(_("Wait on mount timed out\n"));
+ return 1;
+ }
+ bmicrosleep(1, 0);
+ }
+ return 1;
}
}
if (jobid == 0) {
- bsendmsg(ua, _("ERR: Job was not found\n"));
+ ua->error_msg(_("ERR: Job was not found\n"));
return 1 ;
}
/*
- * We wait the end of job
+ * We wait the end of a specific job
*/
bmicrosleep(0, 200000); /* let job actually start */
status = 2 ; /* Critical */
break;
+ case JS_Warnings:
case JS_Terminated:
status = 0 ; /* Ok */
break;
break;
}
- bsendmsg(ua, "JobId=%i\n", jobid) ;
- bsendmsg(ua, "JobStatus=%s (%c)\n",
+ ua->send_msg("JobId=%i\n", jobid) ;
+ ua->send_msg("JobStatus=%s (%c)\n",
job_status_to_str(jobstatus),
jobstatus) ;
- if (ua->gui) {
- bsendmsg(ua, "ExitStatus=%i\n", status) ;
+ if (ua->gui || ua->api) {
+ ua->send_msg("ExitStatus=%i\n", status) ;
}
return 1;
static int help_cmd(UAContext *ua, const char *cmd)
{
- unsigned int i;
-
- bsendmsg(ua, _(" Command Description\n ======= ===========\n"));
+ int i;
+ ua->send_msg(_(" Command Description\n ======= ===========\n"));
for (i=0; i<comsize; i++) {
- bsendmsg(ua, _(" %-10s %s\n"), _(commands[i].key), _(commands[i].help));
+ if (ua->argc == 2) {
+ if (!strcasecmp(ua->argk[1], commands[i].key)) {
+ ua->send_msg(_(" %-13s %s\n\nArguments:\n\t%s\n"), commands[i].key,
+ commands[i].help, commands[i].usage);
+ break;
+ }
+ } else {
+ ua->send_msg(_(" %-13s %s\n"), commands[i].key, commands[i].help);
+ }
+ }
+ if (i == comsize && ua->argc == 2) {
+ ua->send_msg(_("\nCan't find %s command.\n\n"), ua->argk[1]);
}
- bsendmsg(ua, _("\nWhen at a prompt, entering a period cancels the command.\n\n"));
+ ua->send_msg(_("\nWhen at a prompt, entering a period cancels the command.\n\n"));
return 1;
}
int qhelp_cmd(UAContext *ua, const char *cmd)
{
- unsigned int i;
-
+ int i,j;
+ /* Want to display only commands */
+ j = find_arg(ua, NT_("all"));
+ if (j >= 0) {
+ for (i=0; i<comsize; i++) {
+ ua->send_msg("%s\n", commands[i].key);
+ }
+ return 1;
+ }
+ /* Want to display a specific help section */
+ j = find_arg_with_value(ua, NT_("item"));
+ if (j >= 0 && ua->argk[j]) {
+ for (i=0; i<comsize; i++) {
+ if (bstrcmp(commands[i].key, ua->argv[j])) {
+ ua->send_msg("%s\n", commands[i].usage);
+ break;
+ }
+ }
+ return 1;
+ }
+ /* Want to display everything */
for (i=0; i<comsize; i++) {
- bsendmsg(ua, "%s %s\n", commands[i].key, _(commands[i].help));
+ ua->send_msg("%s %s -- %s\n", commands[i].key, commands[i].help, commands[i].usage);
}
return 1;
}
+#if 1
static int version_cmd(UAContext *ua, const char *cmd)
{
- bsendmsg(ua, _("%s Version: %s (%s)\n"), my_name, VERSION, BDATE);
+ ua->send_msg(_("%s Version: %s (%s) %s %s %s %s\n"), my_name, VERSION, BDATE,
+ HOST_OS, DISTNAME, DISTVER, NPRTB(director->verid));
return 1;
}
+#else
+/*
+ * Test code -- turned on only for debug testing
+ */
+static int version_cmd(UAContext *ua, const char *cmd)
+{
+ dbid_list ids;
+ POOL_MEM query(PM_MESSAGE);
+ open_db(ua);
+ Mmsg(query, "select MediaId from Media,Pool where Pool.PoolId=Media.PoolId and Pool.Name='Full'");
+ db_get_query_dbids(ua->jcr, ua->db, query, ids);
+ ua->send_msg("num_ids=%d max_ids=%d tot_ids=%d\n", ids.num_ids, ids.max_ids, ids.tot_ids);
+ for (int i=0; i < ids.num_ids; i++) {
+ ua->send_msg("id=%d\n", ids.DBId[i]);
+ }
+ close_db(ua);
+ return 1;
+}
+#endif
+
+/*
+ * This call uses open_client_db() and force a
+ * new dedicated connection to the catalog
+ */
+bool open_new_client_db(UAContext *ua)
+{
+ bool ret;
+
+ /* Force a new dedicated connection */
+ close_db(ua);
+ ua->force_mult_db_connections = true;
+ ret = open_client_db(ua);
+ ua->force_mult_db_connections = false;
+ return ret;
+}
/*
* This call explicitly checks for a catalog=xxx and
i = find_arg_with_value(ua, NT_("catalog"));
if (i >= 0) {
if (!acl_access_ok(ua, Catalog_ACL, ua->argv[i])) {
- bsendmsg(ua, _("No authorization for Catalog \"%s\"\n"), ua->argv[i]);
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), ua->argv[i]);
return false;
}
- catalog = (CAT *)GetResWithName(R_CATALOG, ua->argv[i]);
+ catalog = GetCatalogResWithName(ua->argv[i]);
if (catalog) {
if (ua->catalog && ua->catalog != catalog) {
close_db(ua);
i = find_arg_with_value(ua, NT_("client"));
if (i >= 0) {
if (!acl_access_ok(ua, Client_ACL, ua->argv[i])) {
- bsendmsg(ua, _("No authorization for Client \"%s\"\n"), ua->argv[i]);
+ ua->error_msg(_("No authorization for Client \"%s\"\n"), ua->argv[i]);
return false;
}
- client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+ client = GetClientResWithName(ua->argv[i]);
if (client) {
catalog = client->catalog;
if (ua->catalog && ua->catalog != catalog) {
close_db(ua);
}
if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) {
- bsendmsg(ua, _("No authorization for Catalog \"%s\"\n"), catalog->name());
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name());
return false;
}
ua->catalog = catalog;
i = find_arg_with_value(ua, NT_("job"));
if (i >= 0) {
if (!acl_access_ok(ua, Job_ACL, ua->argv[i])) {
- bsendmsg(ua, _("No authorization for Job \"%s\"\n"), ua->argv[i]);
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), ua->argv[i]);
return false;
}
- job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+ job = GetJobResWithName(ua->argv[i]);
if (job) {
catalog = job->client->catalog;
if (ua->catalog && ua->catalog != catalog) {
close_db(ua);
}
if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) {
- bsendmsg(ua, _("No authorization for Catalog \"%s\"\n"), catalog->name());
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name());
return false;
}
ua->catalog = catalog;
*/
bool open_db(UAContext *ua)
{
+ bool mult_db_conn;
+
if (ua->db) {
return true;
}
if (!ua->catalog) {
ua->catalog = get_catalog_resource(ua);
if (!ua->catalog) {
- bsendmsg(ua, _("Could not find a Catalog resource\n"));
+ ua->error_msg( _("Could not find a Catalog resource\n"));
return false;
}
}
+ /* Some modules like bvfs need their own catalog connection */
+ mult_db_conn = ua->catalog->mult_db_connections;
+ if (ua->force_mult_db_connections) {
+ mult_db_conn = true;
+ }
+
ua->jcr->catalog = ua->catalog;
- Dmsg0(150, "Open database\n");
- ua->db = db_init_database(ua->jcr, ua->catalog->db_name, ua->catalog->db_user,
+ Dmsg0(100, "UA Open database\n");
+ ua->db = db_init(ua->jcr, ua->catalog->db_driver, ua->catalog->db_name,
+ ua->catalog->db_user,
ua->catalog->db_password, ua->catalog->db_address,
ua->catalog->db_port, ua->catalog->db_socket,
- ua->catalog->mult_db_connections);
+ mult_db_conn);
if (!ua->db || !db_open_database(ua->jcr, ua->db)) {
- bsendmsg(ua, _("Could not open catalog database \"%s\".\n"),
+ ua->error_msg(_("Could not open catalog database \"%s\".\n"),
ua->catalog->db_name);
if (ua->db) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
close_db(ua);
return false;
}
ua->jcr->db = ua->db;
- bsendmsg(ua, _("Using Catalog \"%s\"\n"), ua->catalog->name());
+ if (!ua->api) {
+ ua->send_msg(_("Using Catalog \"%s\"\n"), ua->catalog->name());
+ }
Dmsg1(150, "DB %s opened\n", ua->catalog->db_name);
return true;
}
projects / bacula / bacula / blobdiff