Changeset 2910 for box/trunk/bin

Timestamp:

14/04/2011 07:19:25 (14 months ago)

Author:

chris

Message:

Only initialise COM once, at bbackupd startup.

Reduce verbosity of some VSS messages.

Fix erroneous errro message when VSS iterator reaches end.

File:

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

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -390 +390 @@
         }
 
+#ifdef ENABLE_VSS
+        HRESULT result = CoInitialize(NULL);
+        if(result != S_OK)
+        {
+                BOX_ERROR("VSS: Failed to initialize COM: " << 
+                        GetMsgForHresult(result));
+                return 1;
+        }
+#endif
+
         int returnCode;
 
@@ -990 +1000 @@
 #endif
 
-                (*i)->mpDirectoryRecord->SyncDirectory(
-                        params,
+                (*i)->mpDirectoryRecord->SyncDirectory(params,
                         BackupProtocolClientListDirectory::RootDirectory,
                         locationPath, std::string("/") + (*i)->mName);
@@ -1116 +1125 @@
         std::map<char, VSS_ID> volumesIncluded;
 
-        HRESULT result = CoInitialize(NULL);
-        if(result != S_OK)
-        {
-                BOX_ERROR("VSS: Failed to initialize COM: " << 
-                        GetMsgForHresult(result));
-                return;
-        }
-
-        result = ::CreateVssBackupComponents(&mpVssBackupComponents);
+        HRESULT result = ::CreateVssBackupComponents(&mpVssBackupComponents);
         if(result != S_OK)
         {
@@ -1238 +1239 @@
                         }
 
-                        BOX_INFO("VSS: writer " << iWriter << " component " << 
+                        BOX_TRACE("VSS: writer " << iWriter << " component " << 
                                 iComponent << " info:");
                         switch(pComponentInfo->type)
@@ -1249 +1250 @@
                         }
 
-                        BOX_INFO("VSS: logical path: " << 
+                        BOX_TRACE("VSS: logical path: " << 
                                 BstrToString(pComponentInfo->bstrLogicalPath));
-                        BOX_INFO("VSS: component name: " << 
+                        BOX_TRACE("VSS: component name: " << 
                                 BstrToString(pComponentInfo->bstrComponentName));
-                        BOX_INFO("VSS: caption: " << 
+                        BOX_TRACE("VSS: caption: " << 
                                 BstrToString(pComponentInfo->bstrCaption));
-                        BOX_INFO("VSS: restore metadata: " << 
+                        BOX_TRACE("VSS: restore metadata: " << 
                                 pComponentInfo->bRestoreMetadata);
-                        BOX_INFO("VSS: notify on complete: " << 
+                        BOX_TRACE("VSS: notify on complete: " << 
                                 pComponentInfo->bRestoreMetadata);
-                        BOX_INFO("VSS: selectable: " << 
+                        BOX_TRACE("VSS: selectable: " << 
                                 pComponentInfo->bSelectable);
-                        BOX_INFO("VSS: selectable for restore: " << 
+                        BOX_TRACE("VSS: selectable for restore: " << 
                                 pComponentInfo->bSelectableForRestore);
-                        BOX_INFO("VSS: component flags: " << 
+                        BOX_TRACE("VSS: component flags: " << 
                                 BOX_FORMAT_HEX32(pComponentInfo->dwComponentFlags));
-                        BOX_INFO("VSS: file count: " << 
+                        BOX_TRACE("VSS: file count: " << 
                                 pComponentInfo->cFileCount);
-                        BOX_INFO("VSS: databases: " << 
+                        BOX_TRACE("VSS: databases: " << 
                                 pComponentInfo->cDatabases);
-                        BOX_INFO("VSS: log files: " << 
+                        BOX_TRACE("VSS: log files: " << 
                                 pComponentInfo->cLogFiles);
-                        BOX_INFO("VSS: dependencies: " << 
+                        BOX_TRACE("VSS: dependencies: " << 
                                 pComponentInfo->cDependencies);
 
@@ -1433 +1434 @@
                 }
 
-                BOX_INFO("VSS: Writer " << iWriter << " (" <<
+                BOX_TRACE("VSS: Writer " << iWriter << " (" <<
                         writerName << ") is in state " << stateName);
         }
@@ -1504 +1505 @@
                 result = pEnum->Next(1, &rgelt, &count);
 
-                if(result != S_OK && result != S_FALSE)
+                if(result == S_FALSE)
+                {
+                        // end of list, break out of the loop
+                        break;
+                }
+                else if(result != S_OK)
                 {
                         BOX_ERROR("VSS: Failed to enumerate snapshot: " <<