summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2011-06-21 18:13:41 +0000
committerlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2011-06-21 18:13:41 +0000
commit78249b98d69784e69c60bbffdee00f67cfa83ebf (patch)
tree9bb500729658baf86230359c34ecde3a577a1296
parent77a27bc06c0f056c5f33bfba97213c638b5d73a9 (diff)
global_config.ini: Add new parameters to global config for easier discovery
I've bundled all the new parameters from the previous few patch sets into the global config so that future users may discover them more easily. Additionally, I cleaned up some inconsistent spacing. Signed-off-by: Dale Curtis <dalecurtis@google.com> git-svn-id: svn://test.kernel.org/autotest/trunk@5436 592f7852-d20e-0410-864c-8624ca9c26a4
-rw-r--r--global_config.ini15
1 files changed, 13 insertions, 2 deletions
diff --git a/global_config.ini b/global_config.ini
index e822a1e9..2aee0786 100644
--- a/global_config.ini
+++ b/global_config.ini
@@ -57,6 +57,9 @@ smtp_server:
smtp_port:
smtp_user:
smtp_password:
+# Time in hours to wait before giving up on crash collection. A timeout of 0
+# means crash collection is skipped unless the host is already available.
+crash_collection_hours_to_wait: 4.0
[SCHEDULER]
die_on_orphans: False
@@ -80,7 +83,7 @@ max_pidfile_refreshes: 2000
gc_stats_interval_mins: 360
# set nonzero to enable periodic reverification of all dead hosts
reverify_period_minutes: 0
-reverify_max_hosts_at_once: 0
+reverify_max_hosts_at_once: 0
drone_sets_enabled: False
# default_drone_set_name: This is required if drone sets are enabled.
default_drone_set_name:
@@ -88,6 +91,15 @@ default_drone_set_name:
[HOSTS]
wait_up_processes:
default_protection: NO_PROTECTION
+# Time in seconds to wait for a machine to come back after reboot.
+default_reboot_timeout: 1800
+# Time in seconds to wait for a machine to go down prior to reboot.
+wait_down_reboot_timeout: 840
+# Time in seconds to wait before generating a warning if a host has not gone
+# down for reboot.
+wait_down_reboot_warning: 540
+# Time in hours to wait for a host to recover after a down state.
+hours_to_wait_for_recovery: 2.5
[AUTOSERV]
# Autotest has 2 implementations of SSH based hosts, the default (raw_ssh), and
@@ -103,6 +115,5 @@ require_atfork_module: False
# Set to False to disable ssh-agent usage with paramiko
use_sshagent_with_paramiko: True
-
[PACKAGES]
serve_packages_from_autoserv: True