/* Job Types. These are stored in the DB */
#define JT_BACKUP 'B' /* Backup Job */
+#define JT_MIGRATED_JOB 'M' /* A previous backup job that was migrated */
#define JT_VERIFY 'V' /* Verify Job */
#define JT_RESTORE 'R' /* Restore Job */
#define JT_CONSOLE 'c' /* console program */
#define JT_ADMIN 'D' /* admin job */
#define JT_ARCHIVE 'A' /* Archive Job */
#define JT_COPY 'C' /* Copy Job */
-#define JT_MIGRATE 'M' /* Migration Job */
+#define JT_MIGRATE 'g' /* Migration Job */
#define JT_SCAN 'S' /* Scan Job */
/* Job Status. Some of these are stored in the DB */
pthread_mutex_t mutex; /* jcr mutex */
volatile int _use_count; /* use count */
public:
- void inc_use_count(void) {P(mutex); _use_count++; V(mutex); };
- void dec_use_count(void) {P(mutex); _use_count--; V(mutex); };
+ void lock() {P(mutex); };
+ void unlock() {V(mutex); };
+ void inc_use_count(void) {lock(); _use_count++; unlock(); };
+ void dec_use_count(void) {lock(); _use_count--; unlock(); };
int use_count() { return _use_count; };
void init_mutex(void) {pthread_mutex_init(&mutex, NULL); };
void destroy_mutex(void) {pthread_mutex_destroy(&mutex); };
- void lock() {P(mutex); };
- void unlock() {V(mutex); };
bool is_job_canceled() {return job_canceled(this); };
/* Global part of JCR common to all daemons */
BSOCK *ua; /* User agent */
JOB *job; /* Job resource */
JOB *verify_job; /* Job resource of verify previous job */
- alist *storage; /* Storage possibilities */
- STORE *store; /* Storage daemon selected */
+ alist *rstorage; /* Read storage possibilities */
+ STORE *rstore; /* Selected read storage */
+ alist *wstorage; /* Write storage possibilities */
+ STORE *wstore; /* Selected write storage */
CLIENT *client; /* Client resource */
POOL *pool; /* Pool resource */
POOL *full_pool; /* Full backup pool resource */
POOL *inc_pool; /* Incremental backup pool resource */
- POOL *dif_pool; /* Differential backup pool resource */
+ POOL *diff_pool; /* Differential backup pool resource */
+ bool run_pool_override;
+ bool run_full_pool_override;
+ bool run_inc_pool_override;
+ bool run_diff_pool_override;
FILESET *fileset; /* FileSet resource */
CAT *catalog; /* Catalog resource */
MSGS *messages; /* Default message handler */
JOB_DBR jr; /* Job DB record for current job */
JOB_DBR previous_jr; /* previous job database record */
JOB *previous_job; /* Job resource of migration previous job */
- JCR *previous_jcr; /* previous job control record */
+ JCR *mig_jcr; /* JCR for migration/copy job */
char FSCreateTime[MAX_TIME_LENGTH]; /* FileSet CreateTime as returned from DB */
char since[MAX_TIME_LENGTH]; /* since time */
union {
JobId_t MigrateJobId;
};
POOLMEM *client_uname; /* client uname */
+ POOLMEM *pool_source; /* Where pool came from */
+ POOLMEM *storage_source; /* Where storage came from */
int replace; /* Replace option */
int NumVols; /* Number of Volume used in pool */
int reschedule_count; /* Number of times rescheduled */
uint32_t num_files_examined; /* files examined this job */
POOLMEM *last_fname; /* last file saved/verified */
POOLMEM *acl_text; /* text of ACL for backup */
+ int last_type; /* type of last file saved/verified */
/*********FIXME********* add missing files and files to be retried */
int incremental; /* set if incremental for SINCE */
time_t mtime; /* begin time for SINCE */
char *big_buf; /* I/O buffer */
POOLMEM *compress_buf; /* Compression buffer */
int32_t compress_buf_size; /* Length of compression buffer */
+ void *pZLIB_compress_workset; /* zlib compression session data */
int replace; /* Replace options */
int buf_size; /* length of buffer */
FF_PKT *ff; /* Find Files packet */
pthread_t heartbeat_id; /* id of heartbeat thread */
volatile BSOCK *hb_bsock; /* duped SD socket */
volatile BSOCK *hb_dir_bsock; /* duped DIR socket */
- POOLMEM *RunAfterJob; /* Command to run after job */
+ alist *RunScripts; /* Commands to run before and after job */
bool pki_sign; /* Enable PKI Signatures? */
bool pki_encrypt; /* Enable PKI Encryption? */
DIGEST *digest; /* Last file's digest context */
alist *pki_signers; /* Trusted Signers */
alist *pki_recipients; /* Trusted Recipients */
CRYPTO_SESSION *pki_session; /* PKE Public Keys + Symmetric Session Keys */
- void *pki_session_encoded; /* Cached DER-encoded copy of pki_session */
- size_t pki_session_encoded_size; /* Size of DER-encoded pki_session */
+ uint8_t *pki_session_encoded; /* Cached DER-encoded copy of pki_session */
+ int32_t pki_session_encoded_size; /* Size of DER-encoded pki_session */
POOLMEM *crypto_buf; /* Encryption/Decryption buffer */
DIRRES* director; /* Director resource */
#endif /* FILE_DAEMON */
};
-
-
/*
* Structure for all daemons that keeps some summary
* info on the last job run.
};
extern struct s_last_job last_job;
-extern dlist *last_jobs;
+extern dlist * DLL_IMP_EXP last_jobs;
/* The following routines are found in lib/jcr.c */
extern JCR *get_jcr_by_full_name(char *Job);
extern JCR *get_next_jcr(JCR *jcr);
extern void set_jcr_job_status(JCR *jcr, int JobStatus);
+extern int DLL_IMP_EXP num_jobs_run;
#ifdef DEBUG
extern void b_free_jcr(const char *file, int line, JCR *jcr);
projects / bacula / bacula / blobdiff