jenkins-bot has submitted this change and it was merged. (
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.
Also some cosmetic changes (addition of s8 references, etc.).
Bug: T180918
Change-Id: I5168ce208ba023e961ccc17d7634250eeb410176
---
M dbtools/events_coredb_slave.sql
1 file changed, 6 insertions(+), 9 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, but someone else must approve
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/dbtools/events_coredb_slave.sql b/dbtools/events_coredb_slave.sql
index 73419fc..8de65f7 100644
--- a/dbtools/events_coredb_slave.sql
+++ b/dbtools/events_coredb_slave.sql
@@ -1,4 +1,7 @@
--- Events for s[1-7] slaves
+-- Events for s[1-8] core replicas
+
+-- Avoid replicating event DDL. Coredb events should only be created
+-- on s[1-8] though they may rely on replicated tables like event_log.
set @cache_sql_log_bin := @@session.sql_log_bin;
set @@session.sql_log_bin = 0;
@@ -23,13 +26,9 @@
index server_stamp (server_id, stamp)
) engine=innodb default charset=binary;
--- Avoid replicating event DDL. Coredb events should only be created
--- on s[1-7] though they may rely on replicated tables like event_log.
-
delimiter ;;
-- Housekeeping
-
drop event if exists wmf_master_wikiuser_sleep;;
drop event if exists wmf_master_purge;;
@@ -76,8 +75,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 +97,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 +227,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: merged
Gerrit-Change-Id: I5168ce208ba023e961ccc17d7634250eeb410176
Gerrit-PatchSet: 4
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
