Changeset 82905 in vbox

Timestamp:

Jan 29, 2020 12:28:30 PM (5 years ago)

Author:

vboxsync

Message:

ValKit/txsclient.py: Increase the timeouts on file transfers, making them relative to the file/string size for uploads and providing a method for calculating it for downloads.

File:

• trunk/src/VBox/ValidationKit/testdriver/txsclient.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

@@ -1628 +1628 @@
     #def "LIST    "
 
+    @staticmethod
+    def calcFileXferTimeout(cbFile):
+        """
+        Calculates a reasonable timeout for an upload/download given the file size.
+
+        Returns timeout in milliseconds.
+        """
+        return 30000 + cbFile / 256; # 256 KiB/s (picked out of thin air)
+
+    @staticmethod
+    def calcUploadTimeout(sLocalFile):
+        """
+        Calculates a reasonable timeout for an upload given the file (will stat it).
+
+        Returns timeout in milliseconds.
+        """
+        try:    cbFile = os.path.getsize(sLocalFile);
+        except: cbFile = 1024*1024;
+        return Session.calcFileXferTimeout(cbFile);
+
     def asyncUploadFile(self, sLocalFile, sRemoteFile,
                         fMode = 0, fFallbackOkay = True, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -1640 +1660 @@
                               self.taskUploadFile, (sLocalFile, sRemoteFile, fMode, fFallbackOkay));
 
-    def syncUploadFile(self, sLocalFile, sRemoteFile, fMode = 0, fFallbackOkay = True, cMsTimeout = 30000, fIgnoreErrors = False):
+    def syncUploadFile(self, sLocalFile, sRemoteFile, fMode = 0, fFallbackOkay = True, cMsTimeout = 0, fIgnoreErrors = False):
         """Synchronous version."""
+        if cMsTimeout <= 0:
+            cMsTimeout = self.calcUploadTimeout(sLocalFile);
         return self.asyncToSync(self.asyncUploadFile, sLocalFile, sRemoteFile, fMode, fFallbackOkay, cMsTimeout, fIgnoreErrors);
 
     def asyncUploadString(self, sContent, sRemoteFile,
-                          fMode = 0, fFallbackOkay = True, cMsTimeout = 30000, fIgnoreErrors = False):
+                          fMode = 0, fFallbackOkay = True, cMsTimeout = 0, fIgnoreErrors = False):
         """
         Initiates a upload string task.
@@ -1653 +1675 @@
         The task returns True on success, False on failure (logged).
         """
+        if cMsTimeout <= 0:
+            cMsTimeout = self.calcFileXferTimeout(len(sContent));
         return self.startTask(cMsTimeout, fIgnoreErrors, "uploadString",
                               self.taskUploadString, (sContent, sRemoteFile, fMode, fFallbackOkay));
 
-    def syncUploadString(self, sContent, sRemoteFile, fMode = 0, fFallbackOkay = True, cMsTimeout = 30000, fIgnoreErrors = False):
+    def syncUploadString(self, sContent, sRemoteFile, fMode = 0, fFallbackOkay = True, cMsTimeout = 0, fIgnoreErrors = False):
         """Synchronous version."""
+        if cMsTimeout <= 0:
+            cMsTimeout = self.calcFileXferTimeout(len(sContent));
         return self.asyncToSync(self.asyncUploadString, sContent, sRemoteFile, fMode, fFallbackOkay, cMsTimeout, fIgnoreErrors);
 
-    def asyncDownloadFile(self, sRemoteFile, sLocalFile, cMsTimeout = 30000, fIgnoreErrors = False):
+    def asyncDownloadFile(self, sRemoteFile, sLocalFile, cMsTimeout = 120000, fIgnoreErrors = False):
         """
         Initiates a download file task.
@@ -1670 +1696 @@
         return self.startTask(cMsTimeout, fIgnoreErrors, "downloadFile", self.taskDownloadFile, (sRemoteFile, sLocalFile));
 
-    def syncDownloadFile(self, sRemoteFile, sLocalFile, cMsTimeout = 30000, fIgnoreErrors = False):
+    def syncDownloadFile(self, sRemoteFile, sLocalFile, cMsTimeout = 120000, fIgnoreErrors = False):
         """Synchronous version."""
         return self.asyncToSync(self.asyncDownloadFile, sRemoteFile, sLocalFile, cMsTimeout, fIgnoreErrors);
@@ -1692 +1718 @@
                                 cMsTimeout, fIgnoreErrors);
 
-    def asyncUnpackFile(self, sRemoteFile, sRemoteDir, cMsTimeout = 30000, fIgnoreErrors = False):
+    def asyncUnpackFile(self, sRemoteFile, sRemoteDir, cMsTimeout = 120000, fIgnoreErrors = False):
         """
         Initiates a unpack file task.
@@ -1703 +1729 @@
                               (sRemoteFile, sRemoteDir));
 
-    def syncUnpackFile(self, sRemoteFile, sRemoteDir, cMsTimeout = 30000, fIgnoreErrors = False):
+    def syncUnpackFile(self, sRemoteFile, sRemoteDir, cMsTimeout = 120000, fIgnoreErrors = False):
         """Synchronous version."""
         return self.asyncToSync(self.asyncUnpackFile, sRemoteFile, sRemoteDir, cMsTimeout, fIgnoreErrors);