Changeset 67139 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 30, 2017 11:17:28 AM (8 years ago)

Author:

vboxsync

Message:

ValidationKit/TXS: Added a configurable wait on the CD-ROM during auto upgrade to work around a solaris problem where it takes a little while before it is mounted. The wait defaults to 8 seconds on solaris and 1 second on the other OSes. Ideally, we should figure out that a medium is present before wasting time waiting, but that's probably complicated and can wait. The wait can be configured using the --wait-cdrom <secs> option. Setting it to zero disables the wait. There is no upper limit.

File:

• trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp (modified) (7 diffs)

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp

@@ -2975 +2975 @@
  * @param   argc                The number of arguments.
  * @param   argv                The argument vector.
+ * @param   cSecsCdWait         Number of seconds to wait on the CD.
  * @param   pfExit              For indicating exit when the exit code is zero.
  */
-static RTEXITCODE txsAutoUpdateStage1(int argc, char **argv, bool *pfExit)
+static RTEXITCODE txsAutoUpdateStage1(int argc, char **argv, uint32_t cSecsCdWait, bool *pfExit)
 {
     /*
@@ -3001 +3002 @@
     /*
      * Query information about the two images and read the entire potential source file.
-     */
+     * Because the CD may take a little time to be mounted when the system boots, we
+     * need to do some fudging here.
+     */
+    uint64_t nsStart = RTTimeNanoTS();
     RTFSOBJINFO UpgradeInfo;
-    rc = RTPathQueryInfo(szUpgradePath, &UpgradeInfo, RTFSOBJATTRADD_NOTHING);
-    if (    rc == VERR_FILE_NOT_FOUND
-        ||  rc == VERR_PATH_NOT_FOUND
-        ||  rc == VERR_MEDIA_NOT_PRESENT
-        ||  rc == VERR_MEDIA_NOT_RECOGNIZED)
-        return RTEXITCODE_SUCCESS;
-    if (RT_FAILURE(rc))
-    {
-        RTMsgError("RTPathQueryInfo(\"%s\"): %Rrc (upgrade)\n", szUpgradePath, rc);
-        return RTEXITCODE_SUCCESS;
+    for (;;)
+    {
+        rc = RTPathQueryInfo(szUpgradePath, &UpgradeInfo, RTFSOBJATTRADD_NOTHING);
+        if (RT_SUCCESS(rc))
+            break;
+        if (   rc != VERR_FILE_NOT_FOUND
+            && rc != VERR_PATH_NOT_FOUND
+            && rc != VERR_MEDIA_NOT_PRESENT
+            && rc != VERR_MEDIA_NOT_RECOGNIZED)
+        {
+            RTMsgError("RTPathQueryInfo(\"%s\"): %Rrc (upgrade)\n", szUpgradePath, rc);
+            return RTEXITCODE_SUCCESS;
+        }
+        uint64_t cNsElapsed = RTTimeNanoTS() - nsStart;
+        if (cNsElapsed >= cSecsCdWait * RT_NS_1SEC_64)
+            return RTEXITCODE_SUCCESS;
+        RTThreadSleep(500);
     }
 
@@ -3222 +3233 @@
                  "      version found on the CD-ROM on startup will replace the initial copy.\n"
                  "      Default: --auto-upgrade\n"
+                 "  --wait-cdrom <secs>\n"
+                 "     Number of seconds to wait for the CD-ROM to be mounted before giving up\n"
+                 "     on automatic upgrading.\n"
+                 "     Default: --wait-cdrom 1;  solaris: --wait-cdrom 8\n"
                  "  --upgrading <org-path>\n"
                  "      Internal use only.\n");
@@ -3265 +3280 @@
     bool        fDaemonized     = false;
     const char *pszUpgrading    = NULL;
+#ifdef RT_OS_SOLARIS
+    uint32_t    cSecsCdWait     = 8;
+#else
+    uint32_t    cSecsCdWait     = 1;
+#endif
 
     /*
@@ -3273 +3293 @@
         { "--transport",        't', RTGETOPT_REQ_STRING  },
         { "--cdrom",            'c', RTGETOPT_REQ_STRING  },
+        { "--wait-cdrom",       'w', RTGETOPT_REQ_UINT32  },
         { "--scratch",          's', RTGETOPT_REQ_STRING  },
         { "--auto-upgrade",     'a', RTGETOPT_REQ_NOTHING },
         { "--no-auto-upgrade",  'A', RTGETOPT_REQ_NOTHING },
         { "--upgrading",        'U', RTGETOPT_REQ_STRING  },
-        { "--display-output",   'd', RTGETOPT_REQ_NOTHING  },
-        { "--no-display-output",'D', RTGETOPT_REQ_NOTHING  },
-        { "--foreground",       'f', RTGETOPT_REQ_NOTHING  },
-        { "--daemonized",       'Z', RTGETOPT_REQ_NOTHING  },
+        { "--display-output",   'd', RTGETOPT_REQ_NOTHING },
+        { "--no-display-output",'D', RTGETOPT_REQ_NOTHING },
+        { "--foreground",       'f', RTGETOPT_REQ_NOTHING },
+        { "--daemonized",       'Z', RTGETOPT_REQ_NOTHING },
     };
 
@@ -3366 +3387 @@
             case 'U':
                 pszUpgrading = Val.psz;
+                break;
+
+            case 'w':
+                cSecsCdWait = Val.u32;
                 break;
 
@@ -3412 +3437 @@
             rcExit = txsAutoUpdateStage2(argc, argv, pfExit, pszUpgrading);
         else
-            rcExit = txsAutoUpdateStage1(argc, argv, pfExit);
+            rcExit = txsAutoUpdateStage1(argc, argv, cSecsCdWait, pfExit);
         if (   *pfExit
             || rcExit != RTEXITCODE_SUCCESS)