#define L_VERIFY_CATALOG 'C' /* verify from catalog */
#define L_VERIFY_INIT 'V' /* verify save (init DB) */
#define L_VERIFY_VOLUME_TO_CATALOG 'O' /* verify Volume to catalog entries */
+#define L_VERIFY_DISK_TO_CATALOG 'd' /* verify Disk attributes to catalog */
#define L_VERIFY_DATA 'A' /* verify data on volume */
#define L_BASE 'B' /* Base level job */
+#define L_NONE ' ' /* None, for Restore and Admin */
/* Job Types. These are stored in the DB */
#define JS_WaitClientRes 'c' /* Waiting for Client resource */
#define JS_WaitMaxJobs 'd' /* Waiting for maximum jobs */
#define JS_WaitStartTime 't' /* Waiting for start time */
+#define JS_WaitPriority 'p' /* Waiting for higher priority jobs to finish */
#define job_canceled(jcr) \
(jcr->JobStatus == JS_Canceled || \
POOLMEM *fname; /* name to put into catalog */
int fn_printed; /* printed filename */
POOLMEM *stime; /* start time for incremental/differential */
- JOB_DBR jr; /* Job record in Database */
+ JOB_DBR jr; /* Job DB record for current job */
+ JOB_DBR *verify_jr; /* Pointer to target job */
uint32_t RestoreJobId; /* Id specified by UA */
POOLMEM *client_uname; /* client uname */
int replace; /* Replace option */
int mtime_only; /* compare only mtime and not ctime as well */
int listing; /* job listing in estimate */
long Ticket; /* Ticket */
- int save_level; /* save level */
char *big_buf; /* I/O buffer */
POOLMEM *compress_buf; /* Compression buffer */
int32_t compress_buf_size; /* Length of compression buffer */
uint32_t EndBlock;
pthread_t heartbeat_id; /* id of heartbeat thread */
volatile BSOCK *hb_bsock; /* duped SD socket */
+ POOLMEM *RunAfterJob; /* Command to run after job */
#endif /* FILE_DAEMON */
uint32_t EndBlock; /* Ending block written */
bool NewVol; /* set when new Volume mounted */
bool WroteVol; /* set when Volume written */
+ bool NewFile; /* set when EOF written */
int CurVol; /* Current Volume count */
uint32_t FileId; /* Last file id inserted */
* info on the last job run.
*/
struct s_last_job {
+ dlink link;
int NumJobs;
int JobType;
int JobStatus;
+ int JobLevel;
uint32_t JobId;
uint32_t VolSessionId;
uint32_t VolSessionTime;
char Job[MAX_NAME_LENGTH];
};
-extern struct s_last_job last_job;
+extern struct s_last_job last_job;
+extern dlist *last_jobs;
/* The following routines are found in lib/jcr.c */