X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_output.c;h=55d81ebb9ce71788e67e59366cad9260cc34e58f;hb=b9ac1b6c82fd69ecf139edce98585a889906db8b;hp=5d15c3f58b8047923fde6dd5ffc7419a69408dc1;hpb=115ff3103ba53c221405c63110787ec64067e788;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index 5d15c3f58b..55d81ebb9c 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -32,7 +32,6 @@
 #include "dird.h"
 
 /* Imported subroutines */
-extern void run_job(JCR *jcr);
 
 /* Imported variables */
 extern int r_first;
@@ -46,8 +45,7 @@ extern brwlock_t con_lock;
 /* Imported functions */
 
 /* Forward referenced functions */
-static int do_listcmd(UAContext *ua, char *cmd, int llist);
-
+static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist);
 
 /*
  * Turn auto display of console messages on/off
@@ -60,15 +58,15 @@ int autodisplaycmd(UAContext *ua, char *cmd)
       NULL};
 
    switch (find_arg_keyword(ua, kw)) {
-      case 0:
-	 ua->auto_display_messages = 1;
-	 break;
-      case 1:
-	 ua->auto_display_messages = 0;
-	 break;
-      default:
-         bsendmsg(ua, _("ON or OFF keyword missing.\n"));
-	 break;
+   case 0:
+      ua->auto_display_messages = 1;
+      break;
+   case 1:
+      ua->auto_display_messages = 0;
+      break;
+   default:
+      bsendmsg(ua, _("ON or OFF keyword missing.\n"));
+      break;
    }
    return 1; 
 }
@@ -78,12 +76,12 @@ struct showstruct {char *res_name; int type;};
 static struct showstruct reses[] = {
    {N_("directors"),  R_DIRECTOR},
    {N_("clients"),    R_CLIENT},
+   {N_("counters"),   R_COUNTER},
    {N_("jobs"),       R_JOB},
    {N_("storages"),   R_STORAGE},
    {N_("catalogs"),   R_CATALOG},
    {N_("schedules"),  R_SCHEDULE},
    {N_("filesets"),   R_FILESET},
-   {N_("groups"),     R_GROUP},
    {N_("pools"),      R_POOL},
    {N_("messages"),   R_MSGS},
    {N_("all"),        -1},
@@ -100,7 +98,7 @@ static struct showstruct reses[] = {
  *  show <resource-keyword-name>=<name> e.g. show director=HeadMan
  *
  */
-int showcmd(UAContext *ua, char *cmd)
+int show_cmd(UAContext *ua, char *cmd)
 {
    int i, j, type, len; 
    int recurse;
@@ -188,22 +186,24 @@ int showcmd(UAContext *ua, char *cmd)
  *  list media		- list media for given pool (deprecated)
  *  list volumes	- list Volumes
  *  list clients	- list clients
+ *  list nextvol job=xx  - list the next vol to be used by job
+ *  list nextvolume job=xx - same as above.
  *
  */
 
 /* Do long or full listing */
-int llistcmd(UAContext *ua, char *cmd)
+int llist_cmd(UAContext *ua, char *cmd)
 {
-   return do_listcmd(ua, cmd, 1);
+   return do_list_cmd(ua, cmd, VERT_LIST);
 }
 
 /* Do short or summary listing */
-int listcmd(UAContext *ua, char *cmd)
+int list_cmd(UAContext *ua, char *cmd)
 {
-   return do_listcmd(ua, cmd, 0);
+   return do_list_cmd(ua, cmd, HORZ_LIST);
 }
 
-static int do_listcmd(UAContext *ua, char *cmd, int llist) 
+static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
 {
    POOLMEM *VolumeName;
    int jobid, n;
@@ -229,7 +229,7 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
    for (i=1; i<ua->argc; i++) {
       /* List JOBS */
       if (strcasecmp(ua->argk[i], _("jobs")) == 0) {
-	 db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua);
+	 db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
 
 	 /* List JOBTOTALS */
       } else if (strcasecmp(ua->argk[i], _("jobtotals")) == 0) {
@@ -241,7 +241,7 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
 	    jobid = atoi(ua->argv[i]);
 	    if (jobid > 0) {
 	       jr.JobId = jobid;
-	       db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua);
+	       db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
 	    }
 	 }
 
@@ -249,7 +249,7 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
       } else if (strcasecmp(ua->argk[i], _("job")) == 0 && ua->argv[i]) {
 	 bstrncpy(jr.Job, ua->argv[i], MAX_NAME_LENGTH);
 	 jr.JobId = 0;
-	 db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua);
+	 db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
 
       /* List FILES */
       } else if (strcasecmp(ua->argk[i], _("files")) == 0) {
@@ -284,26 +284,26 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
 	    } else {
 	       continue;
 	    }
-	    db_list_jobmedia_records(ua->jcr, ua->db, jobid, prtit, ua);
+	    db_list_jobmedia_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
 	    done = TRUE;
 	 }
 	 if (!done) {
 	    /* List for all jobs (jobid=0) */
-	    db_list_jobmedia_records(ua->jcr, ua->db, 0, prtit, ua);
+	    db_list_jobmedia_records(ua->jcr, ua->db, 0, prtit, ua, llist);
 	 }
 
       /* List POOLS */
       } else if (strcasecmp(ua->argk[i], _("pools")) == 0) {
-	 db_list_pool_records(ua->jcr, ua->db, prtit, ua);
+	 db_list_pool_records(ua->jcr, ua->db, prtit, ua, llist);
 
       } else if (strcasecmp(ua->argk[i], _("clients")) == 0) {
-	 db_list_client_records(ua->jcr, ua->db, prtit, ua);
+	 db_list_client_records(ua->jcr, ua->db, prtit, ua, llist);
 
 
       /* List MEDIA or VOLUMES */
       } else if (strcasecmp(ua->argk[i], _("media")) == 0 ||
                  strcasecmp(ua->argk[i], _("volumes")) == 0) {
-	 int done = FALSE;
+	 bool done = false;
 	 for (j=i+1; j<ua->argc; j++) {
             if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
 	       bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
@@ -319,7 +319,7 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
 	    n = db_get_job_volume_names(ua->jcr, ua->db, jobid, &VolumeName);
             bsendmsg(ua, _("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
 	    free_pool_memory(VolumeName);
-	    done = TRUE;
+	    done = true;
 	 }
 	 /* if no job or jobid keyword found, then we list all media */
 	 if (!done) {
@@ -329,10 +329,11 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
 	    for (i=1; i<ua->argc; i++) {
                if (strcasecmp(ua->argk[i], _("pool")) == 0) {
 		  if (!get_pool_dbr(ua, &pr)) {
+                     bsendmsg(ua, _("No Pool specified.\n"));
 		     return 1;
 		  }
 		  mr.PoolId = pr.PoolId;
-		  db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua);
+		  db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
 		  return 1;
 	       }
 	    }
@@ -351,11 +352,75 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
                   bsendmsg(ua, _("Pool: %s\n"), pr.Name);
 	       }
 	       mr.PoolId = ids[i];
-	       db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua);
+	       db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
 	    }
 	    free(ids);
 	    return 1;
 	 }
+      /* List a specific volume */
+      } else if (strcasecmp(ua->argk[i], _("volume")) == 0) {
+	 if (!ua->argv[i]) {
+            bsendmsg(ua, _("No Volume Name specified.\n"));
+	    return 1;
+	 }
+	 bstrncpy(mr.VolumeName, ua->argv[i], sizeof(mr.VolumeName));
+	 db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
+	 return 1;
+      /* List next volume */
+      } else if (strcasecmp(ua->argk[i], _("nextvol")) == 0 || 
+                 strcasecmp(ua->argk[i], _("nextvolume")) == 0) {
+	 JOB *job;
+	 JCR *jcr = ua->jcr;
+	 POOL *pool;
+	 RUN *run;
+	 time_t runtime;
+	 bool found = false;
+
+         i = find_arg_with_value(ua, "job");
+	 if (i <= 0) {
+	    if ((job = select_job_resource(ua)) == NULL) {
+	       return 1;
+	    }
+	 } else {
+	    job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+	    if (!job) {
+               Jmsg(jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
+	       if ((job = select_job_resource(ua)) == NULL) {
+		  return 1;
+	       }
+	    }
+	 }
+	 for (run=NULL; (run = find_next_run(run, job, runtime)); ) {
+	    pool = run ? run->pool : NULL;
+	    if (!complete_jcr_for_job(jcr, job, pool)) {
+	       return 1;
+	    }
+	   
+	    if (!find_next_volume_for_append(jcr, &mr, 0)) {
+               bsendmsg(ua, _("Could not find next Volume.\n"));
+	       if (jcr->db) {
+		  db_close_database(jcr, jcr->db);
+		  jcr->db = NULL;
+	       }
+	       return 1;
+	    } else {
+               bsendmsg(ua, _("The next Volume to be used by Job \"%s\" will be %s\n"), 
+		  job->hdr.name, mr.VolumeName);
+	       found = true;
+	    }
+	    if (jcr->db) {
+	       db_close_database(jcr, jcr->db);
+	       jcr->db = NULL;
+	    }
+	 }
+	 if (jcr->db) {
+	    db_close_database(jcr, jcr->db);
+	    jcr->db = NULL;
+	 }
+	 if (!found) {
+            bsendmsg(ua, _("Could not find next Volume.\n"));
+	 }
+	 return 1;
       } else {
          bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
       }
@@ -363,6 +428,147 @@ static int do_listcmd(UAContext *ua, char *cmd, int llist)
    return 1;
 }
 
+/* 
+ * For a given job, we examine all his run records
+ *  to see if it is scheduled today or tomorrow.
+ */
+RUN *find_next_run(RUN *run, JOB *job, time_t &runtime)
+{
+   time_t now, tomorrow;
+   SCHED *sched;
+   struct tm tm;
+   int mday, wday, month, wom, tmday, twday, tmonth, twom, i, hour;
+   int woy, twoy;
+   int tod, tom;
+
+   sched = job->schedule;
+   if (sched == NULL) { 	   /* scheduled? */
+      return NULL;		   /* no nothing to report */
+   }
+   /* Break down current time into components */ 
+   now = time(NULL);
+   localtime_r(&now, &tm);
+   mday = tm.tm_mday - 1;
+   wday = tm.tm_wday;
+   month = tm.tm_mon;
+   wom = mday / 7;
+   woy = tm_woy(now);
+
+   /* Break down tomorrow into components */
+   tomorrow = now + 60 * 60 * 24;
+   localtime_r(&tomorrow, &tm);
+   tmday = tm.tm_mday - 1;
+   twday = tm.tm_wday;
+   tmonth = tm.tm_mon;
+   twom = tmday / 7;
+   twoy  = tm_woy(tomorrow);
+
+   if (run == NULL) {
+      run = sched->run;
+   } else {
+      run = run->next;
+   }
+   for ( ; run; run=run->next) {
+      /* 
+       * Find runs in next 24 hours
+       */
+      tod = (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);
+
+      tom = (bit_is_set(tmday, run->mday) || bit_is_set(twday, run->wday)) &&
+	     bit_is_set(tmonth, run->month) && bit_is_set(twom, run->wom) &&
+	     bit_is_set(twoy, run->woy);
+
+//    Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
+//    Dmsg2(200, "wom=%d twom=%d\n", wom, twom);
+//    Dmsg1(200, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+      if (tod) {		   /* Jobs scheduled today (next 24 hours) */
+	 /* find time (time_t) job is to be run */
+	 localtime_r(&now, &tm);
+	 hour = 0;
+	 for (i=tm.tm_hour; i < 24; i++) {
+	    if (bit_is_set(i, run->hour)) {
+	       tm.tm_hour = i;
+	       tm.tm_min = run->minute;
+	       tm.tm_sec = 0;
+	       runtime = mktime(&tm);
+	       if (runtime > now) {
+                  Dmsg2(000, "Found it level=%d %c\n", run->level, run->level);
+		  return run;	      /* found it, return run resource */
+	       }
+	    }
+	 }
+      }
+
+//    Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
+      if (tom) {		/* look at jobs scheduled tomorrow */
+	 localtime_r(&tomorrow, &tm);
+	 hour = 0;
+	 for (i=0; i < 24; i++) {
+	    if (bit_is_set(i, run->hour)) {
+	       hour = i;
+	       break;
+	    }
+	 }
+	 tm.tm_hour = hour;
+	 tm.tm_min = run->minute;
+	 tm.tm_sec = 0;
+	 runtime = mktime(&tm);
+//       Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
+	 if (runtime < tomorrow) {
+	    return run; 	      /* found it, return run resource */
+	 }
+      }
+   } /* end for loop over runs */ 
+   /* Nothing found */
+   return NULL;
+}
+/* 
+ * Fill in the remaining fields of the jcr as if it
+ *  is going to run the job.
+ */
+int complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool)
+{
+   POOL_DBR pr;
+
+   memset(&pr, 0, sizeof(POOL_DBR));   
+   set_jcr_defaults(jcr, job);
+   if (pool) {
+      jcr->pool = pool; 	      /* override */
+   }
+   jcr->db = jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
+		      jcr->catalog->db_password, jcr->catalog->db_address,
+		      jcr->catalog->db_port, jcr->catalog->db_socket);
+   if (!jcr->db || !db_open_database(jcr, jcr->db)) {
+      Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
+		 jcr->catalog->db_name);
+      if (jcr->db) {
+         Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+      }
+      return 0;
+   }
+   bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
+   while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
+      /* Try to create the pool */
+      if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
+         Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, 
+	    db_strerror(jcr->db));
+	 if (jcr->db) {
+	    db_close_database(jcr, jcr->db);
+	    jcr->db = NULL;
+	 }
+	 return 0;
+      } else {
+         Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
+      }
+   }
+   jcr->PoolId = pr.PoolId; 
+   jcr->jr.PoolId = pr.PoolId;
+   return 1;
+}
+
+
 static void con_lock_release(void *arg)
 {
    Vw(con_lock);
@@ -450,11 +656,12 @@ again:
    len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
    va_end(arg_ptr);
    if (len < 0 || len >= maxlen) {
-      msg = realloc_pool_memory(msg, maxlen + 200);
+      msg = realloc_pool_memory(msg, maxlen + maxlen/2);
       goto again;
    }
 
    if (bs) {
+      bs->msg = msg;
       bs->msglen = len;
       bnet_send(bs);
    } else {			      /* No UA, send to Job */