#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_CONSOLE 'U' /* console program */
#define JT_SYSTEM 'I' /* internal system "job" */
#define JT_ADMIN 'D' /* admin job */
#define JT_ARCHIVE 'A' /* Archive Job */
-#define JT_COPY 'C' /* Copy Job */
+#define JT_JOB_COPY 'C' /* Copy of a Job */
+#define JT_COPY 'c' /* Copy Job */
#define JT_MIGRATE 'g' /* Migration Job */
#define JT_SCAN 'S' /* Scan Job */
POOLMEM *VolumeName; /* Volume name desired -- pool_memory */
POOLMEM *errmsg; /* edited error message */
char Job[MAX_NAME_LENGTH]; /* Unique name of this Job */
- char event[MAX_NAME_LENGTH]; /* Current event */
+ char event[MAX_NAME_LENGTH]; /* Current event (python) */
+ uint32_t eventType; /* Current event type (plugin) */
+
uint32_t JobId; /* Director's JobId */
uint32_t VolSessionId;
uint32_t VolSessionTime;
uint32_t JobErrors; /* */
uint64_t JobBytes; /* Number of bytes processed this job */
uint64_t ReadBytes; /* Bytes read -- before compression */
+ FileId_t FileId; /* Last FileId used */
uint32_t Errors; /* Number of non-fatal errors */
volatile int32_t JobStatus; /* ready, running, blocked, terminated */
int32_t JobPriority; /* Job priority */
time_t start_time; /* when job actually started */
time_t run_time; /* used for computing speed */
time_t end_time; /* job end time */
- time_t wait_time; /* when job have started to wait */
+ time_t wait_time_sum; /* cumulative wait time since job start */
+ time_t wait_time; /* timestamp when job have started to wait */
POOLMEM *client_name; /* client name */
POOLMEM *RestoreBootstrap; /* Bootstrap file to restore */
POOLMEM *stime; /* start time for incremental/differential */
volatile int32_t FDJobStatus; /* File daemon Job Status */
uint32_t ExpectedFiles; /* Expected restore files */
uint32_t MediaId; /* DB record IDs associated with this job */
- FileId_t FileId; /* Last file id inserted */
uint32_t FileIndex; /* Last FileIndex processed */
POOLMEM *fname; /* name to put into catalog */
JOB_DBR jr; /* Job DB record for current job */
/* File Daemon specific part of JCR */
uint32_t num_files_examined; /* files examined this job */
POOLMEM *last_fname; /* last file saved/verified */
- POOLMEM *acl_text; /* text of ACL for backup */
+ POOLMEM *acl_data; /* data with ACLs for backup/restore */
+ uint32_t acl_data_len; /* length of acl data buffer */
+ POOLMEM *xattr_data; /* data with Extended Attributes for backup/restore */
+ uint32_t xattr_data_len; /* length of xattr_data buffer */
int32_t last_type; /* type of last file saved/verified */
int incremental; /* set if incremental for SINCE */
- time_t mtime; /* begin time for SINCE */
+ utime_t mtime; /* begin time for SINCE */
int listing; /* job listing in estimate */
long Ticket; /* Ticket */
char *big_buf; /* I/O buffer */
bool write_part_after_job; /* Set to write part after job */
bool PreferMountedVols; /* Prefer mounted vols rather than new */
bool need_fd; /* set if we need FD connection */
-
- uint32_t FileId; /* Last file id inserted */
/* Parmaters for Open Read Session */
BSR *bsr; /* Bootstrap record -- has everything */
uint32_t VolSessionTime;
uint32_t JobFiles;
uint64_t JobBytes;
- time_t start_time;
- time_t end_time;
+ utime_t start_time;
+ utime_t end_time;
char Job[MAX_NAME_LENGTH];
};
extern void free_jcr(JCR *jcr);
#endif
+/* Used to display specific job information after a fatal signal */
+typedef void (dbg_jcr_hook_t)(JCR *jcr, FILE *fp);
+extern void dbg_jcr_add_hook(dbg_jcr_hook_t *fct);
+
#endif /* __JCR_H_ */