Changeset 31619 in vbox

Timestamp:

Aug 12, 2010 7:01:05 PM (14 years ago)

Author:

vboxsync

Message:

iSCSI: Read timeout handling for poll to catch broken connections

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -618 +618 @@
     /** PDU we are currently transmitting. */
     PISCSIPDUTX         pIScsiPDUTxCur;
-
+    /** Number of commands waiting for an answer from the target.
+     * Used for timeout handling for poll.
+     */
+    unsigned            cCmdsWaiting;
     /** Table of commands waiting for a response from the target. */
     PISCSICMD           aCmdsWaiting[ISCSI_CMD_WAITING_ENTRIES];
@@ -751 +754 @@
     pIScsiCmd->pNext = pIScsiCmdOld;
     pImage->aCmdsWaiting[idx] = pIScsiCmd;
+    pImage->cCmdsWaiting++;
 }
 
@@ -780 +784 @@
             Assert(!pImage->aCmdsWaiting[idx] || VALID_PTR(pImage->aCmdsWaiting[idx]));
         }
-
+        pImage->cCmdsWaiting--;
     }
 
@@ -3265 +3269 @@
 
         /* Wait for work or for data from the target. */
-        rc = iscsiIoThreadWait(pImage, RT_INDEFINITE_WAIT, pImage->fPollEvents, &fEvents);
+        RTMSINTERVAL msWait;
+
+        if (pImage->cCmdsWaiting)
+            msWait = pImage->uReadTimeout;
+        else
+            msWait = RT_INDEFINITE_WAIT;
+
+        rc = iscsiIoThreadWait(pImage, msWait, pImage->fPollEvents, &fEvents);
         if (rc == VERR_INTERRUPTED)
         {
@@ -3293 +3304 @@
                 pIScsiCmd = iscsiCmdGet(pImage);
             }
+        }
+        else if (rc == VERR_TIMEOUT)
+        {
+            /*
+             * We are waiting for a response from the target but
+             * it didn't answered yet.
+             * We assume the connection is broken and try to reconnect.
+             */
+            LogFlow(("Timed out while waiting for an asnwer from the target, reconnecting\n"));
+            iscsiReattach(pImage);
         }
         else if (RT_SUCCESS(rc))