[ARVADOS] created: 5e4bf6836d9762ef5552111776dcbade99f2e680

[Git user]

        at  5e4bf6836d9762ef5552111776dcbade99f2e680 (commit)


commit 5e4bf6836d9762ef5552111776dcbade99f2e680
Author: radhika <radhika at curoverse.com>
Date:   Tue Apr 18 16:35:08 2017 -0400

    8019: expose crunch log throttling config parameters via discovery document

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 443c650..07a581f 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -38,6 +38,13 @@ class Arvados::V1::SchemaController < ApplicationController
         blobSignatureTtl: Rails.application.config.blob_signature_ttl,
         maxRequestSize: Rails.application.config.max_request_size,
         dockerImageFormats: Rails.application.config.docker_image_formats,
+        crunchLogBytesPerEvent: Rails.application.config.crunch_log_bytes_per_event,
+        crunchLogSecondsBetweenEvents: Rails.application.config.crunch_log_seconds_between_events,
+        crunchLogThrottlePeriod: Rails.application.config.crunch_log_throttle_period,
+        crunchLogThrottleBytes: Rails.application.config.crunch_log_throttle_bytes,
+        crunchLogThrottleLines: Rails.application.config.crunch_log_throttle_lines,
+        crunchLimitLogBytesPerJob: Rails.application.config.crunch_limit_log_bytes_per_job,
+        crunchLogPartialLineThrottlePeriod: Rails.application.config.crunch_log_partial_line_throttle_period,
         parameters: {
           alt: {
             type: "string",
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 5241cb4..db87265 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -279,6 +279,8 @@ common:
   # silenced by throttling are not counted against this total.
   crunch_limit_log_bytes_per_job: 67108864
 
+  crunch_log_partial_line_throttle_period: 5
+
   # Attributes to suppress in events and audit logs.  Notably,
   # specifying ["manifest_text"] here typically makes the database
   # smaller and faster.
@@ -413,8 +415,6 @@ common:
   # "git log".
   source_version: false
 
-  crunch_log_partial_line_throttle_period: 5
-
   # Enable asynchronous permission graph rebuild.  Must run
   # script/permission-updater.rb as a separate process.  When the permission
   # cache is invalidated, the background process will update the permission

-----------------------------------------------------------------------


hooks/post-receive
--