Changeset 1872

Timestamp:

17/10/2007 13:44:49 (4 years ago)

Author:

chris

Message:

Don't abort if one of the location paths doesn't exist, just print a
warning
and continue.

Use an auto_ptr to avoid memory leaks when setting up a location fails.

(merges [1828])

File:

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

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -1665 +1665 @@
                 BOX_TRACE("new location: " << i->first);
                 // Create a record for it
-                Location *ploc = new Location;
+                std::auto_ptr<Location> apLoc(new Location);
+
                 try
                 {
                         // Setup names in the location record
-                        ploc->mName = i->first;
-                        ploc->mPath = i->second.GetKeyValue("Path");
+                        apLoc->mName = i->first;
+                        apLoc->mPath = i->second.GetKeyValue("Path");
                         
                         // Read the exclude lists from the Configuration
-                        ploc->mpExcludeFiles = BackupClientMakeExcludeList_Files(i->second);
-                        ploc->mpExcludeDirs = BackupClientMakeExcludeList_Dirs(i->second);
+                        apLoc->mpExcludeFiles = BackupClientMakeExcludeList_Files(i->second);
+                        apLoc->mpExcludeDirs = BackupClientMakeExcludeList_Dirs(i->second);
+
                         // Does this exist on the server?
                         // Remove from dir object early, so that if we fail
@@ -1680 +1682 @@
                         // consider to remote one for deletion.
                         BackupStoreDirectory::Iterator iter(dir);
-                        BackupStoreFilenameClear dirname(ploc->mName);  // generate the filename
+                        BackupStoreFilenameClear dirname(apLoc->mName); // generate the filename
                         BackupStoreDirectory::Entry *en = iter.FindMatchingClearName(dirname);
                         int64_t oid = 0;
@@ -1700 +1702 @@
 #ifdef HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 struct statvfs s;
-                                if(::statvfs(ploc->mPath.c_str(), &s) != 0)
+                                if(::statvfs(apLoc->mPath.c_str(), &s) != 0)
 #else // HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 struct statfs s;
-                                if(::statfs(ploc->mPath.c_str(), &s) != 0)
+                                if(::statfs(apLoc->mPath.c_str(), &s) != 0)
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 {
-                                        BOX_WARNING("Failed to stat location: "
-                                                << ploc->mPath 
-                                                << ": " << strerror(errno));
-                                        THROW_EXCEPTION(CommonException,
-                                                OSFileError)
+                                        BOX_WARNING("Failed to stat location "
+                                                "path '" << apLoc->mPath <<
+                                                "' (" << strerror(errno) <<
+                                                "), skipping location '" <<
+                                                apLoc->mName << "'");
+                                        continue;
                                 }
 
@@ -1719 +1722 @@
 
                                 // Warn in logs if the directory isn't absolute
-                                if(ploc->mPath[0] != '/')
+                                if(apLoc->mPath[0] != '/')
                                 {
                                         BOX_WARNING("Location path '"
-                                                << ploc->mPath 
+                                                << apLoc->mPath 
                                                 << "' is not absolute");
                                 }
@@ -1737 +1740 @@
                                                 // (sorting order ensures this)
                                                 BOX_TRACE("checking against mount point " << *i);
-                                                if(::strncmp(i->c_str(), ploc->mPath.c_str(), i->size()) == 0)
+                                                if(::strncmp(i->c_str(), apLoc->mPath.c_str(), i->size()) == 0)
                                                 {
                                                         // Match
@@ -1745 +1748 @@
                                         }
                                         BOX_TRACE("mount point chosen for "
-                                                << ploc->mPath << " is "
+                                                << apLoc->mPath << " is "
                                                 << mountName);
                                 }
@@ -1756 +1759 @@
                                 {
                                         // Yes -- store the index
-                                        ploc->mIDMapIndex = f->second;
+                                        apLoc->mIDMapIndex = f->second;
                                 }
                                 else
                                 {
                                         // No -- new index
-                                        ploc->mIDMapIndex = numIDMaps;
+                                        apLoc->mIDMapIndex = numIDMaps;
                                         mounts[mountName] = numIDMaps;
                                         
@@ -1781 +1784 @@
                                 try
                                 {
-                                        attr.ReadAttributes(ploc->mPath.c_str(), 
+                                        attr.ReadAttributes(apLoc->mPath.c_str(), 
                                                 true /* directories have zero mod times */,
                                                 0 /* not interested in mod time */, 
@@ -1789 +1792 @@
                                 {
                                         BOX_ERROR("Failed to get attributes "
-                                                "for path '" << ploc->mPath
-                                                << "', skipping.");
+                                                "for path '" << apLoc->mPath
+                                                << "', skipping location '" <<
+                                                apLoc->mName << "'");
                                         continue;
                                 }
@@ -1798 +1802 @@
                                 {
                                         MemBlockStream attrStream(attr);
-                                        std::auto_ptr<BackupProtocolClientSuccess> dirCreate(connection.QueryCreateDirectory(
+                                        std::auto_ptr<BackupProtocolClientSuccess>
+                                                dirCreate(connection.QueryCreateDirectory(
                                                 BackupProtocolClientListDirectory::RootDirectory,
                                                 attrModTime, dirname, attrStream));
@@ -1808 +1813 @@
                                 {
                                         BOX_ERROR("Failed to create remote "
-                                                "directory '/" << ploc->mName <<
-                                                "', skipping location.");
+                                                "directory '/" << apLoc->mName <<
+                                                "', skipping location '" <<
+                                                apLoc->mName << "'");
                                         continue;
                                 }
@@ -1818 +1824 @@
                         ASSERT(oid != 0);
                         BackupClientDirectoryRecord *precord = new BackupClientDirectoryRecord(oid, i->first);
-                        ploc->mpDirectoryRecord.reset(precord);
+                        apLoc->mpDirectoryRecord.reset(precord);
                         
                         // Push it back on the vector of locations
-                        mLocations.push_back(ploc);
+                        mLocations.push_back(apLoc.release());
                 }
                 catch (std::exception &e)
                 {
                         BOX_ERROR("Failed to configure location '"
-                                << ploc->mName << "' path '"
-                                << ploc->mPath << "': " << e.what() <<
+                                << apLoc->mName << "' path '"
+                                << apLoc->mPath << "': " << e.what() <<
                                 ": please check for previous errors");
-                        delete ploc;
-                        ploc = 0;
                         throw;
                 }
@@ -1836 +1840 @@
                 {
                         BOX_ERROR("Failed to configure location '"
-                                << ploc->mName << "' path '"
-                                << ploc->mPath << "': please check for "
+                                << apLoc->mName << "' path '"
+                                << apLoc->mPath << "': please check for "
                                 "previous errors");
-
-                        delete ploc;
-                        ploc = NULL;
-
                         throw;
                 }