const int dbglvl = 3400;
-/*
- * Setting a NULL in tsd doesn't clear the tsd but instead tells
- * pthreads not to call the tsd destructor. Consequently, we
- * define this *invalid* jcr address and stuff it in the tsd
- * when the jcr is no longer valid.
- */
-#define INVALID_JCR ((JCR *)(-1))
-
/* External variables we reference */
extern time_t watchdog_time;
void term_last_jobs_list()
{
if (last_jobs) {
+ lock_last_jobs_list();
while (!last_jobs->empty()) {
void *je = last_jobs->first();
last_jobs->remove(je);
}
delete last_jobs;
last_jobs = NULL;
+ unlock_last_jobs_list();
}
if (jcrs) {
delete jcrs;
{
struct s_last_job *je, job;
uint32_t num;
+ bool ok = true;
Dmsg1(100, "read_last_jobs seek to %d\n", (int)addr);
- if (addr == 0 || lseek(fd, (off_t)addr, SEEK_SET) < 0) {
+ if (addr == 0 || lseek(fd, (boffset_t)addr, SEEK_SET) < 0) {
return false;
}
if (read(fd, &num, sizeof(num)) != sizeof(num)) {
if (num > 4 * max_last_jobs) { /* sanity check */
return false;
}
+ lock_last_jobs_list();
for ( ; num; num--) {
if (read(fd, &job, sizeof(job)) != sizeof(job)) {
berrno be;
Pmsg1(000, "Read job entry. ERR=%s\n", be.bstrerror());
- return false;
+ ok = false;
+ break;
}
if (job.JobId > 0) {
je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
}
}
}
- return true;
+ unlock_last_jobs_list();
+ return ok;
}
uint64_t write_last_jobs_list(int fd, uint64_t addr)
{
struct s_last_job *je;
uint32_t num;
+ ssize_t stat;
Dmsg1(100, "write_last_jobs seek to %d\n", (int)addr);
- if (lseek(fd, (off_t)addr, SEEK_SET) < 0) {
+ if (lseek(fd, (boffset_t)addr, SEEK_SET) < 0) {
return 0;
}
if (last_jobs) {
+ lock_last_jobs_list();
/* First record is number of entires */
num = last_jobs->size();
if (write(fd, &num, sizeof(num)) != sizeof(num)) {
berrno be;
Pmsg1(000, "Error writing num_items: ERR=%s\n", be.bstrerror());
- return 0;
+ goto bail_out;
}
foreach_dlist(je, last_jobs) {
if (write(fd, je, sizeof(struct s_last_job)) != sizeof(struct s_last_job)) {
berrno be;
Pmsg1(000, "Error writing job: ERR=%s\n", be.bstrerror());
- return 0;
+ goto bail_out;
}
}
+ unlock_last_jobs_list();
}
/* Return current address */
- ssize_t stat = lseek(fd, 0, SEEK_CUR);
+ stat = lseek(fd, 0, SEEK_CUR);
if (stat < 0) {
stat = 0;
}
return stat;
+bail_out:
+ unlock_last_jobs_list();
+ return 0;
}
void lock_last_jobs_list()
V(last_jobs_mutex);
}
+/* Get an ASCII representation of the Operation being performed as an english Noun */
+const char *JCR::get_OperationName()
+{
+ switch(m_JobType) {
+ case JT_BACKUP:
+ return _("Backup");
+ case JT_VERIFY:
+ return _("Verifying");
+ case JT_RESTORE:
+ return _("Restoring");
+ case JT_ARCHIVE:
+ return _("Archiving");
+ case JT_COPY:
+ return _("Copying");
+ case JT_MIGRATE:
+ return _("Migration");
+ case JT_SCAN:
+ return _("Scanning");
+ default:
+ return _("Unknown operation");
+ }
+}
+
+/* Get an ASCII representation of the Action being performed either an english Verb or Adjective */
+const char *JCR::get_ActionName(bool past)
+{
+ switch(m_JobType) {
+ case JT_BACKUP:
+ return _("backup");
+ case JT_VERIFY:
+ return (past == true) ? _("verified") : _("verify");
+ case JT_RESTORE:
+ return (past == true) ? _("restored") : _("restore");
+ case JT_ARCHIVE:
+ return (past == true) ? _("archived") : _("archive");
+ case JT_COPY:
+ return (past == true) ? _("copied") : _("copy");
+ case JT_MIGRATE:
+ return (past == true) ? _("migrated") : _("migrate");
+ case JT_SCAN:
+ return (past == true) ? _("scanned") : _("scan");
+ default:
+ return _("unknown action");
+ }
+}
+
/* Set Job type in JCR and also set appropriate read flag */
void JCR::set_JobType(int32_t JobType)
{
case JT_ADMIN:
/* Keep list of last jobs, but not Console where JobId==0 */
if (jcr->JobId > 0) {
+ lock_last_jobs_list();
num_jobs_run++;
je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
memset(je, 0, sizeof(struct s_last_job)); /* zero in case unset fields */
last_jobs->remove(je);
free(je);
}
+ unlock_last_jobs_list();
}
break;
default:
void set_jcr_job_status(JCR *jcr, int JobStatus)
{
- bool set_waittime=false;
+ bool set_waittime = false;
+ int oldJobStatus = jcr->JobStatus;
+
Dmsg2(800, "set_jcr_job_status(%s, %c)\n", jcr->Job, JobStatus);
/* if wait state is new, we keep current time for watchdog MaxWaitTime */
switch (JobStatus) {
jcr->wait_time = time(NULL);
}
}
- Dmsg3(200, "jid=%u leave set_jcr_job_status=%c set=%c\n", (uint32_t)jcr->JobId,
- jcr->JobStatus, JobStatus);
+ if (oldJobStatus != jcr->JobStatus) {
+ Dmsg3(200, "jid=%u leave set_old_job_status=%c new_set=%c\n", (uint32_t)jcr->JobId,
+ oldJobStatus, JobStatus);
+// generate_plugin_event(jcr, bEventStatusChange, NULL);
+ }
}
#ifdef TRACE_JCR_CHAIN
projects / bacula / bacula / blobdiff