Changeset 2907 for box/trunk/bin

Timestamp:

09/04/2011 21:12:55 (14 months ago)

Author:

chris

Message:

Actually try to back up from the VSS snapshot volume.

Clean up VSS resources at end of backup.

Location:

box/trunk/bin/bbackupd

Files:

• BackupDaemon.cpp (modified) (8 diffs)
• BackupDaemon.h (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -982 +982 @@
 
                 // Sync the directory
+                std::string locationPath = (*i)->mPath;
+#ifdef ENABLE_VSS
+                if((*i)->mIsSnapshotCreated)
+                {
+                        locationPath = (*i)->mSnapshotPath;
+                }
+#endif
+
                 (*i)->mpDirectoryRecord->SyncDirectory(
                         params,
                         BackupProtocolClientListDirectory::RootDirectory,
-                        (*i)->mPath, std::string("/") + (*i)->mName);
+                        locationPath, std::string("/") + (*i)->mName);
 
                 // Unset exclude lists (just in case)
@@ -998 +1006 @@
         // Close any open connection
         clientContext.CloseAnyOpenConnection();
-        
+
+#ifdef ENABLE_VSS
+        CleanupVssBackupComponents();
+#endif
+
         // Get the new store marker
         mClientStoreMarker = clientContext.GetClientStoreMarker();
@@ -1134 +1146 @@
 
                 BOX_ERROR("VSS: Failed to initialize for backup: " << message);
-                goto CreateVssBackupComponents_cleanup_mpVssBackupComponents;
+                return;
         }
 
@@ -1147 +1159 @@
                 BOX_ERROR("VSS: Failed to set context to VSS_CTX_BACKUP: " <<
                         GetMsgForHresult(result));
-                goto CreateVssBackupComponents_cleanup_mpVssBackupComponents;
+                return;
         }
 
@@ -1159 +1171 @@
                 BOX_ERROR("VSS: Failed to set backup state: " <<
                         GetMsgForHresult(result));
-                goto CreateVssBackupComponents_cleanup_mpVssBackupComponents;
+                return;
         }
 
@@ -1188 +1200 @@
                         BOX_ERROR("Failed to get VSS metadata from writer " << iWriter <<
                                 ": " << GetMsgForHresult(result));
-                        goto CreateVssBackupComponents_cleanup_WriterMetadata;
+                        continue;
                 }
 
@@ -1200 +1212 @@
                                 GetMsgForHresult(result));
                         pMetadata->Release();
-                        goto CreateVssBackupComponents_cleanup_mpVssBackupComponents;
+                        continue;
                 }
 
@@ -1583 +1595 @@
                         GetMsgForHresult(result));
         }
-
-CreateVssBackupComponents_cleanup_mpVssBackupComponents:
+}
+
+void BackupDaemon::CleanupVssBackupComponents()
+{
+        if(mpVssBackupComponents == NULL)
+        {
+                return;
+        }
+
+        CallAndWaitForAsync(&IVssBackupComponents::BackupComplete,
+                "BackupComplete()");
+
         mpVssBackupComponents->Release();
         mpVssBackupComponents = NULL;
-        return;
 }
 #endif

box/trunk/bin/bbackupd/BackupDaemon.h

@@ -544 +544 @@
         bool CallAndWaitForAsync(AsyncMethod method,
                 const std::string& description);
+        void CleanupVssBackupComponents();
 #endif
 };