Fix #11048 About LastBackedUpTo StorageGroup policy not correctly set

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 623769cc2d97ebd6db32f2c7fba31735921f72fa..e30ff534ab1aa0df0b7f01bd817a97e7fd103dd5 100644 (file)
--- 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 a294f9066bb442bf9a41050f3d4d3035bc60e85d..ceb3d6439409179b222160a12e484790b7699d9f 100644 (file)
--- 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 dfc6e0bb31f59332e530fca3315a39a36ed77048..aaf78ab11e1b1e4035190c986036d16a2f650c10 100644 (file)
--- 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 859f270780d990870a88af1e9b092af41fb91ea5..b8c406c8eafb91d1cde36dc913c07e3df05bb248 100644 (file)
--- 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
 };