Increase pkgmgr fetch timeout to 30 minutes (from 10)
Throw a warning when run_command's timeout fires
Signed-off-by: Rachel Kroll <rkroll@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2515 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/job.py b/client/bin/job.py
index fd4976f..c0113cc 100755
--- a/client/bin/job.py
+++ b/client/bin/job.py
@@ -127,7 +127,7 @@
self._load_state()
self.pkgmgr = packages.PackageManager(
- self.autodir, run_function_dargs={'timeout':600})
+ self.autodir, run_function_dargs={'timeout':1800})
self.pkgdir = os.path.join(self.autodir, 'packages')
self.run_test_cleanup = self.get_state("__run_test_cleanup",
default=True)
@@ -323,7 +323,7 @@
repositories = repo_urls + self.pkgmgr.repo_urls
self.pkgmgr = packages.PackageManager(
self.autodir, repo_urls=repositories,
- run_function_dargs={'timeout':600})
+ run_function_dargs={'timeout':1800})
# Fetch the packages' checksum file that contains the checksums
# of all the packages if it is not already fetched. The checksum
# is always fetched whenever a job is first started. This
diff --git a/client/common_lib/utils.py b/client/common_lib/utils.py
index d89f6cc..b7695ba 100644
--- a/client/common_lib/utils.py
+++ b/client/common_lib/utils.py
@@ -417,6 +417,7 @@
# Kill all processes which did not complete prior to timeout
for bg_job in [x for x in bg_jobs if x.result.exit_status is None]:
+ print '* Warning: run process timeout (%s) fired' % timeout
nuke_subprocess(bg_job.sp)
bg_job.result.exit_status = bg_job.sp.poll()