Changeset 2181 for box/trunk/bin/bbackupd/BackupClientDeleteList.cpp

Timestamp:

28/05/2008 16:24:05 (4 years ago)

Author:

chris

Message:

Track and log file deletions by name.

Split crypto init and file sync process into its own method, to reduce
call depth and facilitate calling in process from tests.

Differentiate between 3 uses of stat in BackupClientDirectoryRecord? by
renaming the structures.

Use stat instead of lstat when checking the filesystem that's holding an
entity, in case it's a symbolic link to a different filesystem.

File:

• box/trunk/bin/bbackupd/BackupClientDeleteList.cpp (modified) (8 diffs)

box/trunk/bin/bbackupd/BackupClientDeleteList.cpp

@@ -43 +43 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Function
-//              Name:    BackupClientDeleteList::AddDirectoryDelete(int64_t)
+BackupClientDeleteList::FileToDelete::FileToDelete(int64_t DirectoryID,
+        const BackupStoreFilename& rFilename,
+        const std::string& rLocalPath)
+: mDirectoryID(DirectoryID),
+  mFilename(rFilename),
+  mLocalPath(rLocalPath)
+{ }
+
+BackupClientDeleteList::DirToDelete::DirToDelete(int64_t ObjectID,
+        const std::string& rLocalPath)
+: mObjectID(ObjectID),
+  mLocalPath(rLocalPath)
+{ }
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    BackupClientDeleteList::AddDirectoryDelete(int64_t,
+//                       const BackupStoreFilename&)
 //              Purpose: Add a directory to the list of directories to be deleted.
 //              Created: 10/11/03
 //
 // --------------------------------------------------------------------------
-void BackupClientDeleteList::AddDirectoryDelete(int64_t ObjectID)
+void BackupClientDeleteList::AddDirectoryDelete(int64_t ObjectID,
+        const std::string& rLocalPath)
 {
         // Only add the delete to the list if it's not in the "no delete" set
-        if(mDirectoryNoDeleteList.find(ObjectID) == mDirectoryNoDeleteList.end())
+        if(mDirectoryNoDeleteList.find(ObjectID) ==
+                mDirectoryNoDeleteList.end())
         {
                 // Not in the list, so should delete it
-                mDirectoryList.push_back(ObjectID);
-        }
-}
-
-
-// --------------------------------------------------------------------------
-//
-// Function
-//              Name:    BackupClientDeleteList::AddFileDelete(int64_t, BackupStoreFilenameClear &)
+                mDirectoryList.push_back(DirToDelete(ObjectID, rLocalPath));
+        }
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    BackupClientDeleteList::AddFileDelete(int64_t,
+//                       const BackupStoreFilename &)
 //              Purpose: 
 //              Created: 10/11/03
 //
 // --------------------------------------------------------------------------
-void BackupClientDeleteList::AddFileDelete(int64_t DirectoryID, const BackupStoreFilename &rFilename)
+void BackupClientDeleteList::AddFileDelete(int64_t DirectoryID,
+        const BackupStoreFilename &rFilename, const std::string& rLocalPath)
 {
         // Try to find it in the no delete list
-        std::vector<std::pair<int64_t, BackupStoreFilename> >::iterator delEntry(mFileNoDeleteList.begin());
+        std::vector<std::pair<int64_t, BackupStoreFilename> >::iterator
+                delEntry(mFileNoDeleteList.begin());
         while(delEntry != mFileNoDeleteList.end())
         {
-                if((delEntry)->first == DirectoryID && (delEntry)->second == rFilename)
+                if((delEntry)->first == DirectoryID 
+                        && (delEntry)->second == rFilename)
                 {
                         // Found!
@@ -87 +108 @@
         if(delEntry == mFileNoDeleteList.end())
         {
-                mFileList.push_back(std::pair<int64_t, BackupStoreFilename>(DirectoryID, rFilename));
+                mFileList.push_back(FileToDelete(DirectoryID, rFilename,
+                        rLocalPath));
         }
 }
@@ -114 +136 @@
         
         // Do the deletes
-        for(std::vector<int64_t>::iterator i(mDirectoryList.begin()); i != mDirectoryList.end(); ++i)
-        {
-                connection.QueryDeleteDirectory(*i);
+        for(std::vector<DirToDelete>::iterator i(mDirectoryList.begin());
+                i != mDirectoryList.end(); ++i)
+        {
+                connection.QueryDeleteDirectory(i->mObjectID);
+                rContext.GetProgressNotifier().NotifyDirectoryDeleted(
+                        i->mObjectID, i->mLocalPath);
         }
         
@@ -123 +148 @@
         
         // Delete the files
-        for(std::vector<std::pair<int64_t, BackupStoreFilename> >::iterator i(mFileList.begin()); i != mFileList.end(); ++i)
-        {
-                connection.QueryDeleteFile(i->first, i->second);
+        for(std::vector<FileToDelete>::iterator i(mFileList.begin());
+                i != mFileList.end(); ++i)
+        {
+                connection.QueryDeleteFile(i->mDirectoryID, i->mFilename);
+                rContext.GetProgressNotifier().NotifyFileDeleted(
+                        i->mDirectoryID, i->mLocalPath);
         }
 }
@@ -141 +169 @@
 {
         // First of all, is it in the delete vector?
-        std::vector<int64_t>::iterator delEntry(std::find(mDirectoryList.begin(), mDirectoryList.end(), ObjectID));
+        std::vector<DirToDelete>::iterator delEntry(mDirectoryList.begin());
+        for(; delEntry != mDirectoryList.end(); delEntry++)
+        {
+                if(delEntry->mObjectID == ObjectID)
+                {
+                        // Found!
+                        break;
+                }
+        }
         if(delEntry != mDirectoryList.end())
         {
@@ -149 +185 @@
         else
         {
-                // Haven't been asked to delete it yet, put it in the no delete list
+                // Haven't been asked to delete it yet, put it in the
+                // no delete list
                 mDirectoryNoDeleteList.insert(ObjectID);
         }
@@ -163 +200 @@
 //
 // --------------------------------------------------------------------------
-void BackupClientDeleteList::StopFileDeletion(int64_t DirectoryID, const BackupStoreFilename &rFilename)
+void BackupClientDeleteList::StopFileDeletion(int64_t DirectoryID,
+        const BackupStoreFilename &rFilename)
 {
         // Find this in the delete list
-        std::vector<std::pair<int64_t, BackupStoreFilename> >::iterator delEntry(mFileList.begin());
+        std::vector<FileToDelete>::iterator delEntry(mFileList.begin());
         while(delEntry != mFileList.end())
         {
-                if((delEntry)->first == DirectoryID && (delEntry)->second == rFilename)
+                if(delEntry->mDirectoryID == DirectoryID
+                        && delEntry->mFilename == rFilename)
                 {
                         // Found!
@@ -187 +226 @@
                 mFileNoDeleteList.push_back(std::pair<int64_t, BackupStoreFilename>(DirectoryID, rFilename));
         }
-
-}
-
-
-
-
-
+}
+