From: Eric Bollengier Date: Wed, 7 Aug 2024 13:09:40 +0000 (+0200) Subject: Fix #11048 About LastBackedUpTo StorageGroup policy not correctly set X-Git-Tag: Release-15.0.3~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5baa3a82c8fb4f931b212c82a92bf46104d1293d;p=thirdparty%2Fbacula.git Fix #11048 About LastBackedUpTo StorageGroup policy not correctly set --- diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index 623769cc2..e30ff534a 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -1784,8 +1784,8 @@ static void init_store_manager(JCR *jcr, const char *policy, int64_t policy_thre Dmsg1(dbglvl_store_mngr, "Setting FreeSpace storage group policy for JobId: %d\n", jcr->JobId); jcr->store_mngr = New(FreeSpaceStore()); } else if (strcmp(policy, "LastBackedUpTo") == 0) { - Dmsg1(dbglvl_store_mngr, "Setting LastBackupedTo storage group policy for JobId: %d\n", jcr->JobId); - jcr->store_mngr = New(LastBackupedToStore()); + Dmsg1(dbglvl_store_mngr, "Setting LastBackedUpTo storage group policy for JobId: %d\n", jcr->JobId); + jcr->store_mngr = New(LastBackedUpToStore()); } else if (strcmp(policy, "FreeSpaceLeastUsed") == 0) { Dmsg1(dbglvl_store_mngr, "Setting FreeSpaceLeastUsed storage group policy for JobId: %d\n", jcr->JobId); jcr->store_mngr = New(FreeSpaceLeastUsedStore(policy_threshold)); diff --git a/bacula/src/dird/store_mngr.c b/bacula/src/dird/store_mngr.c index a294f9066..ceb3d6439 100644 --- a/bacula/src/dird/store_mngr.c +++ b/bacula/src/dird/store_mngr.c @@ -507,11 +507,11 @@ void LeastUsedStore::apply_read_policy(JCR*) { return apply_policy(false); } -void LastBackupedToStore::apply_policy(bool) { +void LastBackedUpToStore::apply_policy(bool) { /* Do nothing for now */ } -void LastBackupedToStore::apply_write_policy(JCR *jcr) +void LastBackedUpToStore::apply_write_policy(JCR *jcr) { if (jcr) { @@ -569,7 +569,7 @@ void LastBackupedToStore::apply_write_policy(JCR *jcr) } } -void LastBackupedToStore::apply_read_policy(JCR *) { +void LastBackedUpToStore::apply_read_policy(JCR *) { apply_policy(false); } diff --git a/bacula/src/dird/store_mngr.h b/bacula/src/dird/store_mngr.h index dfc6e0bb3..aaf78ab11 100644 --- a/bacula/src/dird/store_mngr.h +++ b/bacula/src/dird/store_mngr.h @@ -245,17 +245,17 @@ class ListedOrderStore : public StorageManager { } }; -class LastBackupedToStore : public StorageManager { +class LastBackedUpToStore : public StorageManager { private: void apply_policy(bool write_store); public: void apply_write_policy(JCR* jcr); void apply_read_policy(JCR* jcr); - LastBackupedToStore() : StorageManager("LastBackupedTo") { + LastBackedUpToStore() : StorageManager("LastBackedUpTo") { } - ~LastBackupedToStore() { + ~LastBackedUpToStore() { } }; diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c index 859f27078..b8c406c8e 100644 --- a/bacula/src/lib/parse_conf.c +++ b/bacula/src/lib/parse_conf.c @@ -1018,7 +1018,7 @@ static char const *storage_mngmt_policy[] = { "LeastUsed", "ListedOrder", "FreeSpace", - "LastBackupedTo", + "LastBackedUpTo", "FreeSpaceLeastUsed", NULL };