ebl Change the new statistic implementation. Remove the UseStatistic

     directive and add a "update stats [days=...]" command. You can
     now decide when copy job records from Job table to JobStat.
     Statistics are much more accurate with this.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7577 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h
index f0be9787ae15c6ee206bb8edb5986dae1b7901b0..f52e73029fcb40222ef918a22ecaf25a00b36bde 100644 (file)
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -124,7 +124,7 @@ void db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *
 
 /* sql_update.c */
 bool db_update_job_start_record(JCR *jcr, B_DB *db, JOB_DBR *jr);
-int  db_update_job_end_record(JCR *jcr, B_DB *db, JOB_DBR *jr, bool stats_enabled);
+int  db_update_job_end_record(JCR *jcr, B_DB *db, JOB_DBR *jr);
 int  db_update_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr);
 int  db_update_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pr);
 bool db_update_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *sr);
@@ -134,5 +134,6 @@ int  db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr);
 int  db_add_digest_to_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, char *digest, int type);
 int  db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId);
 void db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr);
+int db_update_stats(JCR *jcr, B_DB *mdb, time_t age);
 
 #endif /* __SQL_PROTOS_H */

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 530cec8539a88886e6792601686102b2c2015625..82a64ac2af716fb20a471bd93b99e41b07cb0dd1 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -125,6 +125,28 @@ db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    return stat;
 }
 
+/*
+ * Update Long term statistics with all jobs that were run before
+ * age seconds
+ */
+int
+db_update_stats(JCR *jcr, B_DB *mdb, time_t age)
+{
+   char ed1[30];
+   utime_t now = (utime_t)time(NULL);
+   edit_uint64(now - age, ed1);
+
+   Mmsg(mdb->cmd,
+        "INSERT INTO JobStat " 
+         "SELECT * " 
+          "FROM Job "
+         "WHERE JobStatus IN ('T', 'f', 'A', 'E') "
+           "AND JobId NOT IN (SELECT JobId FROM JobStat) "
+           "AND JobTDate < %s ", ed1);
+   QUERY_DB(jcr, mdb, mdb->cmd); /* TODO: get a message ? */
+   return sql_affected_rows(mdb);
+}
+
 /*
  * Given an incoming integer, set the string buffer to either NULL or the value
  *
@@ -134,7 +156,6 @@ static void edit_num_or_null(char *s, size_t n, uint64_t id) {
    bsnprintf(s, n, id ? "%s" : "NULL", edit_int64(id, ed1));
 }
 
-
 /*
  * Update the Job record at end of Job
  *
@@ -142,7 +163,7 @@ static void edit_num_or_null(char *s, size_t n, uint64_t id) {
  *           1 on success
  */
 int
-db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, bool stats_enabled)
+db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    char dt[MAX_TIME_LENGTH];
    char rdt[MAX_TIME_LENGTH];
@@ -193,12 +214,6 @@ db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, bool stats_enabled)
 
    stat = UPDATE_DB(jcr, mdb, mdb->cmd);
 
-   if (stat && stats_enabled) {
-      Mmsg(mdb->cmd,
-           "INSERT INTO JobStat (SELECT * FROM Job WHERE JobId=%s)",
-           edit_int64(jr->JobId, ed3));
-      INSERT_DB(jcr, mdb, mdb->cmd); /* TODO: get a message ? */
-   }
    db_unlock(mdb);
    return stat;
 }
@@ -292,7 +307,6 @@ db_update_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *sr)
 {
    int stat;
    char ed1[50];
-
    db_lock(mdb);
    Mmsg(mdb->cmd, "UPDATE Storage SET AutoChanger=%d WHERE StorageId=%s", 
       sr->AutoChanger, edit_int64(sr->StorageId, ed1));

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 828aa38cdb7a0bae7c68979702c3795582d09523..c357f2c56fb525249f587210841b806ac1e81a93 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -329,7 +329,6 @@ RES_ITEM job_items[] = {
    {"selectionpattern",   store_str, ITEM(res_job.selection_pattern), 0, 0, 0},
    {"runscript",          store_runscript, ITEM(res_job.RunScripts), 0, ITEM_NO_EQUALS, 0},
    {"selectiontype",      store_migtype, ITEM(res_job.selection_type), 0, 0, 0},
-   {"usestatistics",      store_bool,  ITEM(res_job.stats_enabled), 0, 0, 0},
    {"accurate",           store_bool, ITEM(res_job.accurate), 0,0,0},
    {"allowduplicatejobs", store_bool, ITEM(res_job.AllowDuplicateJobs), 0, ITEM_DEFAULT, false},
    {"allowhigherduplicates",   store_bool, ITEM(res_job.AllowHigherDuplicates), 0, ITEM_DEFAULT, true},
@@ -637,9 +636,6 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
       if (res->res_job.spool_size) {
          sendit(sock, _("     SpoolSize=%s\n"),        edit_uint64(res->res_job.spool_size, ed1));
       }
-      if (res->res_job.stats_enabled) {
-         sendit(sock, _("     StatsEnabled=%d\n"), res->res_job.stats_enabled);
-      }
       if (res->res_job.JobType == JT_BACKUP) {
          sendit(sock, _("     Accurate=%d\n"), res->res_job.accurate);
       }

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index faffeb0d45dbe5c8872376737678aa25b412fb63..9f9dfef8f137a9496d1a7c0c92f0c4a9befde1a1 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -428,7 +428,6 @@ public:
    bool write_part_after_job;         /* Set to write part after job in SD */
    bool enabled;                      /* Set if job enabled */
    bool OptimizeJobScheduling;        /* Set if we should optimize Job scheduling */
-   bool stats_enabled;                /* Keep job records in a table for long term statistics */
    bool accurate;                     /* Set if it is an accurate backup job */
    bool AllowDuplicateJobs;           /* Allow duplicate jobs */
    bool AllowHigherDuplicates;        /* Permit Higher Level */

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index e34eb335ec6499d9924c27cf429a363a2c0ebd66..2224bc9939a9902157f59f81a87e3302caf04745 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -854,7 +854,7 @@ void update_job_end_record(JCR *jcr)
    jcr->jr.VolSessionId = jcr->VolSessionId;
    jcr->jr.VolSessionTime = jcr->VolSessionTime;
    jcr->jr.JobErrors = jcr->Errors;
-   if (!db_update_job_end_record(jcr, jcr->db, &jcr->jr, jcr->job->stats_enabled)) {
+   if (!db_update_job_end_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_WARNING, 0, _("Error updating job record. %s"),
          db_strerror(jcr->db));
    }

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index c042c3a4bf9e567c486e63faeef0d34caaa60c4e..b5650d868621733d30cdce06fc87ae52f90ce6b5 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -155,7 +155,7 @@ bool do_a_command(UAContext *ua)
    BSOCK *user = ua->UA_sock;
 
 
-   Dmsg1(900, "Command: %s\n", ua->UA_sock->msg);
+   Dmsg1(900, "Command: %s\n", ua->argk[0]);
    if (ua->argc == 0) {
       return false;
    }

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index 3e16222785329d1267fde5a5793b002c872fd3d7..e49ef67dc65201c18254e1ae0aab046fb1010a5a 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -42,6 +42,7 @@
 static int update_volume(UAContext *ua);
 static bool update_pool(UAContext *ua);
 static bool update_job(UAContext *ua);
+static bool update_stats(UAContext *ua);
 
 /*
  * Update a Pool Record in the database.
@@ -53,6 +54,8 @@ static bool update_job(UAContext *ua);
  *         changes pool info for volume
  *    update slots [scan=...]
  *         updates autochanger slots
+ *    update stats [days=...]
+ *         updates long term statistics
  */
 int update_cmd(UAContext *ua, const char *cmd)
 {
@@ -62,6 +65,7 @@ int update_cmd(UAContext *ua, const char *cmd)
       NT_("pool"),   /* 2 */
       NT_("slots"),  /* 3 */
       NT_("jobid"),  /* 4 */
+      NT_("stats"),  /* 5 */
       NULL};
 
    if (!open_client_db(ua)) {
@@ -82,6 +86,9 @@ int update_cmd(UAContext *ua, const char *cmd)
    case 4:
       update_job(ua);
       return 1;
+   case 5:
+      update_stats(ua);
+      return 1;
    default:
       break;
    }
@@ -90,6 +97,7 @@ int update_cmd(UAContext *ua, const char *cmd)
    add_prompt(ua, _("Volume parameters"));
    add_prompt(ua, _("Pool from resource"));
    add_prompt(ua, _("Slots from autochanger"));
+   add_prompt(ua, _("Long term statistics"));
    switch (do_prompt(ua, _("item"), _("Choose catalog item to update"), NULL, 0)) {
    case 0:
       update_volume(ua);
@@ -100,6 +108,9 @@ int update_cmd(UAContext *ua, const char *cmd)
    case 2:
       update_slots(ua);
       break;
+   case 3:
+      update_stats(ua);
+      break;
    default:
       break;
    }
@@ -788,6 +799,24 @@ static int update_volume(UAContext *ua)
    return 1;
 }
 
+/*
+ * Update long term statistics
+ */
+static bool update_stats(UAContext *ua)
+{
+   int i = find_arg_with_value(ua, NT_("days"));
+   utime_t since=0;
+
+   if (i >= 0) {
+      since = atoi(ua->argv[i]) * 24*60*60;
+   }
+
+   int nb = db_update_stats(ua->jcr, ua->db, since);
+   ua->info_msg(_("Updating %i job(s).\n"), nb);
+
+   return true;
+}
+
 /*
  * Update pool record -- pull info from current POOL resource
  */

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 5817a2ac46953cfa2386900c6172e5ccbe022f32..a4d320c7217c3ba5f571bffbb384b04438f841ae 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -622,7 +622,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
                jr.VolSessionTime = mjcr->VolSessionTime;
                jr.JobTDate = (utime_t)mjcr->start_time;
                jr.ClientId = mjcr->ClientId;
-               if (!db_update_job_end_record(bjcr, db, &jr, false)) {
+               if (!db_update_job_end_record(bjcr, db, &jr)) {
                   Pmsg1(0, _("Could not update job record. ERR=%s\n"), db_strerror(db));
                }
                mjcr->read_dcr = NULL;
@@ -1125,7 +1125,7 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
       return 1;
    }
 
-   if (!db_update_job_end_record(bjcr, db, jr, false)) {
+   if (!db_update_job_end_record(bjcr, db, jr)) {
       Pmsg2(0, _("Could not update JobId=%u record. ERR=%s\n"), jr->JobId,  db_strerror(db));
       free_jcr(mjcr);
       return 0;

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 524e3187966bd5960920cb61c39f7ce62bee2ec0..57aa818d42f85d8538883a7979996ee6610bf68a 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -61,6 +61,11 @@ plugin
 remove reader/writer in FOPTS????
 
 General:
+09Sep08
+ebl  Change the new statistic implementation. Remove the UseStatistic
+     directive and add a "update stats [days=...]" command. You can
+     now decide when copy job records from Job table to JobStat.
+     Statistics are much more accurate with this.
 08Sep08
 kes  Fix SQL case problem that may cause the failure of DiskToCatalog
      in bug #1149.