From: Zack Cerza <zack@redhat.com>
Date: Mon, 19 Jan 2015 23:56:31 +0000 (-0700)
Subject: Change default results_timeout to 12h
X-Git-Tag: 1.1.0~1037^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=29242971f6d2fea82e017194693283da2411d0e4;p=teuthology.git

Change default results_timeout to 12h

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst
index a8621c3880..1ec42e802e 100644
--- a/docs/siteconfig.rst
+++ b/docs/siteconfig.rst
@@ -40,6 +40,10 @@ Here is a sample configuration with many of the options set and documented::
     # Email address that job results summaries originate from
     results_sending_email: teuthology@example.com
 
+    # How long (in seconds) teuthology-results should wait for jobs to finish
+    # before considering them 'hung'
+    results_timeout: 43200
+
     # Gitbuilder archive that stores e.g. ceph packages
     gitbuilder_host: gitbuilder.example.com
 
diff --git a/scripts/suite.py b/scripts/suite.py
index d39a7aeb41..088b20c23f 100644
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -64,14 +64,15 @@ Scheduler arguments:
                               [default: 1000]
   --timeout <timeout>         How long, in seconds, to wait for jobs to finish
                               before sending email. This does not kill jobs.
-                              [default: 32400]
+                              [default: {default_results_timeout}]
   --filter KEYWORDS           Only run jobs whose name contains at least one
                               of the keywords in the comma separated keyword
                               string specified.
   --filter-out KEYWORDS       Do not run jobs whose name contains any of
                               the keywords in the comma separated keyword
                               string specified.
-""".format(default_machine_type=config.default_machine_type)
+""".format(default_machine_type=config.default_machine_type,
+           default_results_timeout=config.results_timeout)
 
 
 def main():
diff --git a/teuthology/config.py b/teuthology/config.py
index 78cb8e9125..ba478628c2 100644
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -134,6 +134,7 @@ class TeuthologyConfig(YamlConfig):
         'max_job_time': 259200,  # 3 days
         'results_server': 'http://paddles.front.sepia.ceph.com/',
         'results_sending_email': 'teuthology',
+        'results_timeout': 43200,
         'src_base_path': os.path.expanduser('~/src'),
         'verify_host_keys': True,
         'watchdog_interval': 120,
diff --git a/teuthology/worker.py b/teuthology/worker.py
index a1567d897b..f94c07e603 100644
--- a/teuthology/worker.py
+++ b/teuthology/worker.py
@@ -145,7 +145,8 @@ def main(ctx):
             args = [
                 os.path.join(teuth_bin_path, 'teuthology-results'),
                 '--timeout',
-                str(job_config.get('results_timeout', 32400)),
+                str(job_config.get('results_timeout',
+                                   teuth_config.results_timeout)),
                 '--email',
                 job_config['email'],
                 '--archive-dir',