Merge branch 'master' into origin-2883-job-log-viewer

[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 d62fb4ea02282028f1ce08a104cb57bcb953f57b..827dfe158662e5c22109e8b7acc5ae922a5330b4 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -68,6 +68,19 @@ common:
   # crunch-job must be able to stat() it.
   crunch_refresh_trigger: /tmp/crunch_refresh_trigger
 
+  # 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.
+  crunch_log_bytes_per_event: 4096
+  crunch_log_seconds_between_events: 1
+
   # Path to /etc/dnsmasq.d, or false = do not update dnsmasq data.
   dnsmasq_conf_dir: false
 
@@ -136,6 +149,7 @@ common:
   # can write a manifest that references the hash, pass it to
   # collections.create (which will create a permission link), use
   # collections.get to obtain a signature for that data locator, and
-  # use that signed locator to retrieve the data from Keep.
-  # Do not use turn this on if you want to 
+  # use that signed locator to retrieve the data from Keep. Therefore,
+  # do not turn this on if your users expect to keep data private from
+  # one another!
   permit_create_collection_with_unsigned_manifest: false