#define JT_CONSOLE 'C' /* console program */
#define JT_SYSTEM 'S' /* internal system "job" */
#define JT_ADMIN 'D' /* admin job */
-#define JT_ARCHIVE 'A'
+#define JT_ARCHIVE 'A' /* Archive Job */
+#define JT_COPY 'Y' /* Copy Job */
+#define JT_MIGRATION 'M' /* Migration Job */
/* Job Status. Some of these are stored in the DB */
#define JS_Created 'C' /* created but not yet running */
JCR_free_HANDLER *daemon_free_jcr; /* Local free routine */
dlist *msg_queue; /* Queued messages */
alist job_end_push; /* Job end pushed calls */
- int reload_id; /* SIGHUP reload table id */
bool dequeuing; /* dequeuing messages */
+ POOLMEM *VolumeName; /* Volume name desired -- pool_memory */
POOLMEM *errmsg; /* edited error message */
char Job[MAX_NAME_LENGTH]; /* Unique name of this Job */
uint32_t JobId; /* Director's JobId */
int JobType; /* backup, restore, verify ... */
int JobLevel; /* Job level */
int JobPriority; /* Job priority */
- int authenticated; /* set when client authenticated */
time_t sched_time; /* job schedule time, i.e. when it should start */
time_t start_time; /* when job actually started */
time_t run_time; /* used for computing speed */
time_t end_time; /* job end time */
- POOLMEM *VolumeName; /* Volume name desired -- pool_memory */
POOLMEM *client_name; /* client name */
POOLMEM *RestoreBootstrap; /* Bootstrap file to restore */
char *sd_auth_key; /* SD auth key */
MSGS *jcr_msgs; /* Copy of message resource -- actually used */
uint32_t ClientId; /* Client associated with Job */
char *where; /* prefix to restore files to */
- bool prefix_links; /* Prefix links with Where path */
- bool gui; /* set if gui using console */
int cached_pnl; /* cached path length */
POOLMEM *cached_path; /* cached path */
+ bool prefix_links; /* Prefix links with Where path */
+ bool gui; /* set if gui using console */
+ bool authenticated; /* set when client authenticated */
/* Daemon specific part of JCR */
/* This should be empty in the library */
#ifdef DIRECTOR_DAEMON
+#define MAX_STORE 2
/* Director Daemon specific part of JCR */
pthread_t SD_msg_chan; /* Message channel thread id */
pthread_cond_t term_wait; /* Wait for job termination */
volatile bool sd_msg_thread_done; /* Set when Storage message thread terms */
BSOCK *ua; /* User agent */
JOB *job; /* Job resource */
- STORE *store; /* Storage resource */
+ alist *storage[MAX_STORE]; /* Storage possibilities */
+ STORE *store; /* Storage daemon selected */
CLIENT *client; /* Client resource */
POOL *pool; /* Pool resource */
POOL *full_pool; /* Full backup pool resource */
uint32_t SDErrors; /* Number of non-fatal errors */
volatile int SDJobStatus; /* Storage Job Status */
volatile int FDJobStatus; /* File daemon Job Status */
+ uint32_t ExpectedFiles; /* Expected restore files */
B_DB *db; /* database pointer */
uint32_t MediaId; /* DB record IDs associated with this job */
uint32_t PoolId; /* Pool record id */
FileId_t FileId; /* Last file id inserted */
uint32_t FileIndex; /* Last FileIndex processed */
POOLMEM *fname; /* name to put into catalog */
- int fn_printed; /* printed filename */
POOLMEM *stime; /* start time for incremental/differential */
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 */
- bool acquired_resource_locks; /* set if resource locks acquired */
+ int saveMaxConcurrentJobs; /* save for restore jobs */
int NumVols; /* Number of Volume used in pool */
int reschedule_count; /* Number of times rescheduled */
+ bool spool_data; /* Spool data in SD */
+ bool acquired_resource_locks; /* set if resource locks acquired */
+ bool term_wait_inited; /* Set when cond var inited */
+ bool fn_printed; /* printed filename */
#endif /* DIRECTOR_DAEMON */
pthread_t heartbeat_id; /* id of heartbeat thread */
volatile BSOCK *hb_bsock; /* duped SD socket */
POOLMEM *RunAfterJob; /* Command to run after job */
+ DIRRES* director; /* Director resource */
#endif /* FILE_DAEMON */
JCR *prev_dev; /* previous JCR attached to device */
pthread_cond_t job_start_wait; /* Wait for FD to start Job */
int type;
- DEVRES *device; /* device to use */
- VOLUME_CAT_INFO VolCatInfo; /* Catalog info for desired volume */
+ DCR *dcr; /* device context record */
+ DEVRES *device; /* device resource to use */
POOLMEM *job_name; /* base Job name (not unique) */
POOLMEM *fileset_name; /* FileSet */
POOLMEM *fileset_md5; /* MD5 for FileSet */
- POOLMEM *pool_name; /* pool to use */
- POOLMEM *pool_type; /* pool type to use */
- POOLMEM *media_type; /* media type */
- POOLMEM *dev_name; /* device name */
VOL_LIST *VolList; /* list to read */
int32_t NumVolumes; /* number of volumes used */
int32_t CurVolume; /* current volume number */
- int spool_attributes; /* set if spooling attributes */
- int no_attributes; /* set if no attributes wanted */
- int label_status; /* device volume label status */
int label_errors; /* count of label errors */
- int session_opened;
- DEV_RECORD rec; /* Read/Write record */
+ bool session_opened;
long Ticket; /* ticket for this job */
- uint32_t VolFirstIndex; /* First file index this Volume */
- uint32_t VolLastIndex; /* Last file index this Volume */
- uint32_t FileIndex; /* Current File Index */
- uint32_t EndFile; /* End file written */
- uint32_t StartFile; /* Start write file */
- uint32_t StartBlock; /* Start write block */
- 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 */
bool ignore_label_errors; /* ignore Volume label errors */
+ bool spool_attributes; /* set if spooling attributes */
+ bool no_attributes; /* set if no attributes wanted */
+ bool spool_data; /* set to spool data */
int CurVol; /* Current Volume count */
-
+ DIRRES* director; /* Director resource */
+
uint32_t FileId; /* Last file id inserted */
/* Parmaters for Open Read Session */
*/
struct s_last_job {
dlink link;
- int xNumJobs; /* no longer used */
+ int Errors; /* FD/SD errors */
int JobType;
int JobStatus;
int JobLevel;
extern JCR *get_jcr_by_partial_name(char *Job);
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);
+
+#ifdef TRACE_JCR_CHAIN
+extern void b_lock_jcr_chain(const char *filen, int line);
+extern void b_unlock_jcr_chain(const char *filen, int line);
+#define lock_jcr_chain() b_lock_jcr_chain(__FILE__, __LINE__);
+#define unlock_jcr_chain() b_unlock_jcr_chain(__FILE__, __LINE__);
+#else
extern void lock_jcr_chain();
extern void unlock_jcr_chain();
-extern void set_jcr_job_status(JCR *jcr, int JobStatus);
+#endif
#ifdef DEBUG
extern void b_free_jcr(const char *file, int line, JCR *jcr);