*
* Bacula scheduler
* It looks at what jobs are to be run and when
- * and waits around until it is time to
+ * and waits around until it is time to
* fire them up.
*
* Kern Sibbald, May MM, major revision December MMIII
* Version $Id$
*/
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Copyright (C) 2000-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
/* Local variables */
-struct job_item {
+struct job_item {
RUN *run;
JOB *job;
time_t runtime;
int Priority;
dlink link; /* link for list */
-};
+};
/* List of jobs to be run. They were scheduled in this hour or the next */
static dlist *jobs_to_run; /* list of jobs to be run */
if (first) {
first = false;
/* Create scheduled jobs list */
- jobs_to_run = new dlist(next_job, &next_job->link);
+ jobs_to_run = New(dlist(next_job, &next_job->link));
if (one_shot_job_to_run) { /* one shot */
job = (JOB *)GetResWithName(R_JOB, one_shot_job_to_run);
if (!job) {
dump_job(je, "Walk queue");
}
#endif
- /*
+ /*
* Pull the first job to run (already sorted by runtime and
* Priority, then wait around until it is time to run it.
*/
ASSERT(job);
set_jcr_defaults(jcr, job);
if (run->level) {
- jcr->JobLevel = run->level; /* override run level */
+ jcr->JobLevel = run->level; /* override run level */
}
if (run->pool) {
jcr->pool = run->pool; /* override pool */
}
if (run->full_pool) {
- jcr->pool = run->full_pool; /* override full pool */
+ jcr->full_pool = run->full_pool; /* override full pool */
}
if (run->inc_pool) {
- jcr->pool = run->inc_pool; /* override inc pool */
+ jcr->inc_pool = run->inc_pool; /* override inc pool */
}
if (run->dif_pool) {
- jcr->pool = run->dif_pool; /* override dif pool */
+ jcr->dif_pool = run->dif_pool; /* override dif pool */
}
if (run->storage) {
- jcr->store = run->storage; /* override storage */
+ set_storage(jcr, run->storage); /* override storage */
}
if (run->msgs) {
jcr->messages = run->msgs; /* override messages */
if (run->spool_data_set) {
jcr->spool_data = run->spool_data;
}
+ if (run->write_part_after_job_set) {
+ jcr->write_part_after_job = run->write_part_after_job;
+ }
Dmsg0(200, "Leave wait_for_next_job()\n");
return jcr;
}
/*
- * Shutdown the scheduler
+ * Shutdown the scheduler
*/
void term_scheduler()
{
}
}
-/*
+/*
* Find all jobs to be run this hour and the next hour.
*/
static void find_runs()
/* Items corresponding to above at the next hour */
int nh_hour, nh_mday, nh_wday, nh_month, nh_wom, nh_woy, nh_year;
- Dmsg0(200, "enter find_runs()\n");
+ Dmsg0(1200, "enter find_runs()\n");
+
-
/* compute values for time now */
now = time(NULL);
localtime_r(&now, &tm);
wom = mday / 7;
woy = tm_woy(now); /* get week of year */
- /*
+ /*
* Compute values for next hour from now.
* We do this to be sure we don't miss a job while
* sleeping.
*/
- next_hour = now + 3600;
+ next_hour = now + 3600;
localtime_r(&next_hour, &tm);
nh_hour = tm.tm_hour;
nh_mday = tm.tm_mday - 1;
if (sched == NULL) { /* scheduled? */
continue; /* no, skip this job */
}
- Dmsg1(200, "Got job: %s\n", job->hdr.name);
+ Dmsg1(1200, "Got job: %s\n", job->hdr.name);
for (run=sched->run; run; run=run->next) {
bool run_now, run_nh;
- /*
+ /*
* Find runs scheduled between now and the next hour.
*/
#ifdef xxxx
Dmsg0(000, "\n");
- Dmsg6(000, "run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
+ Dmsg6(000, "run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
hour, month, mday, wday, wom, woy);
- Dmsg6(000, "bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
+ Dmsg6(000, "bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
bit_is_set(hour, run->hour),
bit_is_set(month, run->month),
bit_is_set(mday, run->mday),
bit_is_set(wom, run->wom),
bit_is_set(woy, run->woy));
- Dmsg6(000, "nh_run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
+ Dmsg6(000, "nh_run h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
nh_hour, nh_month, nh_mday, nh_wday, nh_wom, nh_woy);
- Dmsg6(000, "nh_bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
+ Dmsg6(000, "nh_bitset bsh=%d bsm=%d bsmd=%d bswd=%d bswom=%d bswoy=%d\n",
bit_is_set(nh_hour, run->hour),
bit_is_set(nh_month, run->month),
bit_is_set(nh_mday, run->mday),
#endif
run_now = bit_is_set(hour, run->hour) &&
- bit_is_set(mday, run->mday) &&
+ 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);
run_nh = bit_is_set(nh_hour, run->hour) &&
- bit_is_set(nh_mday, run->mday) &&
+ bit_is_set(nh_mday, run->mday) &&
bit_is_set(nh_wday, run->wday) &&
bit_is_set(nh_month, run->month) &&
bit_is_set(nh_wom, run->wom) &&
bit_is_set(nh_woy, run->woy);
- Dmsg2(200, "run_now=%d run_nh=%d\n", run_now, run_nh);
+ Dmsg2(1200, "run_now=%d run_nh=%d\n", run_now, run_nh);
/* find time (time_t) job is to be run */
localtime_r(&now, &tm); /* reset tm structure */
runtime = mktime(&tm);
add_job(job, run, now, runtime);
}
- }
+ }
}
UnlockRes();
- Dmsg0(200, "Leave find_runs()\n");
+ Dmsg0(1200, "Leave find_runs()\n");
}
static void add_job(JOB *job, RUN *run, time_t now, time_t runtime)
if (((runtime - run->last_run) < 61) || ((runtime+59) < now)) {
#ifdef SCHED_DEBUG
char dt[50], dt1[50], dt2[50];
- bstrftime_nc(dt, sizeof(dt), runtime);
+ bstrftime_nc(dt, sizeof(dt), runtime);
bstrftime_nc(dt1, sizeof(dt1), run->last_run);
bstrftime_nc(dt2, sizeof(dt2), now);
- Dmsg4(000, "Drop: Job=\"%s\" run=%s. last_run=%s. now=%s\n", job->hdr.name,
+ Dmsg4(000, "Drop: Job=\"%s\" run=%s. last_run=%s. now=%s\n", job->hdr.name,
dt, dt1, dt2);
fflush(stdout);
#endif
/* Add this job to the wait queue in runtime, priority sorted order */
foreach_dlist(ji, jobs_to_run) {
- if (ji->runtime > je->runtime ||
+ if (ji->runtime > je->runtime ||
(ji->runtime == je->runtime && ji->Priority > je->Priority)) {
jobs_to_run->insert_before(je, ji);
dump_job(je, "Inserted job");
#endif
}
-static void dump_job(job_item *ji, const char *msg)
+static void dump_job(job_item *ji, const char *msg)
{
#ifdef SCHED_DEBUG
char dt[MAX_TIME_LENGTH];
if (debug_level < 200) {
return;
}
- bstrftime_nc(dt, sizeof(dt), ji->runtime);
- Dmsg4(200, "%s: Job=%s priority=%d run %s\n", msg, ji->job->hdr.name,
+ bstrftime_nc(dt, sizeof(dt), ji->runtime);
+ Dmsg4(200, "%s: Job=%s priority=%d run %s\n", msg, ji->job->hdr.name,
ji->Priority, dt);
fflush(stdout);
debug_level = save_debug;