X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fjcr.h;h=85e8e98923530af0e678bbd94050185553fbd8cb;hb=7503a438c87931cf1748bd0fda3bb932e2af3346;hp=9b267a4235d6aeecd5a0ce3915ae963fde447377;hpb=4ff2b2ba893d4035fa46a8e3d783f403f190610a;p=bacula%2Fbacula diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h index 9b267a4235..85e8e98923 100644 --- a/bacula/src/jcr.h +++ b/bacula/src/jcr.h @@ -10,7 +10,7 @@ */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ MA 02111-1307, USA. */ - + #ifndef __JCR_H_ #define __JCR_H_ 1 @@ -51,9 +51,12 @@ #define JT_VERIFY 'V' /* Verify Job */ #define JT_RESTORE 'R' /* Restore Job */ #define JT_CONSOLE 'C' /* console program */ -#define JT_SYSTEM 'S' /* internal system "job" */ +#define JT_SYSTEM 'I' /* 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 */ +#define JT_SCAN 'S' /* Scan Job */ /* Job Status. Some of these are stored in the DB */ #define JS_Created 'C' /* created but not yet running */ @@ -82,8 +85,10 @@ jcr->JobStatus == JS_FatalError) #define foreach_jcr(jcr) \ - for ((jcr)=NULL; ((jcr)=get_next_jcr(jcr)); ) + for ((jcr)=NULL; ((jcr)=get_next_jcr(jcr)); ) +#define SD_APPEND 1 +#define SD_READ 0 struct JCR; @@ -104,6 +109,7 @@ struct JCR { dlist *msg_queue; /* Queued messages */ alist job_end_push; /* Job end pushed calls */ 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 */ @@ -114,7 +120,7 @@ struct JCR { uint64_t JobBytes; /* Number of bytes processed this job */ uint64_t ReadBytes; /* Bytes read -- before compression */ uint32_t Errors; /* Number of non-fatal errors */ - volatile int JobStatus; /* ready, running, blocked, terminated */ + volatile int JobStatus; /* ready, running, blocked, terminated */ int JobType; /* backup, restore, verify ... */ int JobLevel; /* Job level */ int JobPriority; /* Job priority */ @@ -122,9 +128,9 @@ struct JCR { 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 */ + POOLMEM *stime; /* start time for incremental/differential */ char *sd_auth_key; /* SD auth key */ MSGS *jcr_msgs; /* Copy of message resource -- actually used */ uint32_t ClientId; /* Client associated with Job */ @@ -146,7 +152,9 @@ struct JCR { volatile bool sd_msg_thread_done; /* Set when Storage message thread terms */ BSOCK *ua; /* User agent */ JOB *job; /* Job resource */ - STORE *store; /* Storage resource */ + JOB *verify_job; /* Job resource of verify target job */ + alist *storage; /* Storage possibilities */ + STORE *store; /* Storage daemon selected */ CLIENT *client; /* Client resource */ POOL *pool; /* Pool resource */ POOL *full_pool; /* Full backup pool resource */ @@ -167,19 +175,22 @@ struct JCR { FileId_t FileId; /* Last file id inserted */ uint32_t FileIndex; /* Last FileIndex processed */ POOLMEM *fname; /* name to put into catalog */ - POOLMEM *stime; /* start time for incremental/differential */ JOB_DBR jr; /* Job DB record for current job */ - JOB_DBR *verify_jr; /* Pointer to target job */ + JOB_DBR target_jr; /* target job */ + char FSCreateTime[MAX_TIME_LENGTH]; /* FileSet CreateTime as returned from DB */ + char since[MAX_TIME_LENGTH]; /* since time */ uint32_t RestoreJobId; /* Id specified by UA */ - POOLMEM *client_uname; /* client uname */ + POOLMEM *client_uname; /* client uname */ int replace; /* Replace option */ - 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 */ + bool write_part_after_job; /* Write part after job in SD */ + bool needs_sd; /* set if SD needed by Job */ + bool cloned; /* set if cloned */ #endif /* DIRECTOR_DAEMON */ @@ -187,6 +198,7 @@ struct JCR { /* 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 */ /*********FIXME********* add missing files and files to be retried */ int incremental; /* set if incremental for SINCE */ time_t mtime; /* begin time for SINCE */ @@ -206,6 +218,7 @@ struct JCR { 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 */ @@ -216,19 +229,14 @@ struct JCR { pthread_cond_t job_start_wait; /* Wait for FD to start Job */ int type; DCR *dcr; /* device context record */ - DEVRES *device; /* device resource to use */ - VOLUME_CAT_INFO VolCatInfo; /* Catalog info for desired volume */ + alist *dcrs; /* list of dcrs open */ +// 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 label_status; /* device volume label status */ int label_errors; /* count of label errors */ bool session_opened; long Ticket; /* ticket for this job */ @@ -237,7 +245,9 @@ struct JCR { bool no_attributes; /* set if no attributes wanted */ bool spool_data; /* set to spool data */ int CurVol; /* Current Volume count */ - + DIRRES* director; /* Director resource */ + bool write_part_after_job; /* Set to write part after job */ + uint32_t FileId; /* Last file id inserted */ /* Parmaters for Open Read Session */ @@ -251,11 +261,11 @@ struct JCR { #endif /* STORAGE_DAEMON */ -}; +}; -/* +/* * Structure for all daemons that keeps some summary * info on the last job run. */ @@ -275,7 +285,7 @@ struct s_last_job { char Job[MAX_NAME_LENGTH]; }; -extern struct s_last_job last_job; +extern struct s_last_job last_job; extern dlist *last_jobs;