]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/filed/status.c
projects / bacula / bacula / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Restore win32 dir from Branch-5.2 and update it
[bacula/bacula] / bacula / src / filed / status.c
diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index b753b58d6aed81345ae00bda9124ffb5b7d4d1f7..504e5a723be1b3c6478e4803c2f1fb1f3a9cf7ad 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2018 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.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -11,7 +11,7 @@
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
    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 
+   This notice must be preserved when any source code is
    conveyed and/or propagated.
 
    Bacula(R) is a registered trademark of Kern Sibbald.
    conveyed and/or propagated.
 
    Bacula(R) is a registered trademark of Kern Sibbald.
@@ -43,7 +43,15 @@ static char qstatus2[] = ".status %127s api=%d api_opts=%127s";
 static char OKqstatus[]   = "2000 OK .status\n";
 static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 
 static char OKqstatus[]   = "2000 OK .status\n";
 static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 
+#if defined(HAVE_WIN32)
+static int privs = 0;
+#endif
+#ifdef WIN32_VSS
+#include "vss.h"
+#define VSS " VSS"
+#else
 #define VSS ""
 #define VSS ""
+#endif
 
 /*
  * General status generator
 
 /*
  * General status generator
@@ -62,32 +70,127 @@ static const bool have_lzo = false;
 #endif
 
 
 #endif
 
 
+static void api_list_status_header(STATUS_PKT *sp)
+{
+   char *p;
+   char buf[300];
+   OutputWriter wt(sp->api_opts);
+   *buf = 0;
+
+#if defined(HAVE_WIN32)
+   if (!GetWindowsVersionString(buf, sizeof(buf))) {
+      *buf = 0;
+   }
+#endif
+
+   wt.start_group("header");
+   wt.get_output(
+      OT_STRING, "name",        my_name,
+      OT_STRING, "version",     VERSION " (" BDATE ")",
+      OT_STRING, "uname",       HOST_OS " " DISTNAME " " DISTVER,
+      OT_UTIME,  "started",     daemon_start_time,
+      OT_INT,    "jobs_run",    num_jobs_run,
+      OT_INT,    "jobs_running",job_count(),
+      OT_STRING, "winver",      buf,
+      OT_INT64,  "debug",       debug_level,
+      OT_INT,    "trace",       get_trace(),
+      OT_INT64,  "bwlimit",     me->max_bandwidth_per_job,
+      OT_PLUGINS, "plugins",    b_plugin_list,
+      OT_END);
+   p = wt.end_group();
+   sendit(p, strlen(p), sp);
+}
+
 static void  list_status_header(STATUS_PKT *sp)
 {
    POOL_MEM msg(PM_MESSAGE);
    char b1[32], b2[32], b3[32], b4[32], b5[35];
 static void  list_status_header(STATUS_PKT *sp)
 {
    POOL_MEM msg(PM_MESSAGE);
    char b1[32], b2[32], b3[32], b4[32], b5[35];
+   int64_t memused = (char *)sbrk(0)-(char *)start_heap;
    int len;
    char dt[MAX_TIME_LENGTH];
 
    int len;
    char dt[MAX_TIME_LENGTH];
 
+   if (sp->api) {
+      api_list_status_header(sp);
+      return;
+   }
+
    len = Mmsg(msg, _("%s %sVersion: %s (%s) %s %s %s %s\n"),
    len = Mmsg(msg, _("%s %sVersion: %s (%s) %s %s %s %s\n"),
-              my_name, "", VERSION, BDATE, VSS, HOST_OS,
+              my_name, BDEMO, VERSION, BDATE, VSS, HOST_OS,
               DISTNAME, DISTVER);
    sendit(msg.c_str(), len, sp);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
         dt, num_jobs_run, job_count());
    sendit(msg.c_str(), len, sp);
               DISTNAME, DISTVER);
    sendit(msg.c_str(), len, sp);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
         dt, num_jobs_run, job_count());
    sendit(msg.c_str(), len, sp);
+#if defined(HAVE_WIN32)
+   char buf[300];
+   if (GetWindowsVersionString(buf, sizeof(buf))) {
+      len = Mmsg(msg, "%s\n", buf);
+      sendit(msg.c_str(), len, sp);
+   }
+   memused = get_memory_info(buf, sizeof(buf));
+   if (debug_level > 0) {
+      if (!privs) {
+         privs = enable_backup_privileges(NULL, 1);
+      }
+      len = Mmsg(msg, "Priv 0x%x\n", privs);
+      sendit(msg.c_str(), len, sp);
+
+      /* Display detailed information that we got from get_memory_info() */
+      len = Mmsg(msg, "Memory: %s\n", buf);
+      sendit(msg.c_str(), len, sp);
+
+      len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
+                 p_OpenProcessToken?"":"!",
+                 p_AdjustTokenPrivileges?"":"!",
+                 p_LookupPrivilegeValue?"":"!",
+                 p_CreateFileA?"":"!",
+                 p_CreateFileW?"":"!");
+      sendit(msg.c_str(), len, sp);
+      len = Mmsg(msg, " %sWUL,%sWMKD,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
+                 p_wunlink?"":"!",
+                 p_wmkdir?"":"!",
+                 p_GetFileAttributesA?"":"!",
+                 p_GetFileAttributesW?"":"!",
+                 p_GetFileAttributesExA?"":"!",
+                 p_GetFileAttributesExW?"":"!",
+                 p_SetFileAttributesA?"":"!",
+                 p_SetFileAttributesW?"":"!",
+                 p_BackupRead?"":"!",
+                 p_BackupWrite?"":"!",
+                 p_SetProcessShutdownParameters?"":"!");
+      sendit(msg.c_str(), len, sp);
+      len = Mmsg(msg, " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n",
+                 p_WideCharToMultiByte?"":"!",
+                 p_MultiByteToWideChar?"":"!",
+                 p_FindFirstFileA?"":"!",
+                 p_FindFirstFileW?"":"!",
+                 p_FindNextFileA?"":"!",
+                 p_FindNextFileW?"":"!",
+                 p_SetCurrentDirectoryA?"":"!",
+                 p_SetCurrentDirectoryW?"":"!");
+      sendit(msg.c_str(), len, sp);
+      len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW,%sLZO,%sEFS\n",
+                 p_GetCurrentDirectoryA?"":"!",
+                 p_GetCurrentDirectoryW?"":"!",
+                 p_GetVolumePathNameW?"":"!",
+                 p_GetVolumeNameForVolumeMountPointW?"":"!",
+                 have_lzo?"":"!",
+                 "!");
+      sendit(msg.c_str(), len, sp);
+   }
+#endif
    len = Mmsg(msg, _(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
    len = Mmsg(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(memused, 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));
    sendit(msg.c_str(), len, sp);
    len = Mmsg(msg, _(" Sizes: boffset_t=%d size_t=%d debug=%s trace=%d "
          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));
    sendit(msg.c_str(), len, sp);
    len = Mmsg(msg, _(" Sizes: boffset_t=%d size_t=%d debug=%s trace=%d "
-                     "mode=%d bwlimit=%skB/s\n"),
+                     "mode=%d,%d bwlimit=%skB/s\n"),
               sizeof(boffset_t), sizeof(size_t),
               sizeof(boffset_t), sizeof(size_t),
-              edit_uint64(debug_level, b2), get_trace(), (int)DEVELOPER_MODE,
+              edit_uint64(debug_level, b2), get_trace(), (int)DEVELOPER_MODE, 0,
               edit_uint64_with_commas(me->max_bandwidth_per_job/1024, b1));
    sendit(msg.c_str(), len, sp);
    if (b_plugin_list && b_plugin_list->size() > 0) {
               edit_uint64_with_commas(me->max_bandwidth_per_job/1024, b1));
    sendit(msg.c_str(), len, sp);
    if (b_plugin_list && b_plugin_list->size() > 0) {
@@ -132,8 +235,13 @@ static void  list_running_jobs_plain(STATUS_PKT *sp)
    Dmsg0(1000, "Begin status jcr loop.\n");
    len = Mmsg(msg, _("\nRunning Jobs:\n"));
    sendit(msg.c_str(), len, sp);
    Dmsg0(1000, "Begin status jcr loop.\n");
    len = Mmsg(msg, _("\nRunning Jobs:\n"));
    sendit(msg.c_str(), len, sp);
-   const char *vss = "";
    foreach_jcr(njcr) {
    foreach_jcr(njcr) {
+      const char *vss = "";
+#ifdef WIN32_VSS
+      if (njcr->pVSSClient && njcr->pVSSClient->IsInitialized()) {
+         vss = "VSS ";
+      }
+#endif
       bstrftime_nc(dt, sizeof(dt), njcr->start_time);
       if (njcr->JobId == 0) {
          len = Mmsg(msg, _("Director connected %sat: %s\n"),
       bstrftime_nc(dt, sizeof(dt), njcr->start_time);
       if (njcr->JobId == 0) {
          len = Mmsg(msg, _("Director connected %sat: %s\n"),
@@ -181,11 +289,17 @@ static void  list_running_jobs_plain(STATUS_PKT *sp)
            edit_uint64_with_commas(njcr->ReadBytes, b6));
       sendit(msg.c_str(), len, sp);
 
            edit_uint64_with_commas(njcr->ReadBytes, b6));
       sendit(msg.c_str(), len, sp);
 
-      if (njcr->is_JobType(JT_RESTORE) && njcr->ExpectedFiles > 0) {
-         len = Mmsg(msg, _("    Files: Restored=%s Expected=%s Completed=%d%%\n"),
-            edit_uint64_with_commas(njcr->num_files_examined, b1),
-            edit_uint64_with_commas(njcr->ExpectedFiles, b2),
-            (100*njcr->num_files_examined)/njcr->ExpectedFiles);
+      if (njcr->is_JobType(JT_RESTORE)) {
+         if (njcr->ExpectedFiles > 0) {
+            len = Mmsg(msg, _("    Files: Restored=%s Expected=%s Completed=%d%%\n"),
+                       edit_uint64_with_commas(njcr->num_files_examined, b1),
+                       edit_uint64_with_commas(njcr->ExpectedFiles, b2),
+                       (100*njcr->num_files_examined)/njcr->ExpectedFiles);
+
+         } else {
+            len = Mmsg(msg, _("    Files: Restored=%s\n"),
+                       edit_uint64_with_commas(njcr->num_files_examined, b1));
+         }
       } else {
          len = Mmsg(msg, _("    Files: Examined=%s Backed up=%s\n"),
             edit_uint64_with_commas(njcr->num_files_examined, b1),
       } else {
          len = Mmsg(msg, _("    Files: Examined=%s Backed up=%s\n"),
             edit_uint64_with_commas(njcr->num_files_examined, b1),
@@ -225,9 +339,102 @@ static void  list_running_jobs_plain(STATUS_PKT *sp)
    sendit(_("====\n"), 5, sp);
 }
 
    sendit(_("====\n"), 5, sp);
 }
 
+/*
+ * List running jobs for Bat or Bweb in a format
+ *  simpler to parse. Be careful when changing this
+ *  subroutine.
+ */
+static void  list_running_jobs_api(STATUS_PKT *sp)
+{
+   OutputWriter ow(sp->api_opts);
+   int sec, bps;
+   char *p;
+   JCR *njcr;
+
+   /* API v1, edit with comma, space before the name, sometime ' ' as separator */
+
+   foreach_jcr(njcr) {
+      int vss = 0;
+#ifdef WIN32_VSS
+      if (njcr->pVSSClient && njcr->pVSSClient->IsInitialized()) {
+         vss = 1;
+      }
+#endif
+      p = ow.get_output(OT_CLEAR, OT_START_OBJ, OT_END);
+
+      if (njcr->JobId == 0) {
+         int val = (njcr->dir_bsock && njcr->dir_bsock->tls)?1:0;
+         ow.get_output(OT_UTIME, "DirectorConnected", njcr->start_time,
+                       OT_INT, "DirTLS", val,
+                       OT_END);
+      } else {
+         ow.get_output(OT_INT32,   "JobId", njcr->JobId,
+                       OT_STRING,  "Job",   njcr->Job,
+                       OT_INT,     "VSS",   vss,
+                       OT_JOBLEVEL,"Level", njcr->getJobLevel(),
+                       OT_JOBTYPE, "Type",  njcr->getJobType(),
+                       OT_JOBSTATUS, "Status", njcr->getJobStatus(),
+                       OT_UTIME,   "StartTime", njcr->start_time,
+                       OT_END);
+
+      }
+      sendit(p, strlen(p), sp);
+      if (njcr->JobId == 0) {
+         continue;
+      }
+      sec = time(NULL) - njcr->start_time;
+      if (sec <= 0) {
+         sec = 1;
+      }
+      bps = (int)(njcr->JobBytes / sec);
+      ow.get_output(OT_CLEAR,
+                    OT_INT32,   "JobFiles",  njcr->JobFiles,
+                    OT_SIZE,    "JobBytes",  njcr->JobBytes,
+                    OT_INT,     "Bytes/sec", bps,
+                    OT_INT,     "Errors",    njcr->JobErrors,
+                    OT_INT64,   "Bwlimit",   njcr->max_bandwidth,
+                    OT_SIZE,    "ReadBytes", njcr->ReadBytes,
+                    OT_END);
+
+      ow.get_output(OT_INT32,  "Files Examined",  njcr->num_files_examined, OT_END);
+
+      if (njcr->is_JobType(JT_RESTORE) && njcr->ExpectedFiles > 0) {
+         ow.get_output(OT_INT32,  "Expected Files",  njcr->ExpectedFiles,
+                       OT_INT32,  "Percent Complete", 100*(njcr->num_files_examined/njcr->ExpectedFiles),
+                       OT_END);
+      }
+
+      sendit(p, strlen(p), sp);
+      ow.get_output(OT_CLEAR, OT_END);
+
+      if (njcr->JobFiles > 0) {
+         njcr->lock();
+         ow.get_output(OT_STRING,  "Processing file", njcr->last_fname, OT_END);
+         njcr->unlock();
+      }
+
+      if (njcr->store_bsock) {
+         int val = (njcr->store_bsock->tls)?1:0;
+         ow.get_output(OT_INT64, "SDReadSeqNo", (int64_t)njcr->store_bsock->read_seqno,
+                       OT_INT,   "fd",          njcr->store_bsock->m_fd,
+                       OT_INT,   "SDtls",       val,
+                       OT_END);
+      } else {
+         ow.get_output(OT_STRING, "SDSocket", "closed", OT_END);
+      }
+      ow.get_output(OT_END_OBJ, OT_END);
+      sendit(p, strlen(p), sp);
+   }
+   endeach_jcr(njcr);
+}
+
 static void  list_running_jobs(STATUS_PKT *sp)
 {
 static void  list_running_jobs(STATUS_PKT *sp)
 {
-   list_running_jobs_plain(sp);
+   if (sp->api) {
+      list_running_jobs_api(sp);
+   } else {
+      list_running_jobs_plain(sp);
+   }
 }
 
 /*
 }
 
 /*
Cloned from http://git.bacula.org/bacula