[ARVADOS] updated: e1d958bc57d64055bcd08d84bd3b86823f1ebc5d

Git user git at public.curoverse.com
Mon Sep 26 10:16:22 EDT 2016


Summary of changes:
 services/api/lib/tasks/delete_old_job_logs.rake | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

       via  e1d958bc57d64055bcd08d84bd3b86823f1ebc5d (commit)
      from  f40544f6523bf2d54b288a64af7cab7469741512 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e1d958bc57d64055bcd08d84bd3b86823f1ebc5d
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 26 10:15:33 2016 -0400

    9514: update delete_old_job_logs task also to use the better performing sql.

diff --git a/services/api/lib/tasks/delete_old_job_logs.rake b/services/api/lib/tasks/delete_old_job_logs.rake
index 7f2b31e..18a5f02 100644
--- a/services/api/lib/tasks/delete_old_job_logs.rake
+++ b/services/api/lib/tasks/delete_old_job_logs.rake
@@ -5,13 +5,8 @@
 namespace :db do
   desc "Remove old job stderr entries from the logs table"
   task delete_old_job_logs: :environment do
-    Log.select("logs.id").
-        joins("JOIN jobs ON object_uuid = jobs.uuid").
-        where("event_type = :etype AND jobs.log IS NOT NULL AND jobs.finished_at < :age",
-              etype: "stderr",
-              age: Rails.configuration.clean_job_log_rows_after.ago).
-        find_in_batches do |old_log_ids|
-      Log.where(id: old_log_ids.map(&:id)).delete_all
-    end
+    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 jobs.finished_at < '#{Rails.configuration.clean_job_log_rows_after.ago}')"
+
+    ActiveRecord::Base.connection.execute(delete_sql)
   end
 end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list