/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2001-2008 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 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
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- Bacula® is a registered trademark of John Walker.
- The licensor of Bacula is the Free Software Foundation Europe
- (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
- Switzerland, email:ftf@fsfeurope.org.
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 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.
*/
/*
*
*
* Kern Sibbald, August MMI
*
- * Version $Id$
*/
#include "dird.h"
extern void *start_heap;
+extern utime_t last_reload_time;
static void list_scheduled_jobs(UAContext *ua);
+static void llist_scheduled_jobs(UAContext *ua);
static void list_running_jobs(UAContext *ua);
static void list_terminated_jobs(UAContext *ua);
static void do_storage_status(UAContext *ua, STORE *store, char *cmd);
static void do_director_status(UAContext *ua);
static void do_all_status(UAContext *ua);
void status_slots(UAContext *ua, STORE *store);
+void status_content(UAContext *ua, STORE *store);
static char OKqstatus[] = "1000 OK .status\n";
static char DotStatusJob[] = "JobId=%s JobStatus=%c JobErrors=%d\n";
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())) {
- ua->send_msg(DotStatusJob, edit_int64(njcr->JobId, ed1),
+ 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);
}
}
if ((last_jobs) && (last_jobs->size() > 0)) {
job = (s_last_job*)last_jobs->last();
if (acl_access_ok(ua, Job_ACL, job->Job)) {
- ua->send_msg(DotStatusJob, edit_int64(job->JobId, ed1),
+ ua->send_msg(DotStatusJob, edit_int64(job->JobId, ed1),
job->JobStatus, job->Errors);
}
}
do_client_status(ua, client, ua->argk[2]);
}
} else if (strcasecmp(ua->argk[1], "storage") == 0) {
- store = get_storage_resource(ua, false /*no default*/);
- if (store) {
- do_storage_status(ua, store, ua->argk[2]);
+ store = get_storage_resource(ua, false /*no default*/, true/*unique*/);
+ if (!store) {
+ ua->send_msg("1900 Bad .status command, wrong argument.\n");
+ return false;
}
+ do_storage_status(ua, store, ua->argk[2]);
} else {
ua->send_msg("1900 Bad .status command, wrong argument.\n");
return false;
Dmsg1(20, "status:%s:\n", cmd);
for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], NT_("all")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("schedule")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("scheduled")) == 0) {
+ llist_scheduled_jobs(ua);
+ return 1;
+ } else if (strcasecmp(ua->argk[i], NT_("all")) == 0) {
do_all_status(ua);
return 1;
} else if (strcasecmp(ua->argk[i], NT_("dir")) == 0 ||
}
return 1;
} else {
- store = get_storage_resource(ua, false/*no default*/);
+ store = get_storage_resource(ua, false/*no default*/, true/*unique*/);
if (store) {
- if (find_arg(ua, NT_("slots")) > 0) {
- status_slots(ua, store);
- } else {
- do_storage_status(ua, store, NULL);
- }
+ if (find_arg(ua, NT_("slots")) > 0) {
+ status_slots(ua, store);
+ } else {
+ do_storage_status(ua, store, NULL);
+ }
}
return 1;
}
add_prompt(ua, NT_("Director"));
add_prompt(ua, NT_("Storage"));
add_prompt(ua, NT_("Client"));
+ add_prompt(ua, NT_("Scheduled"));
add_prompt(ua, NT_("All"));
Dmsg0(20, "do_prompt: select daemon\n");
if ((item=do_prompt(ua, "", _("Select daemon type for status"), prmt, sizeof(prmt))) < 0) {
do_director_status(ua);
break;
case 1:
- store = select_storage_resource(ua);
+ store = select_storage_resource(ua, true/*unique*/);
if (store) {
do_storage_status(ua, store, NULL);
}
}
break;
case 3:
+ llist_scheduled_jobs(ua);
+ break;
+ case 4:
do_all_status(ua);
break;
default:
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);
- if (num_jobs_run == 1) {
- ua->send_msg(_("Daemon started %s, 1 Job run since started.\n"), dt);
- }
- else {
- ua->send_msg(_("Daemon started %s, %d Jobs run since started.\n"),
- dt, num_jobs_run);
- }
+ 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 (b_plugin_list && b_plugin_list->size() > 0) {
+ int len;
+ Plugin *plugin;
+ POOL_MEM msg(PM_FNAME);
+ pm_strcpy(msg, " Plugin: ");
+ foreach_alist(plugin, b_plugin_list) {
+ len = pm_strcat(msg, plugin->file);
+ if (len > 80) {
+ pm_strcat(msg, "\n ");
+ } else {
+ pm_strcat(msg, " ");
+ }
+ }
+ ua->send_msg("%s\n", msg.c_str());
+ }
}
static void do_director_status(UAContext *ua)
BSOCK *sd;
USTORE lstore;
+
+ if (!acl_access_ok(ua, Storage_ACL, store->name())) {
+ ua->error_msg(_("No authorization for Storage \"%s\"\n"), store->name());
+ return;
+ }
+ /*
+ * The Storage daemon is problematic because it shows information
+ * 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) ||
+ have_restricted_acl(ua, Job_ACL)) {
+ ua->error_msg(_("Restricted Client or Job does not permit access to Storage daemons\n"));
+ return;
+ }
lstore.store = store;
pm_strcpy(lstore.store_source, _("unknown source"));
set_wstorage(ua->jcr, &lstore);
if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
ua->send_msg(_("\nFailed to connect to Storage daemon %s.\n====\n"),
store->name());
- if (ua->jcr->store_bsock) {
- bnet_close(ua->jcr->store_bsock);
- ua->jcr->store_bsock = NULL;
- }
+ free_bsock(ua->jcr->store_bsock);
return;
}
- Dmsg0(20, _("Connected to storage daemon\n"));
+ Dmsg0(20, "Connected to storage daemon\n");
sd = ua->jcr->store_bsock;
if (cmd) {
- sd->fsend(".status %s", cmd);
+ POOL_MEM devname;
+ /*
+ * 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());
+ }
} else {
sd->fsend("status");
}
while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
}
- sd->signal( BNET_TERMINATE);
- sd->close();
- ua->jcr->store_bsock = NULL;
+ sd->signal(BNET_TERMINATE);
+ free_bsock(ua->jcr->store_bsock);
return;
}
{
BSOCK *fd;
+ if (!acl_access_ok(ua, Client_ACL, client->name())) {
+ ua->error_msg(_("No authorization for Client \"%s\"\n"), client->name());
+ return;
+ }
/* Connect to File daemon */
-
ua->jcr->client = client;
/* Release any old dummy key */
if (ua->jcr->sd_auth_key) {
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
ua->send_msg(_("Failed to connect to Client %s.\n====\n"),
client->name());
- if (ua->jcr->file_bsock) {
- bnet_close(ua->jcr->file_bsock);
- ua->jcr->file_bsock = NULL;
- }
+ free_bsock(ua->jcr->file_bsock);
return;
}
Dmsg0(20, _("Connected to file daemon\n"));
fd = ua->jcr->file_bsock;
if (cmd) {
- fd->fsend(".status %s", cmd);
+ fd->fsend(".status %s api=%d api_opts=%s", cmd, ua->api, ua->api_opts);
} else {
fd->fsend("status");
}
ua->send_msg("%s", fd->msg);
}
fd->signal(BNET_TERMINATE);
- fd->close();
- ua->jcr->file_bsock = NULL;
+ free_bsock(ua->jcr->file_bsock);
return;
}
{
if (!ua->api) {
ua->send_msg(_("\nScheduled Jobs:\n"));
- ua->send_msg(_("Level Type Pri Scheduled Name Volume\n"));
+ ua->send_msg(_("Level Type Pri Scheduled Job Name Volume\n"));
ua->send_msg(_("===================================================================================\n"));
}
}
+static void prt_lrunhdr(UAContext *ua)
+{
+ if (!ua->api) {
+ ua->send_msg(_("\nScheduled Jobs:\n"));
+ ua->send_msg(_("Level Type Pri Scheduled Job Name Schedule\n"));
+ ua->send_msg(_("=====================================================================================\n"));
+ }
+}
+
+
/* Scheduling packet */
struct sched_pkt {
dlink link; /* keep this as first item!!! */
JOB *job;
int level;
int priority;
- time_t runtime;
+ utime_t runtime;
POOL *pool;
STORE *store;
};
MEDIA_DBR mr;
int orig_jobtype;
- orig_jobtype = jcr->JobType;
- memset(&mr, 0, sizeof(mr));
+ orig_jobtype = jcr->getJobType();
if (sp->job->JobType == JT_BACKUP) {
jcr->db = NULL;
ok = complete_jcr_for_job(jcr, sp->job, sp->pool);
}
if (ok) {
mr.PoolId = jcr->jr.PoolId;
- mr.StorageId = sp->store->StorageId;
jcr->wstore = sp->store;
+ set_storageid_in_mr(jcr->wstore, &mr);
Dmsg0(250, "call find_next_volume_for_append\n");
+ /* no need to set ScratchPoolId, since we use fnv_no_create_vol */
ok = find_next_volume_for_append(jcr, &mr, 1, fnv_no_create_vol, fnv_no_prune);
}
if (!ok) {
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);
db_close_database(jcr, jcr->db);
}
jcr->db = ua->db; /* restore ua db to jcr */
- jcr->JobType = orig_jobtype;
+ jcr->setJobType(orig_jobtype);
}
+/*
+ * Detailed listing of all scheduler jobs
+ */
+static void llist_scheduled_jobs(UAContext *ua)
+{
+ utime_t runtime;
+ RUN *run;
+ JOB *job;
+ int level, num_jobs = 0;
+ int priority;
+ bool hdr_printed = false;
+ char sched_name[MAX_NAME_LENGTH];
+ char job_name[MAX_NAME_LENGTH];
+ SCHED *sched;
+ int days, i, limit;
+ time_t now = time(NULL);
+ time_t next;
+ const char *level_ptr;
+
+ Dmsg0(200, "enter list_sched_jobs()\n");
+
+ i = find_arg_with_value(ua, NT_("days"));
+ if (i >= 0) {
+ days = atoi(ua->argv[i]);
+ if (((days < 0) || (days > 3000)) && !ua->api) {
+ ua->send_msg(_("Ignoring invalid value for days. Max is 3000.\n"));
+ days = 10;
+ }
+ } else {
+ days = 10;
+ }
+
+ i = find_arg_with_value(ua, NT_("limit"));
+ if (i >= 0) {
+ limit = atoi(ua->argv[i]);
+ if (((limit < 0) || (limit > 2000)) && !ua->api) {
+ ua->send_msg(_("Ignoring invalid value for limit. Max is 2000.\n"));
+ limit = 100;
+ }
+ } else {
+ limit = 100;
+ }
+
+ i = find_arg_with_value(ua, NT_("time"));
+ if (i >= 0) {
+ now = str_to_utime(ua->argv[i]);
+ if (now == 0) {
+ ua->send_msg(_("Ignoring invalid time.\n"));
+ now = time(NULL);
+ }
+ }
+
+ i = find_arg_with_value(ua, NT_("schedule"));
+ if (i >= 0) {
+ bstrncpy(sched_name, ua->argv[i], sizeof(sched_name));
+ } else {
+ sched_name[0] = 0;
+ }
+
+ i = find_arg_with_value(ua, NT_("job"));
+ if (i >= 0) {
+ bstrncpy(job_name, ua->argv[i], sizeof(job_name));
+ } else {
+ job_name[0] = 0;
+ }
+
+ /* Loop through all jobs */
+ LockRes();
+ foreach_res(job, R_JOB) {
+ sched = job->schedule;
+ if (!sched || !job->enabled || (sched && !sched->enabled) ||
+ (job->client && !job->client->enabled)) {
+ continue; /* no, skip this job */
+ }
+ if (job_name[0] && strcmp(job_name, job->name()) != 0) {
+ continue;
+ }
+ for (run=sched->run; run; run=run->next) {
+ next = now;
+ for (i=0; i<days; i++) {
+ struct tm tm;
+ int mday, wday, month, wom, woy, ldom;
+ char dt[MAX_TIME_LENGTH];
+ bool ok;
+
+ /* compute values for next time */
+ (void)localtime_r(&next, &tm);
+ mday = tm.tm_mday - 1;
+ wday = tm.tm_wday;
+ month = tm.tm_mon;
+ wom = mday / 7;
+ woy = tm_woy(next); /* get week of year */
+ ldom = tm_ldom(month, tm.tm_year + 1900);
+
+//#define xxx_debug
+#ifdef xxx_debug
+ Dmsg6(000, "m=%d md=%d wd=%d wom=%d woy=%d ldom=%d\n",
+ month, mday, wday, wom, woy, ldom);
+ Dmsg6(000, "bitset bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d bsldom=%d\n",
+ bit_is_set(month, run->month),
+ bit_is_set(mday, run->mday),
+ bit_is_set(wday, run->wday),
+ bit_is_set(wom, run->wom),
+ bit_is_set(woy, run->woy),
+ bit_is_set(31, run->mday));
+#endif
+
+ ok = (bit_is_set(mday, run->mday) &&
+ bit_is_set(wday, run->wday) &&
+ bit_is_set(month, run->month) &&
+ bit_is_set(wom, run->wom) &&
+ bit_is_set(woy, run->woy)) ||
+ (bit_is_set(month, run->month) &&
+ bit_is_set(31, run->mday) && mday == ldom);
+ if (!ok) {
+ next += 24 * 60 * 60; /* Add one day */
+ continue;
+ }
+ for (int j=0; j < 24; j++) {
+ if (bit_is_set(j, run->hour)) {
+ tm.tm_hour = j;
+ tm.tm_min = run->minute;
+ tm.tm_sec = 0;
+ runtime = mktime(&tm);
+ bstrftime_dn(dt, sizeof(dt), runtime);
+ break;
+ }
+ }
+
+ level = job->JobLevel;
+ if (run->level) {
+ level = run->level;
+ }
+ switch (job->JobType) {
+ case JT_ADMIN:
+ level_ptr = "Admin";
+ break;
+ case JT_RESTORE:
+ level_ptr = "Restore";
+ break;
+ default:
+ level_ptr = level_to_str(level);
+ break;
+ }
+ priority = job->Priority;
+ if (run->Priority) {
+ priority = run->Priority;
+ }
+ if (!hdr_printed) {
+ prt_lrunhdr(ua);
+ hdr_printed = true;
+ }
+ if (ua->api) {
+ ua->send_msg(_("%-14s\t%-8s\t%3d\t%-18s\t%-18s\t%s\n"),
+ level_ptr, job_type_to_str(job->JobType), priority, dt,
+ job->name(), sched->name());
+ } else {
+ ua->send_msg(_("%-14s %-8s %3d %-18s %-18s %s\n"),
+ level_ptr, job_type_to_str(job->JobType), priority, dt,
+ job->name(), sched->name());
+ }
+ next += 24 * 60 * 60; /* Add one day */
+ num_jobs++;
+ if (num_jobs >= limit) {
+ goto get_out;
+ }
+ }
+ } /* end loop over run pkts */
+ } /* end for loop over resources */
+get_out:
+ UnlockRes();
+ if (num_jobs == 0 && !ua->api) {
+ ua->send_msg(_("No Scheduled Jobs.\n"));
+ }
+ if (!ua->api) ua->send_msg("====\n");
+ Dmsg0(200, "Leave ;list_sched_jobs_runs()\n");
+}
+
+
/*
* Sort items by runtime, priority
*/
*/
static void list_scheduled_jobs(UAContext *ua)
{
- time_t runtime;
+ utime_t runtime;
RUN *run;
JOB *job;
int level, num_jobs = 0;
int priority;
bool hdr_printed = false;
+ char sched_name[MAX_NAME_LENGTH];
dlist sched;
sched_pkt *sp;
int days, i;
i = find_arg_with_value(ua, NT_("days"));
if (i >= 0) {
days = atoi(ua->argv[i]);
- if ((days < 0) || (days > 500) && !ua->api) {
+ if (((days < 0) || (days > 500)) && !ua->api) {
ua->send_msg(_("Ignoring invalid value for days. Max is 500.\n"));
days = 1;
}
}
+ i = find_arg_with_value(ua, NT_("schedule"));
+ if (i >= 0) {
+ bstrncpy(sched_name, ua->argv[i], sizeof(sched_name));
+ } else {
+ sched_name[0] = 0;
+ }
/* Loop through all jobs */
LockRes();
if (!acl_access_ok(ua, Job_ACL, job->name()) || !job->enabled) {
continue;
}
+ if (sched_name[0] && job->schedule &&
+ strcasecmp(job->schedule->name(), sched_name) != 0) {
+ continue;
+ }
for (run=NULL; (run = find_next_run(run, job, runtime, days)); ) {
USTORE store;
level = job->JobLevel;
{
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->JobType == 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 */
+ ua->send_msg(_("No Jobs running.\n====\n"));
+ Dmsg0(200, "leave list_run_jobs()\n");
+ return;
+ }
}
- endeach_jcr(jcr);
- if (njobs == 0) {
- /* Note the following message is used in regress -- don't change */
- if (!ua->api) ua->send_msg(_("No Jobs running.\n====\n"));
- Dmsg0(200, "leave list_run_jobs()\n");
- return;
- }
- njobs = 0;
if (!ua->api) {
- ua->send_msg(_(" JobId Level Name Status\n"));
+ ua->send_msg(_(" JobId Type Level Files Bytes Name Status\n"));
ua->send_msg(_("======================================================================\n"));
}
foreach_jcr(jcr) {
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_Terminated:
msg = _("has terminated");
break;
+ 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;
case JS_WaitSD:
emsg = (char *) get_pool_memory(PM_FNAME);
if (jcr->wstore) {
- Mmsg(emsg, _("is waiting on Storage %s"), jcr->wstore->name());
+ Mmsg(emsg, _("is waiting on Storage \"%s\""), jcr->wstore->name());
} else if (jcr->rstore) {
- Mmsg(emsg, _("is waiting on Storage %s"), jcr->rstore->name());
+ Mmsg(emsg, _("is waiting on Storage \"%s\""), jcr->rstore->name());
} else {
Mmsg(emsg, _("is waiting on Storage"));
}
msg = _("is waiting on max total jobs");
break;
case JS_WaitStartTime:
- msg = _("is waiting for its start time");
+ emsg = (char *) get_pool_memory(PM_FNAME);
+ Mmsg(emsg, _("is waiting for its start time (%s)"),
+ bstrftime_ny(dt, sizeof(dt), jcr->sched_time));
+ pool_mem = true;
+ msg = emsg;
break;
case JS_WaitPriority:
msg = _("is waiting for higher priority jobs to finish");
break;
+ case JS_WaitDevice:
+ msg = _("is waiting for a Shared Storage device");
+ break;
case JS_DataCommitting:
msg = _("SD committing Data");
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");
msg = _("Dir inserting Attributes");
break;
}
- switch (jcr->JobType) {
+ 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->JobLevel), sizeof(level));
+ bstrncpy(level, level_to_str(jcr->getJobLevel()), sizeof(level));
level[7] = 0;
break;
}
- if (ua->api) {
- ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\n"),
- jcr->JobId, level, jcr->Job, msg);
+ if (ua->api == 1) {
+ bash_spaces(jcr->comment);
+ 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 {
- ua->send_msg(_("%6d %-6s %-20s %s\n"),
- jcr->JobId, level, jcr->Job, msg);
+ char b1[50], b2[50], b3[50];
+ level[4] = 0;
+ bstrncpy(b1, job_type_to_str(jcr->getJobType()), sizeof(b1));
+ b1[4] = 0;
+ ua->send_msg(_("%6d %-4s %-3s %10s %10s %-17s %s\n"),
+ jcr->JobId, b1, level,
+ edit_uint64_with_commas(jcr->JobFiles, b2),
+ edit_uint64_with_suffix(jcr->JobBytes, b3),
+ jcr->job->name(), msg);
}
if (pool_mem) {
}
}
endeach_jcr(jcr);
- if (!ua->api) ua->send_msg("====\n");
+ if (!ua->api) {
+ ua->send_msg("====\n");
+ }
Dmsg0(200, "leave list_run_jobs()\n");
}
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_Terminated:
termstat = _("OK");
break;
+ case JS_Warnings:
+ termstat = _("OK -- with warnings");
+ break;
+ case JS_Incomplete:
+ termstat = _("Incomplete");
+ break;
default:
termstat = _("Other");
break;
}
- if (ua->api) {
+ if (ua->api == 1) {
ua->send_msg(_("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
je->JobId,
level,
dt, JobName);
}
}
- if (!ua->api) ua->send_msg(_("\n"));
+ if (!ua->api) {
+ ua->send_msg(_("\n"));
+ }
unlock_last_jobs_list();
}
projects / bacula / bacula / blobdiff