Springle has submitted this change and it was merged.

Change subject: eventlogging purge no longer on m2-master
......................................................................


eventlogging purge no longer on m2-master

Also, make it operate outside replication as events firing on master
and all slaves, beacause lag is prohibitive.

Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd
---
R dbtools/events_eventlogging.sql
1 file changed, 6 insertions(+), 49 deletions(-)

Approvals:
  Jcrespo: Looks good to me, but someone else must approve
  Springle: Verified; Looks good to me, approved



diff --git a/dbtools/events_m2_master.sql b/dbtools/events_eventlogging.sql
similarity index 65%
rename from dbtools/events_m2_master.sql
rename to dbtools/events_eventlogging.sql
index 412c17b..f6b828f 100644
--- a/dbtools/events_m2_master.sql
+++ b/dbtools/events_eventlogging.sql
@@ -1,4 +1,4 @@
--- Events for m2-master
+-- Events for all eventlogging boxes
 
 set @cache_sql_log_bin := @@session.sql_log_bin;
 set @@session.sql_log_bin = 0;
@@ -6,48 +6,13 @@
 set @cache_event_scheduler := @@global.event_scheduler;
 set @@global.event_scheduler = 0;
 
--- Eventlogging
-
 use log;
 
-drop table if exists purge_schedule;
-create table purge_schedule (
+create table if not exists purge_schedule (
   table_name varchar(100) not null primary key,
   after_days int unsigned default null,
   before_stamp varbinary(14) default null,
   batch_size int unsigned default 10000
-) engine=innodb default charset=binary;
-
-insert into purge_schedule (table_name, after_days) values
-    ('MediaViewer_6054199', 40),
-    ('MediaViewer_6055641', 40),
-    ('MediaViewer_6066908', 40),
-    ('MediaViewer_6636420', 40),
-    ('MediaViewer_7670440', 40),
-    ('MediaViewer_8245578', 40),
-    ('MediaViewer_8572637', 40),
-    ('MediaViewer_8935662', 40),
-    ('MediaViewer_9792855', 40),
-    ('MediaViewer_9989959', 40),
-    ('MultimediaViewerAttribution_9758179', 40),
-    ('MultimediaViewerDimensions_10014238', 40),
-    ('MultimediaViewerDuration_8318615', 40),
-    ('MultimediaViewerDuration_8572641', 40),
-    ('MultimediaViewerNetworkPerformance_7393226', 40),
-    ('MultimediaViewerNetworkPerformance_7488625', 40),
-    ('MultimediaViewerNetworkPerformance_7917896', 40)
-;
-
-insert into purge_schedule (table_name, before_stamp) values
-    ('MobileWebClickTracking_5929948', '20140101000000')
-;
-
-drop table if exists event_log;
-create table event_log (
-  stamp     datetime      not null,
-  event     varchar(100)  not null,
-  content   varchar(1024) not null,
-  index stamp (stamp)
 ) engine=innodb default charset=binary;
 
 delimiter ;;
@@ -56,7 +21,7 @@
 
 create event delete_schedule
 
-    on schedule every 10 second starts date(now())
+    on schedule every 30 second starts date(now())
 
     do begin
 
@@ -89,16 +54,12 @@
                     set @sql := concat(
                         ' delete from ', table_name,
                         ' where timestamp < "', @stamp, '"'
-                        ' order by timestamp, id limit ', batch_size
+                        ' order by timestamp limit ', batch_size
                     );
 
                     prepare stmt from @sql;
-                    set @@session.sql_log_bin = 1;
                     execute stmt;
-                    set @@session.sql_log_bin = 0;
                     deallocate prepare stmt;
-                    -- set @@session.sql_log_bin = 0;
-                    -- insert into event_log values (now(), 'del', @sql);
 
                 end if;
 
@@ -120,7 +81,7 @@
 
 create event delete_schedule2
 
-    on schedule every 10 second starts date(now())
+    on schedule every 30 second starts date(now())
 
     do begin
 
@@ -149,16 +110,12 @@
                     set @sql := concat(
                         ' delete from ', table_name,
                         ' where timestamp < "', before_stamp, '"'
-                        ' order by timestamp, id limit ', batch_size
+                        ' order by timestamp limit ', batch_size
                     );
 
                     prepare stmt from @sql;
-                    set @@session.sql_log_bin = 1;
                     execute stmt;
-                    set @@session.sql_log_bin = 0;
                     deallocate prepare stmt;
-                    -- set @@session.sql_log_bin = 0;
-                    -- insert into event_log values (now(), 'del', @sql);
 
                 end if;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/221561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Springle <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Mforns <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to