From 92d6698f3c2d1c8109a9cf08f25da408c3a7b442 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 3 May 2024 14:25:01 -0400 Subject: [PATCH] 21611: Remove obsolete configs. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/config/config.default.yml | 29 ------------------- lib/crunchrun/crunchrun_test.go | 10 ++----- sdk/go/arvados/config.go | 15 +++------- .../arvados/v1/schema_controller.rb | 7 ----- services/api/config/arvados_config.rb | 7 ----- 5 files changed, 6 insertions(+), 62 deletions(-) diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index b045553b23..b3e0d0657c 100644 --- a/lib/config/config.default.yml +++ b/lib/config/config.default.yml @@ -1245,35 +1245,6 @@ Clusters: # containers (see MaxAge). SweepInterval: 12h - # 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. - LogBytesPerEvent: 4096 - LogSecondsBetweenEvents: 5s - - # The sample period for throttling logs. - LogThrottlePeriod: 60s - - # Maximum number of bytes that job can log over crunch_log_throttle_period - # before being silenced until the end of the period. - LogThrottleBytes: 65536 - - # Maximum number of lines that job can log over crunch_log_throttle_period - # before being silenced until the end of the period. - LogThrottleLines: 1024 - - # Maximum bytes that may be logged as legacy log events - # (records posted to the "logs" table). Starting with Arvados - # 2.7, container live logging has migrated to a new system - # (polling the container request live log endpoint) and this - # value should be 0. As of this writing, the container will - # still create a single log on the API server, noting for that - # log events are throttled. - LimitLogBytesPerJob: 0 - - LogPartialLineThrottlePeriod: 5s - # Container logs are written to Keep and saved in a # collection, which is updated periodically while the # container runs. This value sets the interval between diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go index b7635f0ecd..e51dfe629b 100644 --- a/lib/crunchrun/crunchrun_test.go +++ b/lib/crunchrun/crunchrun_test.go @@ -308,14 +308,8 @@ func (client *ArvTestClient) Update(resourceType string, uuid string, parameters } var discoveryMap = map[string]interface{}{ - "defaultTrashLifetime": float64(1209600), - "crunchLimitLogBytesPerJob": float64(67108864), - "crunchLogThrottleBytes": float64(65536), - "crunchLogThrottlePeriod": float64(60), - "crunchLogThrottleLines": float64(1024), - "crunchLogPartialLineThrottlePeriod": float64(5), - "crunchLogBytesPerEvent": float64(4096), - "crunchLogSecondsBetweenEvents": float64(1), + "crunchLogUpdateSize": float64(crunchLogUpdateSize), + "crunchLogUpdatePeriod": float64(crunchLogUpdatePeriod.Seconds()), } func (client *ArvTestClient) Discovery(key string) (interface{}, error) { diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 6725611fd0..60725fcd6d 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -506,17 +506,10 @@ type ContainersConfig struct { Enable string } Logging struct { - MaxAge Duration - SweepInterval Duration - LogBytesPerEvent int - LogSecondsBetweenEvents Duration - LogThrottlePeriod Duration - LogThrottleBytes int - LogThrottleLines int - LimitLogBytesPerJob int - LogPartialLineThrottlePeriod Duration - LogUpdatePeriod Duration - LogUpdateSize ByteSize + MaxAge Duration + SweepInterval Duration + LogUpdatePeriod Duration + LogUpdateSize ByteSize } ShellAccess struct { Admin bool diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb index ca803fd386..dd7a7a759e 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -57,13 +57,6 @@ class Arvados::V1::SchemaController < ApplicationController maxRequestSize: Rails.configuration.API.MaxRequestSize, maxItemsPerResponse: Rails.configuration.API.MaxItemsPerResponse, dockerImageFormats: Rails.configuration.Containers.SupportedDockerImageFormats.keys, - crunchLogBytesPerEvent: Rails.configuration.Containers.Logging.LogBytesPerEvent, - crunchLogSecondsBetweenEvents: Rails.configuration.Containers.Logging.LogSecondsBetweenEvents, - crunchLogThrottlePeriod: Rails.configuration.Containers.Logging.LogThrottlePeriod, - crunchLogThrottleBytes: Rails.configuration.Containers.Logging.LogThrottleBytes, - crunchLogThrottleLines: Rails.configuration.Containers.Logging.LogThrottleLines, - crunchLimitLogBytesPerJob: Rails.configuration.Containers.Logging.LimitLogBytesPerJob, - crunchLogPartialLineThrottlePeriod: Rails.configuration.Containers.Logging.LogPartialLineThrottlePeriod, crunchLogUpdatePeriod: Rails.configuration.Containers.Logging.LogUpdatePeriod, crunchLogUpdateSize: Rails.configuration.Containers.Logging.LogUpdateSize, remoteHosts: remoteHosts, diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb index f514fee641..0a3b99dabd 100644 --- a/services/api/config/arvados_config.rb +++ b/services/api/config/arvados_config.rb @@ -130,13 +130,6 @@ arvcfg.declare_config "Containers.DefaultKeepCacheRAM", Integer, :container_defa arvcfg.declare_config "Containers.MaxDispatchAttempts", Integer, :max_container_dispatch_attempts arvcfg.declare_config "Containers.MaxRetryAttempts", Integer, :container_count_max arvcfg.declare_config "Containers.AlwaysUsePreemptibleInstances", Boolean, :preemptible_instances -arvcfg.declare_config "Containers.Logging.LogBytesPerEvent", Integer, :crunch_log_bytes_per_event -arvcfg.declare_config "Containers.Logging.LogSecondsBetweenEvents", ActiveSupport::Duration, :crunch_log_seconds_between_events -arvcfg.declare_config "Containers.Logging.LogThrottlePeriod", ActiveSupport::Duration, :crunch_log_throttle_period -arvcfg.declare_config "Containers.Logging.LogThrottleBytes", Integer, :crunch_log_throttle_bytes -arvcfg.declare_config "Containers.Logging.LogThrottleLines", Integer, :crunch_log_throttle_lines -arvcfg.declare_config "Containers.Logging.LimitLogBytesPerJob", Integer, :crunch_limit_log_bytes_per_job -arvcfg.declare_config "Containers.Logging.LogPartialLineThrottlePeriod", ActiveSupport::Duration, :crunch_log_partial_line_throttle_period arvcfg.declare_config "Containers.Logging.LogUpdatePeriod", ActiveSupport::Duration, :crunch_log_update_period arvcfg.declare_config "Containers.Logging.LogUpdateSize", Integer, :crunch_log_update_size arvcfg.declare_config "Containers.Logging.MaxAge", ActiveSupport::Duration, :clean_container_log_rows_after -- 2.30.2