/*
- Bacula® - The Network Backup Solution
+ Bacula(R) - The Network Backup Solution
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2015 Kern Sibbald
- The main author of Bacula is Kern Sibbald, with contributions from many
- others, a complete list can be found in the file AUTHORS.
+ 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.
- Bacula® is a registered trademark of Kern Sibbald.
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
*
if (strcasecmp(ua->argk[2], "current") == 0) {
ua->send_msg(OKqstatus, ua->argk[2]);
foreach_jcr(njcr) {
- if (njcr->JobId != 0 && acl_access_ok(ua, Job_ACL, njcr->job->name())) {
+ if (!njcr->is_internal_job() && acl_access_ok(ua, Job_ACL, njcr->job->name())) {
ua->send_msg(DotStatusJob, edit_int64(njcr->JobId, ed1),
njcr->JobStatus, njcr->JobErrors);
}
void list_dir_status_header(UAContext *ua)
{
- char dt[MAX_TIME_LENGTH];
+ char dt[MAX_TIME_LENGTH], dt1[MAX_TIME_LENGTH];
char b1[35], b2[35], b3[35], b4[35], b5[35];
- ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
- HOST_OS, DISTNAME, DISTVER);
+ ua->send_msg(_("%s %sVersion: %s (%s) %s %s %s\n"), my_name,
+ "", VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
- ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d "
- "mode=%d,%d\n"), dt,
- num_jobs_run, job_count(), (int)DEVELOPER_MODE, (int)BEEF);
+ bstrftimes(dt1, sizeof(dt1), last_reload_time);
+ ua->send_msg(_("Daemon started %s, conf reloaded %s\n"), dt, dt1);
+ ua->send_msg(_(" Jobs: run=%d, running=%d mode=%d\n"),
+ num_jobs_run, job_count(), (int)DEVELOPER_MODE);
ua->send_msg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
- edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
- edit_uint64_with_commas(sm_bytes, b2),
- edit_uint64_with_commas(sm_max_bytes, b3),
- edit_uint64_with_commas(sm_buffers, b4),
- edit_uint64_with_commas(sm_max_buffers, b5));
+ edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
+ edit_uint64_with_commas(sm_bytes, b2),
+ edit_uint64_with_commas(sm_max_bytes, b3),
+ edit_uint64_with_commas(sm_buffers, b4),
+ edit_uint64_with_commas(sm_max_buffers, b5));
/* TODO: use this function once for all daemons */
- if (bplugin_list->size() > 0) {
+ if (b_plugin_list && b_plugin_list->size() > 0) {
int len;
Plugin *plugin;
POOL_MEM msg(PM_FNAME);
pm_strcpy(msg, " Plugin: ");
- foreach_alist(plugin, bplugin_list) {
+ foreach_alist(plugin, b_plugin_list) {
len = pm_strcat(msg, plugin->file);
if (len > 80) {
pm_strcat(msg, "\n ");
}
/*
* The Storage daemon is problematic because it shows information
- * related to multiple Jobs, so if there is a Client or Job
+ * related to multiple Job, so if there is a Client or Job
* ACL restriction, we forbid all access to the Storage.
*/
if (have_restricted_acl(ua, Client_ACL) ||
sd = ua->jcr->store_bsock;
if (cmd) {
POOL_MEM devname;
- int i = find_arg_with_value(ua, "device");
- if (i>0) {
- Mmsg(devname, "device=%s", ua->argv[i]);
+ /*
+ * For .status storage=xxx shstore list
+ * send .status shstore list xxx-device
+ */
+ if (strcasecmp(cmd, "shstore") == 0) {
+ if (!ua->argk[3]) {
+ ua->send_msg(_("Must have three aguments\n"));
+ return;
+ }
+ pm_strcpy(devname, store->dev_name());
bash_spaces(devname.c_str());
+ sd->fsend(".status %s %s %s api=%d api_opts=%s",
+ cmd, ua->argk[3], devname.c_str(),
+ ua->api, ua->api_opts);
+ } else {
+ int i = find_arg_with_value(ua, "device");
+ if (i>0) {
+ Mmsg(devname, "device=%s", ua->argv[i]);
+ bash_spaces(devname.c_str());
+ }
+ sd->fsend(".status %s api=%d api_opts=%s %s",
+ cmd, ua->api, ua->api_opts, devname.c_str());
}
- sd->fsend(".status %s api=%d api_opts=%s %s",
- cmd, ua->api, ua->api_opts, devname.c_str());
} else {
sd->fsend("status");
}
bstrftime_nc(dt, sizeof(dt), sp->runtime);
switch (sp->job->JobType) {
case JT_ADMIN:
+ level_ptr = "Admin";
+ break;
case JT_RESTORE:
- level_ptr = " ";
+ level_ptr = "Restore";
break;
default:
level_ptr = level_to_str(sp->level);
break;
}
- if (ua->api) {
+ if (ua->api == 1) {
ua->send_msg(_("%-14s\t%-8s\t%3d\t%-18s\t%-18s\t%s\n"),
level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
sp->job->name(), mr.VolumeName);
i = find_arg_with_value(ua, NT_("days"));
if (i >= 0) {
days = atoi(ua->argv[i]);
- if (((days < 0) || (days > 500)) && !ua->api) {
- ua->send_msg(_("Ignoring invalid value for days. Max is 500.\n"));
+ if (((days < 0) || (days > 3000)) && !ua->api) {
+ ua->send_msg(_("Ignoring invalid value for days. Max is 3000.\n"));
days = 10;
}
} else {
LockRes();
foreach_res(job, R_JOB) {
sched = job->schedule;
- if (sched == NULL || !job->enabled) { /* scheduled? or enabled? */
+ if (!sched || !job->enabled || (sched && !sched->enabled) ||
+ (job->client && !job->client->enabled)) {
continue; /* no, skip this job */
}
- if (job_name[0] && bstrcmp(job_name, job->name()) != 0) {
+ if (job_name[0] && strcmp(job_name, job->name()) != 0) {
continue;
}
for (run=sched->run; run; run=run->next) {
}
switch (job->JobType) {
case JT_ADMIN:
+ level_ptr = "Admin";
+ break;
case JT_RESTORE:
- level_ptr = " ";
+ level_ptr = "Restore";
break;
default:
level_ptr = level_to_str(level);
{
JCR *jcr;
int njobs = 0;
+ int i;
const char *msg;
char *emsg; /* edited message */
char dt[MAX_TIME_LENGTH];
char level[10];
bool pool_mem = false;
+ JobId_t jid = 0;
+
+ if ((i = find_arg_with_value(ua, "jobid")) >= 0) {
+ jid = str_to_int64(ua->argv[i]);
+ }
Dmsg0(200, "enter list_run_jobs()\n");
- if (!ua->api) ua->send_msg(_("\nRunning Jobs:\n"));
- foreach_jcr(jcr) {
- if (jcr->JobId == 0) { /* this is us */
- /* this is a console or other control job. We only show console
- * jobs in the status output.
- */
- if (jcr->getJobType() == JT_CONSOLE && !ua->api) {
- bstrftime_nc(dt, sizeof(dt), jcr->start_time);
- ua->send_msg(_("Console connected at %s\n"), dt);
+
+ if (!ua->api) {
+ ua->send_msg(_("\nRunning Jobs:\n"));
+ foreach_jcr(jcr) {
+ if (jcr->JobId == 0) { /* this is us */
+ /* this is a console or other control job. We only show console
+ * jobs in the status output.
+ */
+ if (jcr->getJobType() == JT_CONSOLE) {
+ bstrftime_nc(dt, sizeof(dt), jcr->start_time);
+ ua->send_msg(_("Console connected %sat %s\n"),
+ (ua->UA_sock && ua->UA_sock->tls)?_("using TLS "):"",
+ dt);
+ }
+ continue;
}
- continue;
+ njobs++;
}
- njobs++;
- }
- endeach_jcr(jcr);
-
- if (njobs == 0) {
- /* Note the following message is used in regress -- don't change */
- if (!ua->api) {
+ endeach_jcr(jcr);
+ if (njobs == 0) {
+ /* Note the following message is used in regress -- don't change */
ua->send_msg(_("No Jobs running.\n====\n"));
+ Dmsg0(200, "leave list_run_jobs()\n");
+ return;
}
- Dmsg0(200, "leave list_run_jobs()\n");
- return;
}
- njobs = 0;
+
if (!ua->api) {
ua->send_msg(_(" JobId Type Level Files Bytes Name Status\n"));
ua->send_msg(_("======================================================================\n"));
if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
continue;
}
- njobs++;
+ /* JobId keyword found in command line */
+ if (jid > 0 && jcr->JobId != jid) {
+ continue;
+ }
switch (jcr->JobStatus) {
case JS_Created:
msg = _("is waiting execution");
case JS_Warnings:
msg = _("has terminated with warnings");
break;
+ case JS_Incomplete:
+ msg = _("has terminated in incomplete state");
+ break;
case JS_ErrorTerminated:
msg = _("has erred");
break;
msg = _("is waiting for an appendable Volume");
break;
case JS_WaitFD:
- if (!pool_mem) {
- emsg = (char *)get_pool_memory(PM_FNAME);
- pool_mem = true;
+ /* Special case when JobStatus=JS_WaitFD, we don't have a FD link yet
+ * we need to stay in WaitFD status See bee mantis #1414 */
+ if (jcr->JobStatus != JS_WaitFD) {
+ if (!pool_mem) {
+ emsg = (char *)get_pool_memory(PM_FNAME);
+ pool_mem = true;
+ }
+ if (!jcr->client || !jcr->wstore) {
+ Mmsg(emsg, _("is waiting for Client to connect to Storage daemon"));
+ } else {
+ Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
+ jcr->client->name(), jcr->wstore->name());
+ }
+ msg = emsg;
}
- if (!jcr->client || !jcr->wstore) {
- Mmsg(emsg, _("is waiting for Client to connect to Storage daemon"));
- } else {
- Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
- jcr->client->name(), jcr->wstore->name());
- }
- msg = emsg;
break;
case JS_DataCommitting:
msg = _("SD committing Data");
}
switch (jcr->getJobType()) {
case JT_ADMIN:
+ bstrncpy(level, "Admin", sizeof(level));
+ break;
case JT_RESTORE:
- bstrncpy(level, " ", sizeof(level));
+ bstrncpy(level, "Restore", sizeof(level));
break;
default:
bstrncpy(level, level_to_str(jcr->getJobLevel()), sizeof(level));
ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\t%s\n"),
jcr->JobId, level, jcr->Job, msg, jcr->comment);
unbash_spaces(jcr->comment);
+
} else {
char b1[50], b2[50], b3[50];
level[4] = 0;
struct s_last_job *je;
if (!ua->api) {
ua->send_msg(_("\nTerminated Jobs:\n"));
- ua->send_msg(_(" JobId Level Files Bytes Status Finished Name \n"));
+ ua->send_msg(_(" JobId Level Files Bytes Status Finished Name \n"));
ua->send_msg(_("====================================================================\n"));
}
foreach_dlist(je, last_jobs) {
bstrftime_nc(dt, sizeof(dt), je->end_time);
switch (je->JobType) {
case JT_ADMIN:
+ bstrncpy(level, "Admin", sizeof(level));
+ break;
case JT_RESTORE:
- bstrncpy(level, " ", sizeof(level));
+ bstrncpy(level, "Restore", sizeof(level));
break;
default:
bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
case JS_Warnings:
termstat = _("OK -- with warnings");
break;
+ case JS_Incomplete:
+ termstat = _("Incomplete");
+ break;
default:
termstat = _("Other");
break;
termstat,
dt, JobName);
} else {
- ua->send_msg(_("%6d %-6s %8s %10s %-7s %-8s %s\n"),
+ ua->send_msg(_("%6d %-7s %8s %10s %-7s %-8s %s\n"),
je->JobId,
level,
edit_uint64_with_commas(je->JobFiles, b1),
projects / bacula / bacula / blobdiff