X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fcats%2Fsql_update.c;h=6696b8f3090ca6788fc2a7983ff6395c90dd39d0;hb=46fff475fa9a502814fe1befa465e84305920eeb;hp=e008a609139cdc75f7d3265cb5f8c253408a2463;hpb=c9405726e3fb0fbe2478a361d31fa3d12794a4b3;p=bacula%2Fbacula diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c index e008a60913..6696b8f309 100644 --- a/bacula/src/cats/sql_update.c +++ b/bacula/src/cats/sql_update.c @@ -1,34 +1,45 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version three of the GNU Affero General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of Kern Sibbald. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * Bacula Catalog Database Update record interface routines * * Kern Sibbald, March 2000 * - * Version $Id$ + * Version $Id: sql_update.c 8478 2009-02-18 20:11:55Z kerns $ */ -/* - Copyright (C) 2000-2006 Kern Sibbald - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - the file LICENSE for additional details. - - */ +#include "bacula.h" -/* The following is necessary so that we do not include - * the dummy external definition of DB. - */ -#define __SQL_C /* indicate that this is sql.c */ +#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI -#include "bacula.h" #include "cats.h" - -#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL +#include "bdb_priv.h" +#include "sql_glue.h" /* ----------------------------------------------------------------------- * @@ -37,10 +48,6 @@ * ----------------------------------------------------------------------- */ -/* Imported subroutines */ -extern void print_result(B_DB *mdb); -extern int UpdateDB(const char *file, int line, JCR *jcr, B_DB *db, char *update_cmd); - /* ----------------------------------------------------------------------- * * Generic Routines (or almost generic) @@ -64,7 +71,7 @@ db_add_digest_to_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, char *digest, } /* Mark the file record as being visited during database - * verify compare. Stuff JobId into MarkedId field + * verify compare. Stuff JobId into the MarkId field */ int db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId) { @@ -93,22 +100,23 @@ db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) struct tm tm; btime_t JobTDate; int stat; - char ed1[50], ed2[50], ed3[50], ed4[50]; + char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50]; stime = jr->StartTime; - localtime_r(&stime, &tm); - strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm); + (void)localtime_r(&stime, &tm); + strftime(dt, sizeof(dt), "%Y-%m-%d %H:%M:%S", &tm); JobTDate = (btime_t)stime; db_lock(mdb); Mmsg(mdb->cmd, "UPDATE Job SET JobStatus='%c',Level='%c',StartTime='%s'," -"ClientId=%s,JobTDate=%s,PoolId=%s WHERE JobId=%s", +"ClientId=%s,JobTDate=%s,PoolId=%s,FileSetId=%s WHERE JobId=%s", (char)(jcr->JobStatus), (char)(jr->JobLevel), dt, edit_int64(jr->ClientId, ed1), edit_uint64(JobTDate, ed2), - edit_int64(jr->JobId, ed3), - edit_int64(jr->PoolId, ed4)); + edit_int64(jr->PoolId, ed3), + edit_int64(jr->FileSetId, ed4), + edit_int64(jr->JobId, ed5)); stat = UPDATE_DB(jcr, mdb, mdb->cmd); mdb->changes = 0; @@ -117,14 +125,20 @@ db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) } /* - * Given an incoming integer, set the string buffer to either NULL or the value - * + * Update Long term statistics with all jobs that were run before + * age seconds */ -static void edit_num_or_null(char *s, size_t n, uint64_t id) { - char ed1[50]; - bsnprintf(s, n, id ? "%s" : "NULL", edit_int64(id, ed1)); -} +int +db_update_stats(JCR *jcr, B_DB *mdb, utime_t age) +{ + char ed1[30]; + utime_t now = (utime_t)time(NULL); + edit_uint64(now - age, ed1); + Mmsg(mdb->cmd, fill_jobhisto, ed1); + QUERY_DB(jcr, mdb, mdb->cmd); /* TODO: get a message ? */ + return sql_affected_rows(mdb); +} /* * Update the Job record at end of Job @@ -136,42 +150,52 @@ int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) { char dt[MAX_TIME_LENGTH]; + char rdt[MAX_TIME_LENGTH]; time_t ttime; struct tm tm; int stat; - char ed1[30], ed2[30], ed3[50]; + char ed1[30], ed2[30], ed3[50], ed4[50]; btime_t JobTDate; - char PoolId [50]; - char FileSetId [50]; - char ClientId [50]; - + char PriorJobId[50]; - /* some values are set to zero, which translates to NULL in SQL */ - edit_num_or_null(PoolId, sizeof(PoolId), jr->PoolId); - edit_num_or_null(FileSetId, sizeof(FileSetId), jr->FileSetId); - edit_num_or_null(ClientId, sizeof(ClientId), jr->ClientId); + if (jr->PriorJobId) { + bstrncpy(PriorJobId, edit_int64(jr->PriorJobId, ed1), sizeof(PriorJobId)); + } else { + bstrncpy(PriorJobId, "0", sizeof(PriorJobId)); + } ttime = jr->EndTime; - localtime_r(&ttime, &tm); - strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm); + (void)localtime_r(&ttime, &tm); + strftime(dt, sizeof(dt), "%Y-%m-%d %H:%M:%S", &tm); + + if (jr->RealEndTime == 0) { + jr->RealEndTime = jr->EndTime; + } + ttime = jr->RealEndTime; + (void)localtime_r(&ttime, &tm); + strftime(rdt, sizeof(rdt), "%Y-%m-%d %H:%M:%S", &tm); + JobTDate = ttime; db_lock(mdb); Mmsg(mdb->cmd, - "UPDATE Job SET JobStatus='%c', EndTime='%s', " -"ClientId=%s, JobBytes=%s, JobFiles=%u, JobErrors=%u, VolSessionId=%u, " -"VolSessionTime=%u, PoolId=%s, FileSetId=%s, JobTDate=%s WHERE JobId=%s", - (char)(jr->JobStatus), dt, ClientId, edit_uint64(jr->JobBytes, ed1), + "UPDATE Job SET JobStatus='%c',EndTime='%s'," +"ClientId=%u,JobBytes=%s,ReadBytes=%s,JobFiles=%u,JobErrors=%u,VolSessionId=%u," +"VolSessionTime=%u,PoolId=%u,FileSetId=%u,JobTDate=%s," +"RealEndTime='%s',PriorJobId=%s,HasBase=%u,PurgedFiles=%u WHERE JobId=%s", + (char)(jr->JobStatus), dt, jr->ClientId, edit_uint64(jr->JobBytes, ed1), + edit_uint64(jr->ReadBytes, ed4), jr->JobFiles, jr->JobErrors, jr->VolSessionId, jr->VolSessionTime, - PoolId, FileSetId, edit_uint64(JobTDate, ed2), + jr->PoolId, jr->FileSetId, edit_uint64(JobTDate, ed2), + rdt, PriorJobId, jr->HasBase, jr->PurgedFiles, edit_int64(jr->JobId, ed3)); stat = UPDATE_DB(jcr, mdb, mdb->cmd); + db_unlock(mdb); return stat; } - /* * Update Client record * Returns: 0 on failure @@ -215,7 +239,7 @@ int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr) db_lock(mdb); Mmsg(mdb->cmd, -"UPDATE Counters SET MinValue=%d,MaxValue=%d,CurrentValue=%d," +"UPDATE Counters SET \"MinValue\"=%d,\"MaxValue\"=%d,CurrentValue=%d," "WrapCounter='%s' WHERE Counter='%s'", cr->MinValue, cr->MaxValue, cr->CurrentValue, cr->WrapCounter, cr->Counter); @@ -226,11 +250,10 @@ int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr) } -int -db_update_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr) +int db_update_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr) { int stat; - char ed1[50], ed2[50], ed3[50], ed4[50]; + char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50], ed6[50]; db_lock(mdb); Mmsg(mdb->cmd, "SELECT count(*) from Media WHERE PoolId=%s", @@ -242,16 +265,18 @@ db_update_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr) "UPDATE Pool SET NumVols=%u,MaxVols=%u,UseOnce=%d,UseCatalog=%d," "AcceptAnyVolume=%d,VolRetention='%s',VolUseDuration='%s'," "MaxVolJobs=%u,MaxVolFiles=%u,MaxVolBytes=%s,Recycle=%d," -"AutoPrune=%d,LabelType=%d,LabelFormat='%s' WHERE PoolId=%s", +"AutoPrune=%d,LabelType=%d,LabelFormat='%s',RecyclePoolId=%s," +"ScratchPoolId=%s,ActionOnPurge=%d WHERE PoolId=%s", pr->NumVols, pr->MaxVols, pr->UseOnce, pr->UseCatalog, pr->AcceptAnyVolume, edit_uint64(pr->VolRetention, ed1), edit_uint64(pr->VolUseDuration, ed2), pr->MaxVolJobs, pr->MaxVolFiles, edit_uint64(pr->MaxVolBytes, ed3), pr->Recycle, pr->AutoPrune, pr->LabelType, - pr->LabelFormat, + pr->LabelFormat, edit_int64(pr->RecyclePoolId,ed5), + edit_int64(pr->ScratchPoolId,ed6), + pr->ActionOnPurge, ed4); - stat = UPDATE_DB(jcr, mdb, mdb->cmd); db_unlock(mdb); return stat; @@ -262,7 +287,6 @@ db_update_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *sr) { int stat; char ed1[50]; - db_lock(mdb); Mmsg(mdb->cmd, "UPDATE Storage SET AutoChanger=%d WHERE StorageId=%s", sr->AutoChanger, edit_int64(sr->StorageId, ed1)); @@ -286,8 +310,9 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) time_t ttime; struct tm tm; int stat; - char ed1[50], ed2[50], ed3[50], ed4[50]; - char ed5[50], ed6[50], ed7[50], ed8[50]; + char ed1[50], ed2[50], ed3[50], ed4[50]; + char ed5[50], ed6[50], ed7[50], ed8[50]; + char ed9[50], ed10[50], ed11[50]; Dmsg1(100, "update_media: FirstWritten=%d\n", mr->FirstWritten); @@ -295,8 +320,8 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) if (mr->set_first_written) { Dmsg1(400, "Set FirstWritten Vol=%s\n", mr->VolumeName); ttime = mr->FirstWritten; - localtime_r(&ttime, &tm); - strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm); + (void)localtime_r(&ttime, &tm); + strftime(dt, sizeof(dt), "%Y-%m-%d %H:%M:%S", &tm); Mmsg(mdb->cmd, "UPDATE Media SET FirstWritten='%s'" " WHERE VolumeName='%s'", dt, mr->VolumeName); stat = UPDATE_DB(jcr, mdb, mdb->cmd); @@ -309,8 +334,8 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) if (ttime == 0) { ttime = time(NULL); } - localtime_r(&ttime, &tm); - strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm); + (void)localtime_r(&ttime, &tm); + strftime(dt, sizeof(dt), "%Y-%m-%d %H:%M:%S", &tm); Mmsg(mdb->cmd, "UPDATE Media SET LabelDate='%s' " "WHERE VolumeName='%s'", dt, mr->VolumeName); UPDATE_DB(jcr, mdb, mdb->cmd); @@ -318,26 +343,35 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) if (mr->LastWritten != 0) { ttime = mr->LastWritten; - localtime_r(&ttime, &tm); - strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm); + (void)localtime_r(&ttime, &tm); + strftime(dt, sizeof(dt), "%Y-%m-%d %H:%M:%S", &tm); Mmsg(mdb->cmd, "UPDATE Media Set LastWritten='%s' " "WHERE VolumeName='%s'", dt, mr->VolumeName); UPDATE_DB(jcr, mdb, mdb->cmd); } + /* sanity checks for #1066 */ + if (mr->VolReadTime < 0) { + mr->VolReadTime = 0; + } + if (mr->VolWriteTime < 0) { + mr->VolWriteTime = 0; + } + Mmsg(mdb->cmd, "UPDATE Media SET VolJobs=%u," "VolFiles=%u,VolBlocks=%u,VolBytes=%s,VolMounts=%u,VolErrors=%u," "VolWrites=%u,MaxVolBytes=%s,VolStatus='%s'," "Slot=%d,InChanger=%d,VolReadTime=%s,VolWriteTime=%s,VolParts=%d," "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s," - "MaxVolJobs=%d,MaxVolFiles=%d" + "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s," + "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,ActionOnPurge=%d" " WHERE VolumeName='%s'", mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1), mr->VolMounts, mr->VolErrors, mr->VolWrites, edit_uint64(mr->MaxVolBytes, ed2), mr->VolStatus, mr->Slot, mr->InChanger, - edit_uint64(mr->VolReadTime, ed3), - edit_uint64(mr->VolWriteTime, ed4), + edit_int64(mr->VolReadTime, ed3), + edit_int64(mr->VolWriteTime, ed4), mr->VolParts, mr->LabelType, edit_int64(mr->StorageId, ed5), @@ -345,6 +379,10 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) edit_uint64(mr->VolRetention, ed7), edit_uint64(mr->VolUseDuration, ed8), mr->MaxVolJobs, mr->MaxVolFiles, + mr->Enabled, edit_uint64(mr->LocationId, ed9), + edit_uint64(mr->ScratchPoolId, ed10), + edit_uint64(mr->RecyclePoolId, ed11), + mr->RecycleCount,mr->Recycle, mr->ActionOnPurge, mr->VolumeName); Dmsg1(400, "%s\n", mdb->cmd); @@ -368,30 +406,32 @@ int db_update_media_defaults(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) { int stat; - char ed1[50], ed2[50], ed3[50], ed4[50]; + char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50]; db_lock(mdb); if (mr->VolumeName[0]) { Mmsg(mdb->cmd, "UPDATE Media SET " - "Recycle=%d,VolRetention=%s,VolUseDuration=%s," - "MaxVolJobs=%u,MaxVolFiles=%u,MaxVolBytes=%s" + "ActionOnPurge=%d, Recycle=%d,VolRetention=%s,VolUseDuration=%s," + "MaxVolJobs=%u,MaxVolFiles=%u,MaxVolBytes=%s,RecyclePoolId=%s" " WHERE VolumeName='%s'", - mr->Recycle,edit_uint64(mr->VolRetention, ed1), + mr->ActionOnPurge, mr->Recycle,edit_uint64(mr->VolRetention, ed1), edit_uint64(mr->VolUseDuration, ed2), mr->MaxVolJobs, mr->MaxVolFiles, edit_uint64(mr->MaxVolBytes, ed3), + edit_uint64(mr->RecyclePoolId, ed4), mr->VolumeName); } else { Mmsg(mdb->cmd, "UPDATE Media SET " - "Recycle=%d,VolRetention=%s,VolUseDuration=%s," - "MaxVolJobs=%u,MaxVolFiles=%u,MaxVolBytes=%s" + "ActionOnPurge=%d, Recycle=%d,VolRetention=%s,VolUseDuration=%s," + "MaxVolJobs=%u,MaxVolFiles=%u,MaxVolBytes=%s,RecyclePoolId=%s" " WHERE PoolId=%s", - mr->Recycle,edit_uint64(mr->VolRetention, ed1), + mr->ActionOnPurge, mr->Recycle,edit_uint64(mr->VolRetention, ed1), edit_uint64(mr->VolUseDuration, ed2), mr->MaxVolJobs, mr->MaxVolFiles, edit_uint64(mr->MaxVolBytes, ed3), - edit_int64(mr->PoolId, ed4)); + edit_int64(mr->RecyclePoolId, ed4), + edit_int64(mr->PoolId, ed5)); } Dmsg1(400, "%s\n", mdb->cmd); @@ -413,23 +453,29 @@ void db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) { char ed1[50], ed2[50]; - if (mr->InChanger != 0 && mr->Slot != 0) { - Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE " - "Slot=%d AND StorageId=%s AND MediaId!=%s", - mr->Slot, - edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2)); - Dmsg1(400, "%s\n", mdb->cmd); - UPDATE_DB(jcr, mdb, mdb->cmd); + if (mr->InChanger != 0 && mr->Slot != 0 && mr->StorageId != 0) { + + if (mr->MediaId != 0) { + Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0, Slot=0 WHERE " + "Slot=%d AND StorageId=%s AND MediaId!=%s", + mr->Slot, + edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2)); + + } else if (*mr->VolumeName) { + Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0, Slot=0 WHERE " + "Slot=%d AND StorageId=%s AND VolumeName!='%s'", + mr->Slot, + edit_int64(mr->StorageId, ed1), mr->VolumeName); + + } else { /* used by ua_label to reset all volume with this slot */ + Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0, Slot=0 WHERE " + "Slot=%d AND StorageId=%s", + mr->Slot, + edit_int64(mr->StorageId, ed1), mr->VolumeName); + } + Dmsg1(100, "%s\n", mdb->cmd); + UPDATE_DB(jcr, mdb, mdb->cmd); } } -#else - -void -db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) -{ - /* DUMMY func for Bacula_DB */ - return; -} - -#endif /* HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL*/ +#endif /* HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI */