Changeset 29154 in vbox

Timestamp:

May 6, 2010 1:29:30 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Do not migrate endpoints if for certain errors which can't be resolved but complete with the error code

File:

• trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -406 +406 @@
 
 /**
+ * Checks if a given status code is fatal.
+ * Non fatal errors can be fixed by migrating the endpoint to a
+ * failsafe manager.
+ *
+ * @returns true If the error is fatal and migrating to a failsafe manager doesn't help
+ *          false If the error can be fixed by a migration. (image on NFS disk for example)
+ * @param   rcReq    The status code to check.
+ */
+DECLINLINE(bool) pdmacFileAioMgrNormalRcIsFatal(int rcReq)
+{
+    return    rcReq == VERR_DEV_IO_ERROR
+           || rcReq == VERR_FILE_IO_ERROR
+           || rcReq == VERR_DISK_IO_ERROR
+           || rcReq == VERR_DISK_FULL
+           || rcReq == VERR_FILE_TOO_BIG;
+}
+
+/**
  * Error handler which will create the failsafe managers and destroy the failed I/O manager.
  *
@@ -1356 +1374 @@
                 RTMemPageFree(pTask->pvBounceBuffer, pTask->cbBounceBuffer);
 
-            /* Queue the request on the pending list. */
-            pTask->pNext = pEndpoint->AioMgr.pReqsPendingHead;
-            pEndpoint->AioMgr.pReqsPendingHead = pTask;
-
-            /* Create a new failsafe manager if neccessary. */
-            if (!pEndpoint->AioMgr.fMoving)
-            {
-                PPDMACEPFILEMGR pAioMgrFailsafe;
-
-                LogRel(("%s: Request %#p failed with rc=%Rrc, migrating endpoint %s to failsafe manager.\n",
-                        RTThreadGetName(pAioMgr->Thread), pTask, rcReq, pEndpoint->Core.pszUri));
-
-                pEndpoint->AioMgr.fMoving = true;
-
-                rc = pdmacFileAioMgrCreate((PPDMASYNCCOMPLETIONEPCLASSFILE)pEndpoint->Core.pEpClass,
-                                            &pAioMgrFailsafe, PDMACEPFILEMGRTYPE_SIMPLE);
-                AssertRC(rc);
-
-                pEndpoint->AioMgr.pAioMgrDst = pAioMgrFailsafe;
-
-                /* Update the flags to open the file with. Disable async I/O and enable the host cache. */
-                pEndpoint->fFlags &= ~(RTFILE_O_ASYNC_IO | RTFILE_O_NO_CACHE);
-            }
-        }
-
-        /* If this was the last request for the endpoint migrate it to the new manager. */
-        if (!pEndpoint->AioMgr.cRequestsActive)
-        {
-            bool fReqsPending = pdmacFileAioMgrNormalRemoveEndpoint(pEndpoint);
-            Assert(!fReqsPending);
-
-            rc = pdmacFileAioMgrAddEndpoint(pEndpoint->AioMgr.pAioMgrDst, pEndpoint);
-            AssertRC(rc);
+            /*
+             * Fatal errors are reported to the guest and non-fatal errors
+             * will cause a migration to the failsafe manager in the hope
+             * that the error disappears.
+             */
+            if (!pdmacFileAioMgrNormalRcIsFatal(rcReq))
+            {
+                /* Queue the request on the pending list. */
+                pTask->pNext = pEndpoint->AioMgr.pReqsPendingHead;
+                pEndpoint->AioMgr.pReqsPendingHead = pTask;
+
+                /* Create a new failsafe manager if neccessary. */
+                if (!pEndpoint->AioMgr.fMoving)
+                {
+                    PPDMACEPFILEMGR pAioMgrFailsafe;
+
+                    LogRel(("%s: Request %#p failed with rc=%Rrc, migrating endpoint %s to failsafe manager.\n",
+                            RTThreadGetName(pAioMgr->Thread), pTask, rcReq, pEndpoint->Core.pszUri));
+
+                    pEndpoint->AioMgr.fMoving = true;
+
+                    rc = pdmacFileAioMgrCreate((PPDMASYNCCOMPLETIONEPCLASSFILE)pEndpoint->Core.pEpClass,
+                                                &pAioMgrFailsafe, PDMACEPFILEMGRTYPE_SIMPLE);
+                    AssertRC(rc);
+
+                    pEndpoint->AioMgr.pAioMgrDst = pAioMgrFailsafe;
+
+                    /* Update the flags to open the file with. Disable async I/O and enable the host cache. */
+                    pEndpoint->fFlags &= ~(RTFILE_O_ASYNC_IO | RTFILE_O_NO_CACHE);
+                }
+
+                /* If this was the last request for the endpoint migrate it to the new manager. */
+                if (!pEndpoint->AioMgr.cRequestsActive)
+                {
+                    bool fReqsPending = pdmacFileAioMgrNormalRemoveEndpoint(pEndpoint);
+                    Assert(!fReqsPending);
+
+                    rc = pdmacFileAioMgrAddEndpoint(pEndpoint->AioMgr.pAioMgrDst, pEndpoint);
+                    AssertRC(rc);
+                }
+            }
+            else
+            {
+                pTask->pfnCompleted(pTask, pTask->pvUser, rcReq);
+                pdmacFileTaskFree(pEndpoint, pTask);
+            }
         }
     }