Changeset 2248

Timestamp:

21/08/2008 11:54:01 (5 months ago)

Author:

chris

Message:

Handle sysadmin notifications and calculate next sync time in
BackupDaemon::RunSyncNow?, moved from RunSyncNowWithExceptionHandling?,
which just does the exception handling. We want to replace the exception
handling in Boxi, but not the other stuff.

Files:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (12 diffs)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -276 +276 @@
         {
                 BOX_WARNING(
-                                "==============================================================================\n"
-                                "SECURITY WARNING: This platform cannot check the credentials of connections to\n"
-                                "the command socket. This is a potential DoS security problem.\n"
-                                "Remove the CommandSocket directive from the bbackupd.conf file if bbackupctl\n"
-                                "is not used.\n"
-                                "==============================================================================\n"
+                        "==============================================================================\n"
+                        "SECURITY WARNING: This platform cannot check the credentials of connections to\n"
+                        "the command socket. This is a potential DoS security problem.\n"
+                        "Remove the CommandSocket directive from the bbackupd.conf file if bbackupctl\n"
+                        "is not used.\n"
+                        "==============================================================================\n"
                         );
         }
@@ -867 +867 @@
 void BackupDaemon::RunSyncNowWithExceptionHandling()
 {
-        // Touch a file to record times in filesystem
-        TouchFileInWorkingDir("last_sync_start");
-
-        // Tell anything connected to the command socket
-        SendSyncStartOrFinish(true /* start */);
-        
-        // Reset statistics on uploads
-        BackupStoreFile::ResetStats();
-        
-        // Delete the serialised store object file,
-        // so that we don't try to reload it after a
-        // partially completed backup
-        if(mDeleteStoreObjectInfoFile && 
-                !DeleteStoreObjectInfo())
-        {
-                BOX_ERROR("Failed to delete the "
-                        "StoreObjectInfoFile, backup cannot "
-                        "continue safely.");
-                THROW_EXCEPTION(ClientException, 
-                        FailedToDeleteStoreObjectInfoFile);
-        }
-
-        // In case the backup throws an exception,
-        // we should not try to delete the store info
-        // object file again.
-        mDeleteStoreObjectInfoFile = false;
-        
         // Do sync
         bool errorOccurred = false;
@@ -901 +874 @@
         try
         {
-                // Notify administrator
-                NotifySysadmin(NotifyEvent_BackupStart);
-
                 RunSyncNow();
-
-                // Errors reading any files?
-                if(mReadErrorsOnFilesystemObjects)
-                {
-                        // Notify administrator
-                        NotifySysadmin(NotifyEvent_ReadError);
-                }
-                else
-                {
-                        // Unset the read error flag, so the
-                        // error is reported again if it
-                        // happens again
-                        mNotificationsSent[NotifyEvent_ReadError] = false;
-                }
-                
-                // Check the storage limit
-                if(mStorageLimitExceeded)
-                {
-                        // Tell the sysadmin about this
-                        NotifySysadmin(NotifyEvent_StoreFull);
-                }
-                else
-                {
-                        // unflag the storage full notify flag
-                        // so that next time the store is full,
-                        // an alert will be sent
-                        mNotificationsSent[NotifyEvent_StoreFull] = false;
-                }
-                
-                // Calculate when the next sync run should be
-                mNextSyncTime = mCurrentSyncStartTime + 
-                        mUpdateStoreInterval + 
-                        Random::RandomInt(mUpdateStoreInterval >>
-                        SYNC_PERIOD_RANDOM_EXTRA_TIME_SHIFT_BY);
-        
-                // Notify administrator
-                NotifySysadmin(NotifyEvent_BackupFinish);
-
-                // --------------------------------------------------------------------------------------------
-
-                // We had a successful backup, save the store 
-                // info. If we save successfully, we must 
-                // delete the file next time we start a backup
-
-                mDeleteStoreObjectInfoFile = 
-                        SerializeStoreObjectInfo(mLastSyncTime,
-                                mNextSyncTime);
-
-                // --------------------------------------------------------------------------------------------
-
-                // If we were retrying after an error,
-                // now would be a good time to stop :-)
-                mDoSyncForcedByPreviousSyncError = false;
         }
         catch(BoxException &e)
@@ -1035 +952 @@
                         mNextSyncTime = mCurrentSyncStartTime + 
                                 SecondsToBoxTime(100) +
-                                Random::RandomInt(
-                                        mUpdateStoreInterval >> 
+                                Random::RandomInt(mUpdateStoreInterval >> 
                                         SYNC_PERIOD_RANDOM_EXTRA_TIME_SHIFT_BY);
-                        mDoSyncForcedByPreviousSyncError = true;
                 }
         }
@@ -1048 +963 @@
                 mNotificationsSent[NotifyEvent_BackupError] = false;
         }
+
+        // If we were retrying after an error,
+        // now would be a good time to stop :-)
+        mDoSyncForcedByPreviousSyncError = errorOccurred;
 
         // Log the stats
@@ -1067 +986 @@
 void BackupDaemon::RunSyncNow()
 {
+        // Touch a file to record times in filesystem
+        TouchFileInWorkingDir("last_sync_start");
+
+        // Tell anything connected to the command socket
+        SendSyncStartOrFinish(true /* start */);
+        
+        // Reset statistics on uploads
+        BackupStoreFile::ResetStats();
+        
+        // Delete the serialised store object file,
+        // so that we don't try to reload it after a
+        // partially completed backup
+        if(mDeleteStoreObjectInfoFile && 
+                !DeleteStoreObjectInfo())
+        {
+                BOX_ERROR("Failed to delete the "
+                        "StoreObjectInfoFile, backup cannot "
+                        "continue safely.");
+                THROW_EXCEPTION(ClientException, 
+                        FailedToDeleteStoreObjectInfoFile);
+        }
+
+        // In case the backup throws an exception,
+        // we should not try to delete the store info
+        // object file again.
+        mDeleteStoreObjectInfoFile = false;
+
+        // Notify administrator
+        NotifySysadmin(NotifyEvent_BackupStart);
+
         // Set state and log start
         SetState(State_Connected);
@@ -1299 +1248 @@
         // Log
         BOX_NOTICE("Finished scan of local files");
+
+        
+        // Errors reading any files?
+        if(mReadErrorsOnFilesystemObjects)
+        {
+                // Notify administrator
+                NotifySysadmin(NotifyEvent_ReadError);
+        }
+        else
+        {
+                // Unset the read error flag, so the
+                // error is reported again if it
+                // happens again
+                mNotificationsSent[NotifyEvent_ReadError] = false;
+        }
+        
+        // Check the storage limit
+        if(mStorageLimitExceeded)
+        {
+                // Tell the sysadmin about this
+                NotifySysadmin(NotifyEvent_StoreFull);
+        }
+        else
+        {
+                // unflag the storage full notify flag
+                // so that next time the store is full,
+                // an alert will be sent
+                mNotificationsSent[NotifyEvent_StoreFull] = false;
+        }
+        
+        // Calculate when the next sync run should be
+        mNextSyncTime = mCurrentSyncStartTime + 
+                mUpdateStoreInterval + 
+                Random::RandomInt(mUpdateStoreInterval >>
+                SYNC_PERIOD_RANDOM_EXTRA_TIME_SHIFT_BY);
+
+        // Notify administrator
+        NotifySysadmin(NotifyEvent_BackupFinish);
+
+        // --------------------------------------------------------------------------------------------
+
+        // We had a successful backup, save the store 
+        // info. If we save successfully, we must 
+        // delete the file next time we start a backup
+
+        mDeleteStoreObjectInfoFile = 
+                SerializeStoreObjectInfo(mLastSyncTime,
+                        mNextSyncTime);
+
+        // --------------------------------------------------------------------------------------------
 }
 
@@ -1850 +1849 @@
         // Then... go through each of the entries in the configuration,
         // making sure there's a directory created for it.
-        for(std::list<std::pair<std::string, Configuration> >::const_iterator i = rLocationsConf.mSubConfigurations.begin();
-                i != rLocationsConf.mSubConfigurations.end(); ++i)
-        {
-                BOX_TRACE("new location: " << i->first);
+        std::vector<std::string> locNames =
+                rLocationsConf.GetSubConfigurationNames();
+        
+        for(std::vector<std::string>::iterator
+                pLocName  = locNames.begin();
+                pLocName != locNames.end();
+                pLocName++)
+        {
+                const Configuration& rConfig(
+                        rLocationsConf.GetSubConfiguration(*pLocName));
+                BOX_TRACE("new location: " << *pLocName);
+                
                 // Create a record for it
                 std::auto_ptr<Location> apLoc(new Location);
@@ -1860 +1867 @@
                 {
                         // Setup names in the location record
-                        apLoc->mName = i->first;
-                        apLoc->mPath = i->second.GetKeyValue("Path");
+                        apLoc->mName = *pLocName;
+                        apLoc->mPath = rConfig.GetKeyValue("Path");
                         
                         // Read the exclude lists from the Configuration
-                        apLoc->mpExcludeFiles = BackupClientMakeExcludeList_Files(i->second);
-                        apLoc->mpExcludeDirs = BackupClientMakeExcludeList_Dirs(i->second);
+                        apLoc->mpExcludeFiles = BackupClientMakeExcludeList_Files(rConfig);
+                        apLoc->mpExcludeDirs = BackupClientMakeExcludeList_Dirs(rConfig);
 
                         // Does this exist on the server?
@@ -2012 +2019 @@
                         // Create and store the directory object for the root of this location
                         ASSERT(oid != 0);
-                        BackupClientDirectoryRecord *precord = new BackupClientDirectoryRecord(oid, i->first);
+                        BackupClientDirectoryRecord *precord =
+                                new BackupClientDirectoryRecord(oid, *pLocName);
                         apLoc->mpDirectoryRecord.reset(precord);
                         
@@ -2090 +2098 @@
 void BackupDaemon::SetupIDMapsForSync()
 {
-        // Need to do different things depending on whether it's an in memory implementation,
-        // or whether it's all stored on disc.
+        // Need to do different things depending on whether it's an
+        // in memory implementation, or whether it's all stored on disc.
         
 #ifdef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
@@ -2099 +2107 @@
         FillIDMapVector(mNewIDMaps, true /* new maps */);
 
-        // Then make sure that the current maps have objects, even if they are empty
-        // (for the very first run)
+        // Then make sure that the current maps have objects,
+        // even if they are empty (for the very first run)
         if(mCurrentIDMaps.empty())
         {