Changeset 24936 in vbox

Timestamp:

Nov 25, 2009 10:57:32 AM (15 years ago)

Author:

vboxsync

Message:

MachineImpl.cpp: Hacked around the locking cleanup issue in deleteImplicitDiff because it's driving me nuts.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7367 +7367 @@
                                                   NULL);
 
+            /** @todo r=bird: How is the locking and diff image cleaned up if we fail before
+             *        the push_back?  Looks like we're going to leave medium with the
+             *        wrong kind of lock (general issue with if we fail anywhere at all)
+             *        and an orphaned VDI in the snapshots folder. */
             // at this point, the old image is still locked for writing, but instead
             // we need the new diff image locked for writing and lock the previously
@@ -7442 +7446 @@
 
     AutoWriteLock alock(this);
+    LogFlowThisFuncEnter();
 
     AssertReturn(mMediaData.isBackedUp(), E_FAIL);
@@ -7463 +7468 @@
         {
             /* deassociate and mark for deletion */
+            LogFlowThisFunc(("Detaching '%s', pending deletion\n", (*it)->logName()));
             rc = hd->detachFrom(mData->mUuid);
             AssertComRC(rc);
@@ -7473 +7479 @@
         {
             /* no: de-associate */
+            LogFlowThisFunc(("Detaching '%s', no deletion\n", (*it)->logName()));
             rc = hd->detachFrom(mData->mUuid);
             AssertComRC(rc);
             continue;
         }
+        LogFlowThisFunc(("Not detaching '%s'\n", (*it)->logName()));
     }
 
@@ -7504 +7512 @@
              ++it)
         {
+            LogFlowThisFunc(("Deleting '%s'\n", (*it)->logName()));
             ComObjPtr<Medium> hd = (*it)->medium();
-            mrc = hd->deleteStorageAndWait();
+
+            rc = hd->deleteStorageAndWait();
+#if 1 /* HACK ALERT: Just make it kind of work */ /** @todo Fix this hack properly. The LockWrite / UnlockWrite / LockRead changes aren't undone! */
+            if (rc == VBOX_E_INVALID_OBJECT_STATE)
+            {
+                LogFlowFunc(("Applying unlock hack on '%s'! FIXME!\n", (*it)->logName()));
+                hd->UnlockWrite(NULL);
+                rc = hd->deleteStorageAndWait();
+            }
+#endif
+            AssertMsg(SUCCEEDED(rc), ("rc=%Rhrc it=%s hd=%s\n", rc, (*it)->logName(), hd->locationFull().c_str() ));
+            mrc = rc;
         }