Changeset 1863

Timestamp:

09/10/2007 00:23:59 (15 months ago)

Author:

chris

Message:

Allow configuration of the time to delete redundant store locations.

Location:

box/trunk

Files:

• bin/bbackupd/BackupDaemon.cpp (modified) (4 diffs)
• bin/bbackupd/BackupDaemon.h (modified) (1 diff)
• lib/backupclient/BackupDaemonConfigVerify.cpp (modified) (1 diff)
• lib/backupclient/BackupStoreConstants.h (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -877 +877 @@
                                                 conf.GetKeyValueInt(
                                                         "MaxFileTimeInFuture"));
+                                mDeleteRedundantLocationsAfter =
+                                        conf.GetKeyValueInt(
+                                                "DeleteRedundantLocationsAfter");
 
                                 clientContext.SetMaximumDiffingTime(maximumDiffingTime);
@@ -1660 +1663 @@
                 i != rLocationsConf.mSubConfigurations.end(); ++i)
         {
-                BOX_TRACE("new location");
+                BOX_TRACE("new location: " << i->first);
                 // Create a record for it
                 Location *ploc = new Location;
@@ -1822 +1825 @@
                 catch (std::exception &e)
                 {
-                        delete ploc;
-                        ploc = 0;
                         BOX_ERROR("Failed to configure location '"
                                 << ploc->mName << "' path '"
                                 << ploc->mPath << "': " << e.what() <<
                                 ": please check for previous errors");
+                        delete ploc;
+                        ploc = 0;
                         throw;
                 }
@@ -1858 +1861 @@
                 {
                         mDeleteUnusedRootDirEntriesAfter = now + 
-                                SecondsToBoxTime(
-                                BACKUP_DELETE_UNUSED_ROOT_ENTRIES_AFTER);
+                                SecondsToBoxTime(mDeleteRedundantLocationsAfter);
                 }
 

box/trunk/bin/bbackupd/BackupDaemon.h

@@ -159 +159 @@
         std::vector<BackupClientInodeToIDMap *> mNewIDMaps;
         
+        int mDeleteRedundantLocationsAfter;
+
         // For the command socket
         class CommandSocketInfo

box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

@@ -78 +78 @@
 
         {"MaximumDiffingTime", 0, ConfigTest_IsInt, 0},
+        {"DeleteRedundantLocationsAfter", "172800", ConfigTest_IsInt, 0},
 
         {"FileTrackingSizeThreshold", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},

box/trunk/lib/backupclient/BackupStoreConstants.h

@@ -41 +41 @@
 #define BACKUP_FILE_DIFF_MAX_BLOCK_FIND_MULTIPLE        4096
 
-// How many seconds to wait before deleting unused root directory entries?
-#ifndef NDEBUG
-        // Debug: 30 seconds (easier to test)
-        #define BACKUP_DELETE_UNUSED_ROOT_ENTRIES_AFTER         30
-#else
-        // Release: 2 days (plenty of time for sysadmins to notice, or change their mind)
-        #define BACKUP_DELETE_UNUSED_ROOT_ENTRIES_AFTER         172800
-#endif
-
 #endif // BACKUPSTORECONSTANTS__H