The four hour timeout for crash collection is way too long for Chrome
OS, so we moved this parameter into global config for easier control.

Signed-off-by: Dale Curtis <[email protected]>
---
 server/crashcollect.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/server/crashcollect.py b/server/crashcollect.py
index 6e1de7f..dc582ac 100644
--- a/server/crashcollect.py
+++ b/server/crashcollect.py
@@ -1,5 +1,6 @@
 import os, time, pickle, logging, shutil

+from autotest_lib.client.common_lib import global_config
 from autotest_lib.server import utils


@@ -33,7 +34,12 @@ def get_crashinfo(host, test_start_time):
         collect_uncollected_logs(host)


-def wait_for_machine_to_recover(host, hours_to_wait=4.0):
+# Load default for number of hours to wait before giving up on crash
collection.
+HOURS_TO_WAIT = global_config.global_config.get_config_value(
+    'SERVER', 'crash_collection_hours_to_wait', type=float, default=4.0)
+
+
+def wait_for_machine_to_recover(host, hours_to_wait=HOURS_TO_WAIT):
     """Wait for a machine (possibly down) to become accessible again.

     @param host: A RemoteHost instance to wait on
-- 
1.7.3.1
From e3c0ff3abe30f68a7de2f43e93b55eff30de46b9 Mon Sep 17 00:00:00 2001
From: Dale Curtis <[email protected]>
Date: Mon, 20 Jun 2011 16:12:16 -0700
Subject: [PATCH 3/4] Add control for crash collection timeout to global_config.

The four hour timeout for crash collection is way too long for Chrome
OS, so we moved this parameter into global config for easier control.

Signed-off-by: Dale Curtis <[email protected]>
---
 server/crashcollect.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/server/crashcollect.py b/server/crashcollect.py
index 6e1de7f..dc582ac 100644
--- a/server/crashcollect.py
+++ b/server/crashcollect.py
@@ -1,5 +1,6 @@
 import os, time, pickle, logging, shutil
 
+from autotest_lib.client.common_lib import global_config
 from autotest_lib.server import utils
 
 
@@ -33,7 +34,12 @@ def get_crashinfo(host, test_start_time):
         collect_uncollected_logs(host)
 
 
-def wait_for_machine_to_recover(host, hours_to_wait=4.0):
+# Load default for number of hours to wait before giving up on crash collection.
+HOURS_TO_WAIT = global_config.global_config.get_config_value(
+    'SERVER', 'crash_collection_hours_to_wait', type=float, default=4.0)
+
+
+def wait_for_machine_to_recover(host, hours_to_wait=HOURS_TO_WAIT):
     """Wait for a machine (possibly down) to become accessible again.
 
     @param host: A RemoteHost instance to wait on
-- 
1.7.3.1

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to