Changeset 79584 in vbox

Timestamp:

Jul 8, 2019 7:40:46 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9416. little bit reshuffled the parts of cleanup code.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (4 diffs)

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

@@ -1477 +1477 @@
     }
 
+
+    HRESULT original_hrc = hrc;//save the original result
+
+    /* In any case we delete the cloud leavings which may exist after the first phase (cloud phase).
+     * Should they be deleted in the OCICloudClient::importInstance()?
+     * Because deleting them here is not easy as it in the importInstance(). */
+    {
+        GET_VSD_DESCRIPTION_BY_TYPE(VirtualSystemDescriptionType_CloudInstanceId)//aVBoxValues is set in this #define
+        if (aVBoxValues.size() == 0)
+            hrc = setErrorVrc(VERR_NOT_FOUND, tr("%s: Cloud cleanup action - the instance wasn't found", __FUNCTION__));
+        else
+        {
+            vsdData = aVBoxValues[0];
+
+            /** @todo
+             *  future function which will eliminate the temporary objects created during the first phase.
+             *  hrc = cloud.EliminateImportLeavings(aVBoxValues[0], pProgress); */
+            if (FAILED(hrc))
+            {
+                hrc = setErrorVrc(VERR_INVALID_STATE, tr("Some leavings may exist in the Cloud."));
+                LogRel(("%s: Cleanup action - the leavings in the %s after import the "
+                        "instance %s may not have been deleted\n",
+                        __FUNCTION__, strProviderName.c_str(), vsdData.c_str()));
+            }
+            else
+                LogRel(("%s: Cleanup action - the leavings in the %s after import the "
+                        "instance %s have been deleted\n",
+                        __FUNCTION__, strProviderName.c_str(), vsdData.c_str()));
+        }
+
+        /* Because during the cleanup phase the hrc may have the good result
+         * Thus we restore the original error in the case when the cleanup phase was successful
+         * Otherwise we return not the original error but the last error in the cleanup phase */
+         hrc = original_hrc;
+    }
+
     if (FAILED(hrc))
     {
-        HRESULT temp_hrc = hrc;//save the original result
         Utf8Str generalRollBackErrorMessage("Rollback action for Import Cloud operation failed."
                                             "Some leavings may exist on the local disk or in the Cloud.");
@@ -1490 +1525 @@
          * Maximum what we have there are:
          * 1. The downloaded object, so just check the presence and delete it if one exists
-         * 2. Some leftovers in the Cloud. Also delete them too if it's possible.
-         *    Should they be deleted in the OCICloudClient::importInstance()?
-         *    Because deleting them here is not easy as it in the importInstance().
          */
 
@@ -1523 +1555 @@
         }
 
-        {
-            GET_VSD_DESCRIPTION_BY_TYPE(VirtualSystemDescriptionType_CloudInstanceId)//aVBoxValues is set in this #define
-            if (aVBoxValues.size() == 0)
-                hrc = setErrorVrc(VERR_NOT_FOUND, generalRollBackErrorMessage.c_str());
-            else
-            {
-                vsdData = aVBoxValues[0];
-
-                /** @todo
-                 *  future function which will eliminate the temporary objects created during the first phase.
-                 *  hrc = cloud.EliminateImportLeavings(aVBoxValues[0], pProgress); */
-                if (FAILED(hrc))
-                {
-                    hrc = setErrorVrc(VERR_INVALID_STATE, generalRollBackErrorMessage.c_str());
-                    LogRel(("%s: Rollback action - the leavings in the %s after import the "
-                            "instance %s may not have been deleted\n",
-                            __FUNCTION__, strProviderName.c_str(), vsdData.c_str()));
-                }
-                else
-                    LogRel(("%s: Rollback action - the leavings in the %s after import the "
-                            "instance %s have been deleted\n",
-                            __FUNCTION__, strProviderName.c_str(), vsdData.c_str()));
-            }
-        }
-
         /* Because during the rollback phase the hrc may have the good result
          * Thus we restore the original error in the case when the rollback phase was successful
          * Otherwise we return not the original error but the last error in the rollback phase */
-        if (SUCCEEDED(hrc))
-            hrc = setError(temp_hrc, strLastActualErrorDesc.c_str());//restore the original result
+         hrc = original_hrc;
     }
     else
@@ -2036 +2042 @@
         }
 
+        hrc = E_FAIL;
         if (FAILED(hrc))
         {