[ARVADOS] created: 2.1.0-2061-g63891d24a
Git user
git at public.arvados.org
Mon Mar 14 16:03:05 UTC 2022
at 63891d24a3102ee0d68d389f6a3268cd851ba999 (commit)
commit 63891d24a3102ee0d68d389f6a3268cd851ba999
Author: Ward Vandewege <ward at curii.com>
Date: Mon Mar 14 11:51:08 2022 -0400
18763: remove rake tasks that are no longer needed (cf.
https://dev.arvados.org/issues/18763#note-5).
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/services/api/lib/tasks/delete_old_job_logs.rake b/services/api/lib/tasks/delete_old_job_logs.rake
deleted file mode 100644
index a1ae2226a..000000000
--- a/services/api/lib/tasks/delete_old_job_logs.rake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-# This task finds jobs that have been finished for at least as long as
-# the duration specified in the `clean_job_log_rows_after`
-# configuration setting, and deletes their stderr logs from the logs table.
-
-namespace :db do
- desc "Remove old job stderr entries from the logs table"
- task delete_old_job_logs: :environment do
- delete_sql = "DELETE FROM logs WHERE id in (SELECT logs.id FROM logs JOIN jobs ON logs.object_uuid = jobs.uuid WHERE event_type = 'stderr' AND jobs.log IS NOT NULL AND clock_timestamp() - jobs.finished_at > interval '#{Rails.configuration.Containers.Logging.MaxAge.to_i} seconds')"
-
- ActiveRecord::Base.connection.execute(delete_sql)
- end
-end
diff --git a/services/api/lib/tasks/symbols.rake b/services/api/lib/tasks/symbols.rake
deleted file mode 100644
index dc9ed461d..000000000
--- a/services/api/lib/tasks/symbols.rake
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-require 'current_api_client'
-
-# This is needed instead of just including CurrentApiClient so that its
-# methods don't get imported as Object's class methods; this is a problem because
-# the methods would be imported only on test environment. See #15716 for more info.
-class CurrentApiClientHelper
- extend CurrentApiClient
-end
-
-def has_symbols? x
- if x.is_a? Hash
- x.each do |k,v|
- return true if has_symbols?(k) or has_symbols?(v)
- end
- elsif x.is_a? Array
- x.each do |k|
- return true if has_symbols?(k)
- end
- elsif x.is_a? Symbol
- return true
- elsif x.is_a? String
- return true if x.start_with?(':') && !x.start_with?('::')
- end
- false
-end
-
-def check_for_serialized_symbols rec
- jsonb_cols = rec.class.columns.select{|c| c.type == :jsonb}.collect{|j| j.name}
- (jsonb_cols + rec.class.serialized_attributes.keys).uniq.each do |colname|
- if has_symbols? rec.attributes[colname]
- st = recursive_stringify rec.attributes[colname]
- puts "Found value potentially containing Ruby symbols in #{colname} attribute of #{rec.uuid}, current value is\n#{rec.attributes[colname].to_s[0..1024]}\nrake symbols:stringify will update it to:\n#{st.to_s[0..1024]}\n\n"
- end
- end
-end
-
-def recursive_stringify x
- if x.is_a? Hash
- Hash[x.collect do |k,v|
- [recursive_stringify(k), recursive_stringify(v)]
- end]
- elsif x.is_a? Array
- x.collect do |k|
- recursive_stringify k
- end
- elsif x.is_a? Symbol
- x.to_s
- elsif x.is_a? String and x.start_with?(':') and !x.start_with?('::')
- x[1..-1]
- else
- x
- end
-end
-
-def stringify_serialized_symbols rec
- # ensure_serialized_attribute_type should prevent symbols from
- # getting into the database in the first place. If someone managed
- # to get them into the database (perhaps using an older version)
- # we'll convert symbols to strings when loading from the
- # database. (Otherwise, loading and saving an object with existing
- # symbols in a serialized field will crash.)
- jsonb_cols = rec.class.columns.select{|c| c.type == :jsonb}.collect{|j| j.name}
- (jsonb_cols + rec.class.serialized_attributes.keys).uniq.each do |colname|
- if has_symbols? rec.attributes[colname]
- begin
- st = recursive_stringify rec.attributes[colname]
- puts "Updating #{colname} attribute of #{rec.uuid} from\n#{rec.attributes[colname].to_s[0..1024]}\nto\n#{st.to_s[0..1024]}\n\n"
- rec.write_attribute(colname, st)
- rec.save!
- rescue => e
- puts "Failed to update #{rec.uuid}: #{e}"
- end
- end
- end
-end
-
-namespace :symbols do
- desc 'Warn about serialized values starting with ":" that may be symbols'
- task check: :environment do
- [ApiClientAuthorization, ApiClient,
- AuthorizedKey, Collection,
- Container, ContainerRequest, Group,
- Human, Job, JobTask, KeepDisk, KeepService, Link,
- Node, PipelineInstance, PipelineTemplate,
- Repository, Specimen, Trait, User, VirtualMachine,
- Workflow].each do |klass|
- CurrentApiClientHelper.act_as_system_user do
- klass.all.each do |c|
- check_for_serialized_symbols c
- end
- end
- end
- end
-
- task stringify: :environment do
- [ApiClientAuthorization, ApiClient,
- AuthorizedKey, Collection,
- Container, ContainerRequest, Group,
- Human, Job, JobTask, KeepDisk, KeepService, Link,
- Node, PipelineInstance, PipelineTemplate,
- Repository, Specimen, Trait, User, VirtualMachine,
- Workflow].each do |klass|
- CurrentApiClientHelper.act_as_system_user do
- klass.all.each do |c|
- stringify_serialized_symbols c
- end
- end
- end
- end
-end
diff --git a/services/api/test/tasks/delete_old_job_logs_test.rb b/services/api/test/tasks/delete_old_job_logs_test.rb
deleted file mode 100644
index 00660431c..000000000
--- a/services/api/test/tasks/delete_old_job_logs_test.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-require 'test_helper'
-require 'rake'
-
-Rake.application.rake_require "tasks/delete_old_job_logs"
-Rake::Task.define_task(:environment)
-
-class DeleteOldJobLogsTaskTest < ActiveSupport::TestCase
- TASK_NAME = "db:delete_old_job_logs"
-
- def log_uuids(*fixture_names)
- fixture_names.map { |name| logs(name).uuid }
- end
-
- def run_with_expiry(clean_after)
- Rails.configuration.Containers.Logging.MaxAge = clean_after
- Rake::Task[TASK_NAME].reenable
- Rake.application.invoke_task TASK_NAME
- end
-
- def job_stderr_logs
- Log.where("object_uuid LIKE :pattern AND event_type = :etype",
- pattern: "_____-8i9sb-_______________",
- etype: "stderr")
- end
-
- def check_existence(test_method, fixture_uuids)
- uuids_now = job_stderr_logs.map(&:uuid)
- fixture_uuids.each do |expect_uuid|
- send(test_method, uuids_now, expect_uuid)
- end
- end
-
- test "delete all logs" do
- uuids_to_keep = log_uuids(:crunchstat_for_running_job)
- uuids_to_clean = log_uuids(:crunchstat_for_previous_job,
- :crunchstat_for_ancient_job)
- run_with_expiry(1)
- check_existence(:assert_includes, uuids_to_keep)
- check_existence(:refute_includes, uuids_to_clean)
- end
-
- test "delete only old logs" do
- uuids_to_keep = log_uuids(:crunchstat_for_running_job,
- :crunchstat_for_previous_job)
- uuids_to_clean = log_uuids(:crunchstat_for_ancient_job)
- run_with_expiry(360.days)
- check_existence(:assert_includes, uuids_to_keep)
- check_existence(:refute_includes, uuids_to_clean)
- end
-end
commit e1e96c6d2cb259f60f22d2fb4bd1c00f9667ba35
Author: Ward Vandewege <ward at curii.com>
Date: Mon Mar 14 09:54:53 2022 -0400
18763: remove unused gems from the API server Gemfile.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/services/api/Gemfile b/services/api/Gemfile
index ac6bfdb01..30d877fac 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -32,8 +32,6 @@ gem 'oj'
gem 'jquery-rails'
-gem 'rvm-capistrano', :group => :test
-
gem 'acts_as_api'
gem 'passenger'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 0dd9166ee..c5ecbaef7 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -82,12 +82,6 @@ GEM
multi_json (>= 1.0.0)
builder (3.2.4)
byebug (11.0.1)
- capistrano (2.15.9)
- highline
- net-scp (>= 1.0.0)
- net-sftp (>= 2.0.0)
- net-ssh (>= 2.0.14)
- net-ssh-gateway (>= 1.1.0)
concurrent-ruby (1.1.9)
crass (1.0.6)
erubi (1.10.0)
@@ -109,7 +103,6 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
- highline (2.0.1)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -146,13 +139,6 @@ GEM
metaclass (~> 0.0.1)
multi_json (1.15.0)
multipart-post (2.1.1)
- net-scp (2.0.0)
- net-ssh (>= 2.6.5, < 6.0.0)
- net-sftp (2.1.2)
- net-ssh (>= 2.6.5)
- net-ssh (5.2.0)
- net-ssh-gateway (2.0.0)
- net-ssh (>= 4.0.0)
nio4r (2.5.8)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
@@ -212,8 +198,6 @@ GEM
railties (>= 4.2.0, < 6.0)
retriable (1.4.1)
ruby-prof (0.15.9)
- rvm-capistrano (1.5.6)
- capistrano (~> 2.15.4)
safe_yaml (1.0.5)
signet (0.11.0)
addressable (~> 2.3)
@@ -271,7 +255,6 @@ DEPENDENCIES
rails-perftest
responders (~> 2.0)
ruby-prof (~> 0.15.0)
- rvm-capistrano
safe_yaml
signet (< 0.12)
simplecov (~> 0.7.1)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list