Changeset 2828 for box/trunk/lib

Timestamp:

08/01/2011 21:33:19 (17 months ago)

Author:

chris

Message:

Log the path, name and size of files being restored at TRACE level for
users wanting more detailed restore output.

Disable printing dots when logging at TRACE level is enabled.

Warn rather than failing to restore when the file attributes could not
be restored. (merges [2745], [2827]).

Location:

box/trunk/lib/backupclient

Files:

• BackupClientFileAttributes.cpp (modified) (1 diff)
• BackupClientRestore.cpp (modified) (6 diffs)
• BackupClientRestore.h (modified) (1 diff)
• BackupStoreFile.cpp (modified) (1 diff)

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -844 +844 @@
                 if(::utimes(Filename, times) != 0)
                 {
-                        BOX_LOG_SYS_ERROR("Failed to change times of "
-                                "file '" << Filename << "'");
-                        THROW_EXCEPTION(CommonException, OSFileError)
+                        BOX_LOG_SYS_WARNING("Failed to change times of "
+                                "file '" << Filename << "' to ctime=" <<
+                                BOX_FORMAT_TIMESPEC(times[0]) << ", mtime=" << 
+                                BOX_FORMAT_TIMESPEC(times[1]));
                 }
         }

box/trunk/lib/backupclient/BackupClientRestore.cpp

@@ -212 +212 @@
 // --------------------------------------------------------------------------
 static int BackupClientRestoreDir(BackupProtocolClient &rConnection,
-        int64_t DirectoryID, std::string &rLocalDirectoryName,
+        int64_t DirectoryID, const std::string &rRemoteDirectoryName,
+        const std::string &rLocalDirectoryName,
         RestoreParams &Params, RestoreResumeInfo &rLevel)
 {
@@ -224 +225 @@
                         rLevel.mNextLevelLocalName);
                 BackupClientRestoreDir(rConnection, rLevel.mNextLevelID,
-                        localDirname, Params, *rLevel.mpNextLevel);
+                        rRemoteDirectoryName + '/' + 
+                        rLevel.mNextLevelLocalName, localDirname,
+                        Params, *rLevel.mpNextLevel);
                 
                 // Add it to the list of done itmes
@@ -527 +530 @@
                                 }
                                 
+                                BOX_TRACE("Restoring file: " <<
+                                        rRemoteDirectoryName + '/' + 
+                                        nm.GetClearFilename() << " (" <<
+                                        en->GetSizeInBlocks() << " blocks)");
+
                                 // Request it from the store
                                 rConnection.QueryGetFile(DirectoryID,
@@ -740 +748 @@
                                 
                                 // Recurse
+
+                                BOX_TRACE("Entering directory: " <<
+                                        rRemoteDirectoryName + '/' + 
+                                        nm.GetClearFilename());
+
                                 int result = BackupClientRestoreDir(
                                         rConnection, en->GetObjectID(), 
-                                        localDirname, Params, rnextLevel);
+                                        rRemoteDirectoryName + '/' + 
+                                        nm.GetClearFilename(), localDirname,
+                                        Params, rnextLevel);
 
                                 if (result != Restore_Complete)
@@ -825 +840 @@
 // --------------------------------------------------------------------------
 int BackupClientRestore(BackupProtocolClient &rConnection,
-        int64_t DirectoryID, const char *LocalDirectoryName,
-        bool PrintDots, bool RestoreDeleted,
+        int64_t DirectoryID, const char *RemoteDirectoryName,
+        const char *LocalDirectoryName, bool PrintDots, bool RestoreDeleted,
         bool UndeleteAfterRestoreDeleted, bool Resume,
         bool ContinueAfterErrors)
@@ -873 +888 @@
         
         // Restore the directory
-        std::string localName(LocalDirectoryName);
         int result = BackupClientRestoreDir(rConnection, DirectoryID, 
-                localName, params, params.mResumeInfo);
+                RemoteDirectoryName, LocalDirectoryName, params,
+                params.mResumeInfo);
         if (result != Restore_Complete)
         {

box/trunk/lib/backupclient/BackupClientRestore.h

@@ -25 +25 @@
 int BackupClientRestore(BackupProtocolClient &rConnection,
         int64_t DirectoryID,
+        const char *RemoteDirectoryName,
         const char *LocalDirectoryName,
         bool PrintDots = false,

box/trunk/lib/backupclient/BackupStoreFile.cpp

@@ -315 +315 @@
                 
                 // Write the attributes
-                stream->GetAttributes().WriteAttributes(DecodedFilename);
+                try
+                {
+                        stream->GetAttributes().WriteAttributes(DecodedFilename);
+                }
+                catch (std::exception& e)
+                {
+                        BOX_WARNING("Failed to restore attributes on " <<
+                                DecodedFilename << ": " << e.what());
+                }
         }
         catch(...)