/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+ 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 plus additions
- that are listed in the file LICENSE.
+ 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
#include "bacula.h"
#include "dird.h"
-extern void *start_sbrk;
+extern void *start_heap;
static void list_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);
-static void do_client_status(UAContext *ua, CLIENT *client);
+static void do_storage_status(UAContext *ua, STORE *store, char *cmd);
+static void do_client_status(UAContext *ua, CLIENT *client, char *cmd);
static void do_director_status(UAContext *ua);
static void do_all_status(UAContext *ua);
bool dot_status_cmd(UAContext *ua, const char *cmd)
{
+ STORE *store;
+ CLIENT *client;
JCR* njcr = NULL;
s_last_job* job;
char ed1[50];
- Dmsg1(20, "status:%s:\n", cmd);
+ Dmsg2(20, "status=\"%s\" argc=%d\n", cmd, ua->argc);
- if ((ua->argc != 3) || (strcasecmp(ua->argk[1], "dir"))) {
+ if (ua->argc < 3) {
ua->send_msg("1900 Bad .status command, missing arguments.\n");
return false;
}
- 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),
- njcr->JobStatus, njcr->JobErrors);
+ if (strcasecmp(ua->argk[1], "dir") == 0) {
+ 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),
+ njcr->JobStatus, njcr->JobErrors);
+ }
}
- }
- endeach_jcr(njcr);
- } else if (strcasecmp(ua->argk[2], "last") == 0) {
- ua->send_msg(OKqstatus, ua->argk[2]);
- 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),
- job->JobStatus, job->Errors);
+ endeach_jcr(njcr);
+ } else if (strcasecmp(ua->argk[2], "last") == 0) {
+ ua->send_msg(OKqstatus, ua->argk[2]);
+ 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),
+ job->JobStatus, job->Errors);
+ }
}
+ } else if (strcasecmp(ua->argk[2], "header") == 0) {
+ list_dir_status_header(ua);
+ } else if (strcasecmp(ua->argk[2], "scheduled") == 0) {
+ list_scheduled_jobs(ua);
+ } else if (strcasecmp(ua->argk[2], "running") == 0) {
+ list_running_jobs(ua);
+ } else if (strcasecmp(ua->argk[2], "terminated") == 0) {
+ list_terminated_jobs(ua);
+ } else {
+ ua->send_msg("1900 Bad .status command, wrong argument.\n");
+ return false;
+ }
+ } else if (strcasecmp(ua->argk[1], "client") == 0) {
+ client = get_client_resource(ua);
+ if (client) {
+ Dmsg2(200, "Client=%s arg=%s\n", client->name(), NPRT(ua->argk[2]));
+ 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]);
}
} else {
ua->send_msg("1900 Bad .status command, wrong argument.\n");
} else if (strcasecmp(ua->argk[i], NT_("client")) == 0) {
client = get_client_resource(ua);
if (client) {
- do_client_status(ua, client);
+ do_client_status(ua, client, NULL);
}
return 1;
} else {
store = get_storage_resource(ua, false/*no default*/);
if (store) {
- do_storage_status(ua, store);
+ do_storage_status(ua, store, NULL);
}
return 1;
}
case 1:
store = select_storage_resource(ua);
if (store) {
- do_storage_status(ua, store);
+ do_storage_status(ua, store, NULL);
}
break;
case 2:
client = select_client_resource(ua);
if (client) {
- do_client_status(ua, client);
+ do_client_status(ua, client, NULL);
}
break;
case 3:
/* Call each unique Storage daemon */
for (j=0; j<i; j++) {
- do_storage_status(ua, unique_store[j]);
+ do_storage_status(ua, unique_store[j], NULL);
}
free(unique_store);
/* Call each unique File daemon */
for (j=0; j<i; j++) {
- do_client_status(ua, unique_client[j]);
+ do_client_status(ua, unique_client[j], NULL);
}
free(unique_client);
ua->send_msg(_("Daemon started %s, %d Jobs run since started.\n"),
dt, num_jobs_run);
}
- ua->send_msg(_(" Heap: sbrk=%s bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
- edit_uint64_with_commas((uint64_t)sbrk(0)-(uint64_t)start_sbrk, b1),
+ 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),
* List terminated jobs
*/
list_terminated_jobs(ua);
- ua->send_msg(_("====\n"));
+ ua->send_msg("====\n");
}
-static void do_storage_status(UAContext *ua, STORE *store)
+static void do_storage_status(UAContext *ua, STORE *store, char *cmd)
{
BSOCK *sd;
USTORE lstore;
pm_strcpy(lstore.store_source, _("unknown source"));
set_wstorage(ua->jcr, &lstore);
/* Try connecting for up to 15 seconds */
- ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"),
+ if (!ua->api) ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"),
store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
ua->send_msg(_("\nFailed to connect to Storage daemon %s.\n====\n"),
}
Dmsg0(20, _("Connected to storage daemon\n"));
sd = ua->jcr->store_bsock;
- bnet_fsend(sd, "status");
- while (bnet_recv(sd) >= 0) {
+ if (cmd) {
+ sd->fsend(".status %s", cmd);
+ } else {
+ sd->fsend("status");
+ }
+ while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
}
- bnet_sig(sd, BNET_TERMINATE);
- bnet_close(sd);
+ sd->signal( BNET_TERMINATE);
+ sd->close();
ua->jcr->store_bsock = NULL;
return;
}
-static void do_client_status(UAContext *ua, CLIENT *client)
+static void do_client_status(UAContext *ua, CLIENT *client, char *cmd)
{
BSOCK *fd;
ua->jcr->sd_auth_key = bstrdup("dummy");
/* Try to connect for 15 seconds */
- ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
+ if (!ua->api) 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)) {
ua->send_msg(_("Failed to connect to Client %s.\n====\n"),
}
Dmsg0(20, _("Connected to file daemon\n"));
fd = ua->jcr->file_bsock;
- bnet_fsend(fd, "status");
- while (bnet_recv(fd) >= 0) {
+ if (cmd) {
+ fd->fsend(".status %s", cmd);
+ } else {
+ fd->fsend("status");
+ }
+ while (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;
static void prt_runhdr(UAContext *ua)
{
- ua->send_msg(_("\nScheduled Jobs:\n"));
- ua->send_msg(_("Level Type Pri Scheduled Name Volume\n"));
- ua->send_msg(_("===================================================================================\n"));
+ if (!ua->api) {
+ ua->send_msg(_("\nScheduled Jobs:\n"));
+ ua->send_msg(_("Level Type Pri Scheduled Name Volume\n"));
+ ua->send_msg(_("===================================================================================\n"));
+ }
}
/* Scheduling packet */
level_ptr = level_to_str(sp->level);
break;
}
- ua->send_msg(_("%-14s %-8s %3d %-18s %-18s %s\n"),
- level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
- sp->job->name(), mr.VolumeName);
+ if (ua->api) {
+ 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);
+ } else {
+ ua->send_msg(_("%-14s %-8s %3d %-18s %-18s %s\n"),
+ level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
+ sp->job->name(), mr.VolumeName);
+ }
if (close_db) {
db_close_database(jcr, jcr->db);
}
i = find_arg_with_value(ua, NT_("days"));
if (i >= 0) {
days = atoi(ua->argv[i]);
- if ((days < 0) || (days > 50)) {
- ua->send_msg(_("Ignoring invalid value for days. Max is 50.\n"));
+ if ((days < 0) || (days > 500) && !ua->api) {
+ ua->send_msg(_("Ignoring invalid value for days. Max is 500.\n"));
days = 1;
}
}
foreach_dlist(sp, &sched) {
prt_runtime(ua, sp);
}
- if (num_jobs == 0) {
+ if (num_jobs == 0 && !ua->api) {
ua->send_msg(_("No Scheduled Jobs.\n"));
}
- ua->send_msg(_("====\n"));
+ if (!ua->api) ua->send_msg("====\n");
Dmsg0(200, "Leave list_sched_jobs_runs()\n");
}
bool pool_mem = false;
Dmsg0(200, "enter list_run_jobs()\n");
- ua->send_msg(_("\nRunning 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) {
+ 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 (njobs == 0) {
/* Note the following message is used in regress -- don't change */
- ua->send_msg(_("No Jobs running.\n====\n"));
+ if (!ua->api) ua->send_msg(_("No Jobs running.\n====\n"));
Dmsg0(200, "leave list_run_jobs()\n");
return;
}
njobs = 0;
- ua->send_msg(_(" JobId Level Name Status\n"));
- ua->send_msg(_("======================================================================\n"));
+ if (!ua->api) {
+ ua->send_msg(_(" JobId Level Name Status\n"));
+ ua->send_msg(_("======================================================================\n"));
+ }
foreach_jcr(jcr) {
if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
continue;
break;
case JS_WaitFD:
emsg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(emsg, _("is waiting on Client %s"), jcr->client->name());
+ if (!jcr->client) {
+ Mmsg(emsg, _("is waiting on Client"));
+ } else {
+ Mmsg(emsg, _("is waiting on Client %s"), jcr->client->name());
+ }
pool_mem = true;
msg = emsg;
break;
emsg = (char *) get_pool_memory(PM_FNAME);
if (jcr->wstore) {
Mmsg(emsg, _("is waiting on Storage %s"), jcr->wstore->name());
- } else {
+ } else if (jcr->rstore) {
Mmsg(emsg, _("is waiting on Storage %s"), jcr->rstore->name());
+ } else {
+ Mmsg(emsg, _("is waiting on Storage"));
}
pool_mem = true;
msg = emsg;
case JS_WaitPriority:
msg = _("is waiting for higher priority jobs to finish");
break;
+ case JS_DataCommitting:
+ msg = _("SD committing Data");
+ break;
+ case JS_DataDespooling:
+ msg = _("SD despooling Data");
+ break;
+ case JS_AttrDespooling:
+ msg = _("SD despooling Attributes");
+ break;
+ case JS_AttrInserting:
+ msg = _("Dir inserting Attributes");
+ break;
default:
- emsg = (char *) get_pool_memory(PM_FNAME);
+ emsg = (char *)get_pool_memory(PM_FNAME);
Mmsg(emsg, _("is in unknown state %c"), jcr->JobStatus);
pool_mem = true;
msg = emsg;
emsg = (char *)get_pool_memory(PM_FNAME);
pool_mem = true;
}
- 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");
+ break;
+ case JS_DataDespooling:
+ msg = _("SD despooling Data");
+ break;
+ case JS_AttrDespooling:
+ msg = _("SD despooling Attributes");
+ break;
+ case JS_AttrInserting:
+ msg = _("Dir inserting Attributes");
break;
}
switch (jcr->JobType) {
break;
}
- ua->send_msg(_("%6d %-6s %-20s %s\n"),
- jcr->JobId,
- level,
- jcr->Job,
- msg);
+ if (ua->api) {
+ ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\n"),
+ jcr->JobId, level, jcr->Job, msg);
+ } else {
+ ua->send_msg(_("%6d %-6s %-20s %s\n"),
+ jcr->JobId, level, jcr->Job, msg);
+ }
if (pool_mem) {
free_pool_memory(emsg);
}
}
endeach_jcr(jcr);
- ua->send_msg(_("====\n"));
+ if (!ua->api) ua->send_msg("====\n");
Dmsg0(200, "leave list_run_jobs()\n");
}
char level[10];
if (last_jobs->empty()) {
- ua->send_msg(_("No Terminated Jobs.\n"));
+ if (!ua->api) ua->send_msg(_("No Terminated Jobs.\n"));
return;
}
lock_last_jobs_list();
struct s_last_job *je;
- ua->send_msg(_("\nTerminated Jobs:\n"));
- ua->send_msg(_(" JobId Level Files Bytes Status Finished Name \n"));
- ua->send_msg(_("====================================================================\n"));
+ if (!ua->api) {
+ ua->send_msg(_("\nTerminated Jobs:\n"));
+ ua->send_msg(_(" JobId Level Files Bytes Status Finished Name \n"));
+ ua->send_msg(_("====================================================================\n"));
+ }
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
const char *termstat;
termstat = _("Other");
break;
}
- ua->send_msg(_("%6d %-6s %8s %10s %-7s %-8s %s\n"),
- je->JobId,
- level,
- edit_uint64_with_commas(je->JobFiles, b1),
- edit_uint64_with_suffix(je->JobBytes, b2),
- termstat,
- dt, JobName);
- }
- ua->send_msg(_("\n"));
+ if (ua->api) {
+ ua->send_msg(_("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
+ je->JobId,
+ level,
+ edit_uint64_with_commas(je->JobFiles, b1),
+ edit_uint64_with_suffix(je->JobBytes, b2),
+ termstat,
+ dt, JobName);
+ } else {
+ ua->send_msg(_("%6d %-6s %8s %10s %-7s %-8s %s\n"),
+ je->JobId,
+ level,
+ edit_uint64_with_commas(je->JobFiles, b1),
+ edit_uint64_with_suffix(je->JobBytes, b2),
+ termstat,
+ dt, JobName);
+ }
+ }
+ if (!ua->api) ua->send_msg(_("\n"));
unlock_last_jobs_list();
}
projects / bacula / bacula / blobdiff