Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403899 )

Change subject: mariadb: Kill almost all wikiuser queries, including replica 
control
......................................................................

mariadb: Kill almost all wikiuser queries, including replica control

Also avoid warnings due to truncated long queries on a 1024 byte
field.

Bug: T180918
Change-Id: I5168ce208ba023e961ccc17d7634250eeb410176
---
M dbtools/events_coredb_slave.sql
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/99/403899/1

diff --git a/dbtools/events_coredb_slave.sql b/dbtools/events_coredb_slave.sql
index 73419fc..37555a1 100644
--- a/dbtools/events_coredb_slave.sql
+++ b/dbtools/events_coredb_slave.sql
@@ -76,8 +76,6 @@
             AND ps.PROCESSLIST_COMMAND = 'Query'
             AND ps.processlist_time between 60 and 1000000
             AND not lower(ps.PROCESSLIST_INFO) like '%wikiexporter%'
-            AND not lower(ps.PROCESSLIST_INFO) like '%master\_pos\_wait%'
-            AND not lower(ps.PROCESSLIST_INFO) like '%master\_gtid\_wait%'
             AND lower(ps.PROCESSLIST_INFO) like '%select%'
         ORDER BY ps.processlist_time DESC;
 
@@ -100,7 +98,7 @@
             kill thread_id;
 
             insert into event_log values (sid, now(), 'wmf_slave_wikiuser_slow 
(>60)',
-                concat('kill ',thread_id, '; ',thread_query)
+                concat('kill ',thread_id, '; ',LEFT(thread_query, 997))
             );
 
         end if;
@@ -230,7 +228,7 @@
                     kill thread_id;
 
                     insert into event_log values (sid, now(), 
'wmf_slave_overload',
-                        concat('kill ',thread_id,'; ',thread_query)
+                        concat('kill ',thread_id,'; ',LEFT(thread_query, 997)
                     );
 
                 end if;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5168ce208ba023e961ccc17d7634250eeb410176
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <[email protected]>

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

Reply via email to