Changeset 37485 in vbox for trunk/src/VBox

Timestamp:

Jun 16, 2011 8:37:49 AM (14 years ago)

Author:

vboxsync

Message:

Main-CloneVM: add save state file support; multi result errors

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/include/MachineImpl.h

@@ -841 +841 @@
 
     struct CloneVMTask;
-    HRESULT cloneCreateMachineList(const ComPtr<ISnapshot> &pSnapshot, RTCList< ComPtr<IMachine> > &machineList) const;
+    HRESULT cloneCreateMachineList(const ComPtr<ISnapshot> &pSnapshot, RTCList< ComObjPtr<Machine> > &machineList) const;
     settings::Snapshot cloneFindSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const;
     void cloneUpdateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const;
     void cloneUpdateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const;
+    void cloneUpdateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const;
+    static int cloneCopyStateFileProgress(unsigned uPercentage, void *pvUser);
 
     static DECLCALLBACK(int) cloneVMThread(RTTHREAD Thread, void *pvUser);

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -6093 +6093 @@
     }MediumTaskChain;
     RTCList<MediumTaskChain>    llMedias;
-    RTCList< std::pair<Utf8Str, Utf8Str> > llSaveStateFiles; /* Snapshot UUID -> File path */
+    typedef struct
+    {
+        Guid                    snapshotUuid;
+        Utf8Str                 strSaveStateFile;
+        uint64_t                cbSize;
+    }SaveStateTask;
+    RTCList<SaveStateTask> llSaveStateFiles; /* Snapshot UUID -> File path */
 };
 
@@ -6123 +6129 @@
 
         if (pTask->pSrcMachine->isSnapshotMachine())
-            pTask->snapshotId  = static_cast<SnapshotMachine*>((Machine*)pTask->pSrcMachine)->getSnapshotId();
+            pTask->snapshotId = pTask->pSrcMachine->getSnapshotId();
 
         /* Add the current machine and all snapshot machines below this machine
          * in a list for further processing. */
-        RTCList< ComPtr<IMachine> > machineList;
+        RTCList< ComObjPtr<Machine> > machineList;
 
         /* Include current state? */
-        if (   pTask->mode == CloneMode_MachineState
-            || pTask->mode == CloneMode_AllStates)
-            machineList.append(static_cast< ComPtr<IMachine> >(pTask->pSrcMachine));
+        if (   pTask->mode == CloneMode_MachineState)
+//            || pTask->mode == CloneMode_AllStates)
+            machineList.append(pTask->pSrcMachine);
         /* Should be done a depth copy with all child snapshots? */
         if (   pTask->mode == CloneMode_MachineAndChildStates
@@ -6161 +6167 @@
         for (size_t i = 0; i < machineList.size(); ++i)
         {
+            ComObjPtr<Machine> machine = machineList.at(i);
             /* If this is the Snapshot Machine we want to clone, we need to
              * create a new diff file for the new "current state". */
             bool fCreateDiffs = false;
-            if (machineList.at(i) == pTask->pOldMachineState)
+            if (machine == pTask->pOldMachineState)
                 fCreateDiffs = true;
             SafeIfaceArray<IMediumAttachment> sfaAttachments;
-            rc = machineList.at(i)->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
+            rc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
             if (FAILED(rc)) throw rc;
             /* Add all attachments (and there parents) of the different
@@ -6220 +6227 @@
                 pTask->llMedias.append(mtc);
             }
-            /* Todo: If this machine has save state files, they have to be copied as well. */
-//            Bstr bstrSrcSaveStatePath;
-//            rc = machineList.at(i)->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
-//            if (FAILED(rc)) throw rc;
-//            if (!bstrSrcSaveStatePath.isEmpty())
-//                pTask->llSaveStates.append(bstrSrcSaveStatePath);
+            Bstr bstrSrcSaveStatePath;
+            rc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
+            if (FAILED(rc)) throw rc;
+            if (!bstrSrcSaveStatePath.isEmpty())
+            {
+                Machine::CloneVMTask::SaveStateTask sst;
+                sst.snapshotUuid     = machine->getSnapshotId();
+                sst.strSaveStateFile = bstrSrcSaveStatePath;
+                int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &sst.cbSize);
+                if (RT_FAILURE(vrc))
+                    throw setError(VBOX_E_IPRT_ERROR, tr("Could not query file size of '%s' (%Rrc)"), sst.strSaveStateFile.c_str(), vrc);
+                pTask->llSaveStateFiles.append(sst);
+                ++uCount;
+                uTotalWeight += sst.cbSize;
+            }
         }
 
@@ -6248 +6264 @@
                                  "MachineClone");
         if (RT_FAILURE(vrc))
-            throw setError(E_FAIL, "Could not create Machine clone thread (%Rrc)", vrc);
+            throw setError(VBOX_E_IPRT_ERROR, "Could not create machine clone thread (%Rrc)", vrc);
     }
     catch (HRESULT rc2)
@@ -6293 +6309 @@
 }
 
-HRESULT Machine::cloneCreateMachineList(const ComPtr<ISnapshot> &pSnapshot, RTCList< ComPtr<IMachine> > &machineList) const
+HRESULT Machine::cloneCreateMachineList(const ComPtr<ISnapshot> &pSnapshot, RTCList< ComObjPtr<Machine> > &machineList) const
 {
     HRESULT rc = S_OK;
@@ -6303 +6319 @@
     rc = pSnapshot->COMGETTER(Machine)(pMachine.asOutParam());
     if (FAILED(rc)) return rc;
-    machineList.append(pMachine);
+    machineList.append((Machine*)(IMachine*)pMachine);
 
     SafeIfaceArray<ISnapshot> sfaChilds;
@@ -6363 +6379 @@
             cloneUpdateSnapshotStorageLists(it->llChildSnapshots, bstrOldId, bstrNewId);
     }
+}
+
+void Machine::cloneUpdateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const
+{
+    settings::SnapshotsList::iterator it;
+    for (it = snl.begin(); it != snl.end(); ++it)
+    {
+        if (it->uuid == id)
+            it->strStateFile = strFile;
+        else if (!it->llChildSnapshots.empty())
+            cloneUpdateStateFile(it->llChildSnapshots, id, strFile);
+    }
+}
+
+/* static */
+int Machine::cloneCopyStateFileProgress(unsigned uPercentage, void *pvUser)
+{
+    ComObjPtr<Progress> pProgress = *static_cast< ComObjPtr<Progress>* >(pvUser);
+
+    BOOL fCanceled = false;
+    HRESULT rc = pProgress->COMGETTER(Canceled)(&fCanceled);
+    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+    /* If canceled by the user tell it to the copy operation. */
+    if (fCanceled) return VERR_CANCELLED;
+    /* Set the new process. */
+    RTPrintf("stat %d %%\n", uPercentage);
+    rc = pProgress->SetCurrentOperationProgress(uPercentage);
+    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+
+    return VINF_SUCCESS;
 }
 
@@ -6378 +6424 @@
     AutoWriteLock trgLock(pTask->pTrgMachine COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    MultiResult rc = S_OK;
 
     /*
@@ -6396 +6442 @@
 
     RTCList< ComObjPtr<Medium> > newMedias; /* All created images */
+    RTCList<Utf8Str> newFiles;              /* All extra created files (save states, ...) */
     try
     {
@@ -6436 +6483 @@
         }
 
-        /* Reset the snapshot folder to 'Snapshots' within the target directory.
-         * Todo: Not sure if this is what we want. */
-        pTrgMCF->machineUserData.strSnapshotFolder = "Snapshots";
+        /* When the current snapshot folder is absolute we reset it to the
+         * default relative folder. */
+        if (RTPathStartsWithRoot(pTrgMCF->machineUserData.strSnapshotFolder.c_str()))
+            pTrgMCF->machineUserData.strSnapshotFolder = "Snapshots";
         pTrgMCF->strStateFile = "";
         /* Force writing of setting file. */
@@ -6446 +6494 @@
         pTrgMCF->uuid = pTask->pTrgMachine->mData->mUuid;
 
+        Bstr bstrSrcSnapshotFolder;
+        rc = pTask->pSrcMachine->COMGETTER(SnapshotFolder)(bstrSrcSnapshotFolder.asOutParam());
+        if (FAILED(rc)) throw rc;
         /* The absolute name of the snapshot folder. */
         Utf8Str strTrgSnapshotFolder = Utf8StrFmt("%s%c%s%c", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, pTrgMCF->machineUserData.strSnapshotFolder.c_str(), RTPATH_DELIMITER);
@@ -6593 +6644 @@
             cloneUpdateSnapshotStorageLists(pTrgMCF->llFirstSnapshot, bstrSrcId, bstrTrgId);
         }
-        /* Todo: Clone all save state files. */
-//        for (size_t i = 0; i < pTask->llSaveStates.size(); ++i)
-//        {
-//            RTPrintf("save state: %s\n", pTask->llSaveStates.at(i).c_str());
-//            RTFileCopy(llSaveStates.at(i).c_str(),);
-//        }
+        /* Clone all save state files. */
+        for (size_t i = 0; i < pTask->llSaveStateFiles.size(); ++i)
+        {
+            Machine::CloneVMTask::SaveStateTask sst = pTask->llSaveStateFiles.at(i);
+            const Utf8Str &strTrgSaveState = Utf8StrFmt("%s%s", strTrgSnapshotFolder.c_str(), RTPathFilename(sst.strSaveStateFile.c_str()));
+
+            /* Move to next sub-operation. */
+            rc = pTask->pProgress->SetNextOperation(BstrFmt(tr("Copy save state file '%s' ..."), RTPathFilename(sst.strSaveStateFile.c_str())).raw(), sst.cbSize);
+            if (FAILED(rc)) throw rc;
+            /* Copy the file only if it was not copied already. */
+            if (!newFiles.contains(strTrgSaveState.c_str()))
+            {
+                int vrc = RTFileCopyEx(sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), 0, cloneCopyStateFileProgress, &pTask->pProgress);
+                if (RT_FAILURE(vrc))
+                    throw setError(VBOX_E_IPRT_ERROR,
+                                   tr("Could not copy state file '%s' to '%s' (%Rrc)"), sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), vrc);
+                newFiles.append(strTrgSaveState);
+            }
+            /* Update the path in the configuration either for the current
+             * machine state or the snapshots. */
+            if (sst.snapshotUuid.isEmpty())
+                pTrgMCF->strStateFile = strTrgSaveState;
+            else
+                cloneUpdateStateFile(pTrgMCF->llFirstSnapshot, sst.snapshotUuid, strTrgSaveState);
+        }
 
         if (false)
@@ -6691 +6761 @@
     if (FAILED(rc))
     {
+        int vrc = VINF_SUCCESS;
+        /* Delete all created files. */
+        for (size_t i = 0; i < newFiles.size(); ++i)
+        {
+            vrc = RTFileDelete(newFiles.at(i).c_str());
+            if (RT_FAILURE(vrc))
+                rc = setError(VBOX_E_IPRT_ERROR, tr("Could not delete file '%s' (%Rrc)"), newFiles.at(i).c_str(), vrc);
+        }
         /* Delete all already created medias. (Reverse, cause there could be
          * parent->child relations.) */
@@ -6697 +6775 @@
             ComObjPtr<Medium> &pMedium = newMedias.at(i - 1);
             AutoCaller mac(pMedium);
-            if (FAILED(mac.rc())) return mac.rc();
+            if (FAILED(mac.rc())) { continue; rc = mac.rc(); }
             AutoReadLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
             bool fFile = pMedium->isMediumFormatFile();
@@ -6704 +6782 @@
             /* Close the medium. If this succeed, delete it finally from the
              * disk. */
-            HRESULT rc1 = pMedium->close(NULL, mac);
-            if (   SUCCEEDED(rc1)
-                && fFile)
-                RTFileDelete(strLoc.c_str());
+            rc = pMedium->close(NULL, mac);
+            if (FAILED(rc)) continue;
+            if (fFile)
+            {
+                vrc = RTFileDelete(strLoc.c_str());
+                if (RT_FAILURE(vrc))
+                    rc = setError(VBOX_E_IPRT_ERROR, tr("Could not delete file '%s' (%Rrc)"), strLoc.c_str(), vrc);
+            }
         }
         /* Delete the machine folder when not empty. */