utime_t now = (utime_t)time(NULL);
db_lock(ua->db);
- Mmsg(query, "DELETE FROM JobStat WHERE JobTDate < %s",
- edit_uint64(now - retention, ed1));
+ Mmsg(query, "DELETE FROM JobHistory WHERE JobTDate < %s",
+ edit_int64(now - retention, ed1));
db_sql_query(ua->db, query.c_str(), NULL, NULL);
db_unlock(ua->db);
- ua->info_msg(_("Pruned Jobs from JobStat catalog.\n"));
+ ua->info_msg(_("Pruned Jobs from JobHistory catalog.\n"));
return true;
}
now = (utime_t)time(NULL);
/* Select Jobs -- for counting */
- Mmsg(query, count_select_job, edit_uint64(now - period, ed1),
+ Mmsg(query, count_select_job, edit_int64(now - period, ed1),
edit_int64(cr.ClientId, ed2));
Dmsg3(050, "select now=%u period=%u sql=%s\n", (uint32_t)now,
(uint32_t)period, query.c_str());
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
/* Now process same set but making a delete list */
- Mmsg(query, select_job, edit_uint64(now - period, ed1),
+ Mmsg(query, select_job, edit_int64(now - period, ed1),
edit_int64(cr.ClientId, ed2));
db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)&del);
* Select all files that are older than the JobRetention period
* and stuff them into the "DeletionCandidates" table.
*/
- edit_uint64(now - period, ed1);
+ edit_int64(now - period, ed1);
Mmsg(query, insert_delcand, (char)JobType, ed1,
edit_int64(cr.ClientId, ed2));
if (!db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL)) {
{
POOL_MEM query(PM_MESSAGE);
int count = 0;
- int i;
utime_t now, period;
char ed1[50], ed2[50];
- JCR *jcr;
- bool skip;
if (mr->Enabled == 2) {
return 0; /* cannot prune Archived volumes */
}
- db_lock(ua->db);
-
/*
* Now add to the list of JobIds for Jobs written to this Volume
*/
edit_int64(mr->MediaId, ed1);
period = mr->VolRetention;
now = (utime_t)time(NULL);
- edit_uint64(now-period, ed2);
+ edit_int64(now-period, ed2);
Mmsg(query, sel_JobMedia, ed1, ed2);
- Dmsg3(250, "Now=%d period=%d now-period=%d\n", (int)now, (int)period,
- (int)(now-period));
+ Dmsg3(250, "Now=%d period=%d now-period=%s\n", (int)now, (int)period,
+ ed2);
Dmsg1(050, "Query=%s\n", query.c_str());
if (!db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)del)) {
Dmsg0(050, "Count failed\n");
goto bail_out;
}
+ count = exclude_running_jobs_from_list(del);
+
+bail_out:
+ return count;
+}
+
+/*
+ * We have a list of jobs to prune or purge. If any of them is
+ * currently running, we set its JobId to zero which effectively
+ * excludes it.
+ *
+ * Returns the number of jobs that can be prunned or purged.
+ *
+ */
+int exclude_running_jobs_from_list(del_ctx *prune_list)
+{
+ int count = 0;
+ JCR *jcr;
+ bool skip;
+ int i;
/* Do not prune any job currently running */
- for (i=0; i < del->num_ids; i++) {
+ for (i=0; i < prune_list->num_ids; i++) {
skip = false;
foreach_jcr(jcr) {
- if (jcr->JobId == del->JobId[i]) {
- Dmsg2(150, "skip same job JobId[%d]=%d\n", i, (int)del->JobId[i]);
- del->JobId[i] = 0;
+ if (jcr->JobId == prune_list->JobId[i]) {
+ Dmsg2(050, "skip running job JobId[%d]=%d\n", i, (int)prune_list->JobId[i]);
+ prune_list->JobId[i] = 0;
skip = true;
break;
}
}
+ endeach_jcr(jcr);
if (skip) {
- continue;
+ continue; /* don't increment count */
}
- Dmsg2(150, "accept JobId[%d]=%d\n", i, (int)del->JobId[i]);
+ Dmsg2(050, "accept JobId[%d]=%d\n", i, (int)prune_list->JobId[i]);
count++;
}
-
-bail_out:
- db_unlock(ua->db);
return count;
}