Merge branch 'master' into 3583-provenance-graph-issue

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 7571bb08dd793362dc57e9b559c8d659f8a500ea..b85df8cb4b21935ca080a447e89e6d3401ecd9e7 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -80,16 +80,28 @@ common:
   # Maximum number of log events that may be generated by a single job.
   crunch_limit_log_events_per_job: 65536
 
-  # Maximum number of total bytes that may be logged by a single job.
-  crunch_limit_log_event_bytes_per_job: 67108864
-
-  # These two settings control how frequently log events are flushed
-  # to the database.  If a job generates two or more events within
-  # crunch_log_seconds_between_events, the log data is not flushed
-  # until crunch_log_bytes_per_event has been reached.
+  # These two settings control how frequently log events are flushed to the
+  # database.  Log lines are buffered until either crunch_log_bytes_per_event
+  # has been reached or crunch_log_seconds_between_events has elapsed since
+  # the last flush.
   crunch_log_bytes_per_event: 4096
   crunch_log_seconds_between_events: 1
 
+  # The sample period for throttling logs, in seconds.
+  crunch_log_throttle_period: 60
+
+  # Maximum number of bytes that job can log over crunch_log_throttle_period
+  # before being silenced until the end of the period.
+  crunch_log_throttle_bytes: 65536
+
+  # Maximum number of lines that job can log over crunch_log_throttle_period
+  # before being silenced until the end of the period.
+  crunch_log_throttle_lines: 1024
+
+  # Maximum bytes that may be logged by a single job.  Log bytes that are
+  # silenced by throttling are not counted against this total.
+  crunch_limit_log_bytes_per_job: 67108864
+
   # Path to /etc/dnsmasq.d, or false = do not update dnsmasq data.
   dnsmasq_conf_dir: false