upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Schema: Include environment_id as part of the history retention indices

Browse source 
When UPSERT and DELETE statements are executed at the same time, a
deadlock can occur if both want to get an exclusive lock on one of the
PRIMARY KEY index pages. This happens with DELETE statements when there
is no suitable index for the columns used in the WHERE clause, which is
true for our history retention queries since commit eccac78. This PR
fixes the problem by adding a suitable index for the columns used in
these queries.
This commit is contained in:
Yonas Habteab 2022-06-15 13:52:02 +02:00
parent e8f611ddc6
commit 81e313e2db
3 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
schema/mysql/schema.sql
View file

@ -1113,7 +1113,8 @@ CREATE TABLE notification_history (
PRIMARY KEY (id),
INDEX idx_notification_history_send_time (send_time DESC) COMMENT 'Notification list filtered/ordered by send_time'
INDEX idx_notification_history_send_time (send_time DESC) COMMENT 'Notification list filtered/ordered by send_time',
INDEX idx_notification_history_env_send_time (environment_id, send_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE user_notification_history (
@ -1150,7 +1151,7 @@ CREATE TABLE state_history (
PRIMARY KEY (id),
INDEX idx_state_history_event_time (event_time) COMMENT 'Filter for history retention'
INDEX idx_state_history_env_event_time (environment_id, event_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE downtime_history (
@ -1180,7 +1181,7 @@ CREATE TABLE downtime_history (
PRIMARY KEY (downtime_id),
INDEX idx_downtime_history_end_time (end_time) COMMENT 'Filter for history retention'
INDEX idx_downtime_history_env_end_time (environment_id, end_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE comment_history (
@ -1204,7 +1205,7 @@ CREATE TABLE comment_history (
PRIMARY KEY (comment_id),
INDEX idx_comment_history_remove_time (remove_time) COMMENT 'Filter for history retention'
INDEX idx_comment_history_env_remove_time (environment_id, remove_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE flapping_history (
@ -1224,7 +1225,7 @@ CREATE TABLE flapping_history (
PRIMARY KEY (id),
INDEX idx_flapping_history_end_time (end_time) COMMENT 'Filter for history retention'
INDEX idx_flapping_history_env_end_time (environment_id, end_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE acknowledgement_history (
@ -1246,7 +1247,7 @@ CREATE TABLE acknowledgement_history (
PRIMARY KEY (id),
INDEX idx_acknowledgement_history_clear_time (clear_time) COMMENT 'Filter for history retention'
INDEX idx_acknowledgement_history_env_clear_time (environment_id, clear_time) COMMENT 'Filter for history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE history (
@ -1299,7 +1300,8 @@ CREATE TABLE sla_history_state (
PRIMARY KEY (id),
INDEX idx_sla_history_state_event (host_id, service_id, event_time)
INDEX idx_sla_history_state_event (host_id, service_id, event_time) COMMENT 'Filter for calculating the sla reports',
INDEX idx_sla_history_state_env_event_time (environment_id, event_time) COMMENT 'Filter for sla history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE sla_history_downtime (
@ -1315,7 +1317,8 @@ CREATE TABLE sla_history_downtime (
PRIMARY KEY (downtime_id),
INDEX idx_sla_history_downtime_event (host_id, service_id, downtime_start, downtime_end)
INDEX idx_sla_history_downtime_event (host_id, service_id, downtime_start, downtime_end) COMMENT 'Filter for calculating the sla reports',
INDEX idx_sla_history_downtime_env_downtime_end (environment_id, downtime_end) COMMENT 'Filter for sla history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
CREATE TABLE icingadb_schema (

19
schema/mysql/upgrades/1.0.0.sql
View file

@ -182,20 +182,23 @@ ALTER TABLE eventcommand_argument
ALTER TABLE notificationcommand_argument
ADD COLUMN `separator` varchar(255) DEFAULT NULL AFTER set_if;
ALTER TABLE notification_history
ADD INDEX idx_notification_history_env_send_time (environment_id, send_time) COMMENT 'Filter for history retention';
ALTER TABLE acknowledgement_history
ADD index idx_acknowledgement_history_clear_time (clear_time) COMMENT 'Filter for history retention';
ADD INDEX idx_acknowledgement_history_env_clear_time (environment_id, clear_time) COMMENT 'Filter for history retention';
ALTER TABLE comment_history
ADD index idx_comment_history_remove_time (remove_time) COMMENT 'Filter for history retention';
ADD INDEX idx_comment_history_env_remove_time (environment_id, remove_time) COMMENT 'Filter for history retention';
ALTER TABLE downtime_history
ADD index idx_downtime_history_end_time (end_time) COMMENT 'Filter for history retention';
ADD INDEX idx_downtime_history_env_end_time (environment_id, end_time) COMMENT 'Filter for history retention';
ALTER TABLE flapping_history
ADD index idx_flapping_history_end_time (end_time) COMMENT 'Filter for history retention';
ADD INDEX idx_flapping_history_env_end_time (environment_id, end_time) COMMENT 'Filter for history retention';
ALTER TABLE state_history
ADD index idx_state_history_event_time (event_time) COMMENT 'Filter for history retention',
ADD INDEX idx_state_history_env_event_time (environment_id, event_time) COMMENT 'Filter for history retention',
CHANGE attempt check_attempt tinyint unsigned NOT NULL;
ALTER TABLE icon_image
@ -249,7 +252,8 @@ CREATE TABLE sla_history_state (
PRIMARY KEY (id),
INDEX idx_sla_history_state_event (host_id, service_id, event_time)
INDEX idx_sla_history_state_event (host_id, service_id, event_time) COMMENT 'Filter for calculating the sla reports',
INDEX idx_sla_history_state_env_event_time (environment_id, event_time) COMMENT 'Filter for sla history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
INSERT INTO sla_history_state
@ -272,7 +276,8 @@ CREATE TABLE sla_history_downtime (
PRIMARY KEY (downtime_id),
INDEX idx_sla_history_downtime_event (host_id, service_id, downtime_start, downtime_end)
INDEX idx_sla_history_downtime_event (host_id, service_id, downtime_start, downtime_end) COMMENT 'Filter for calculating the sla reports',
INDEX idx_sla_history_downtime_env_downtime_end (environment_id, downtime_end) COMMENT 'Filter for sla history retention'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
INSERT INTO sla_history_downtime

30
schema/pgsql/schema.sql
View file

@ -1778,6 +1778,7 @@ ALTER TABLE notification_history ALTER COLUMN service_id SET STORAGE PLAIN;
ALTER TABLE notification_history ALTER COLUMN notification_id SET STORAGE PLAIN;
CREATE INDEX idx_notification_history_send_time ON notification_history(send_time DESC);
CREATE INDEX idx_notification_history_env_send_time ON notification_history(environment_id, send_time);
COMMENT ON COLUMN notification_history.id IS 'sha1(environment.name + notification.name + type + send_time)';
COMMENT ON COLUMN notification_history.environment_id IS 'environment.id';
@ -1787,6 +1788,7 @@ COMMENT ON COLUMN notification_history.service_id IS 'service.id';
COMMENT ON COLUMN notification_history.notification_id IS 'notification.id';
COMMENT ON INDEX idx_notification_history_send_time IS 'Notification list filtered/ordered by send_time';
COMMENT ON INDEX idx_notification_history_env_send_time IS 'Filter for history retention';
CREATE TABLE user_notification_history (
id bytea20 NOT NULL,
@ -1839,7 +1841,7 @@ ALTER TABLE state_history ALTER COLUMN endpoint_id SET STORAGE PLAIN;
ALTER TABLE state_history ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE state_history ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_state_history_event_time ON state_history(event_time);
CREATE INDEX idx_state_history_env_event_time ON state_history(environment_id, event_time);
COMMENT ON COLUMN state_history.id IS 'sha1(environment.name + host|service.name + event_time)';
COMMENT ON COLUMN state_history.environment_id IS 'environment.id';
@ -1847,7 +1849,7 @@ COMMENT ON COLUMN state_history.endpoint_id IS 'endpoint.id';
COMMENT ON COLUMN state_history.host_id IS 'host.id';
COMMENT ON COLUMN state_history.service_id IS 'service.id';
COMMENT ON INDEX idx_state_history_event_time IS 'Filter for history retention';
COMMENT ON INDEX idx_state_history_env_event_time IS 'Filter for history retention';
CREATE TABLE downtime_history (
downtime_id bytea20 NOT NULL,
@ -1885,7 +1887,7 @@ ALTER TABLE downtime_history ALTER COLUMN parent_id SET STORAGE PLAIN;
ALTER TABLE downtime_history ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE downtime_history ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_downtime_history_end_time ON downtime_history(end_time);
CREATE INDEX idx_downtime_history_env_end_time ON downtime_history(environment_id, end_time);
COMMENT ON COLUMN downtime_history.downtime_id IS 'downtime.id';
COMMENT ON COLUMN downtime_history.environment_id IS 'environment.id';
@ -1898,7 +1900,7 @@ COMMENT ON COLUMN downtime_history.start_time IS 'Time when the host went into a
COMMENT ON COLUMN downtime_history.end_time IS 'Problem state assumed: scheduled_end_time if fixed, start_time + duration otherwise';
COMMENT ON COLUMN downtime_history.scheduled_by IS 'Name of the ScheduledDowntime which created this Downtime. 255+1+255+1+255, i.e. "host.name!service.name!scheduled-downtime-name"';
COMMENT ON INDEX idx_downtime_history_end_time IS 'Filter for history retention';
COMMENT ON INDEX idx_downtime_history_env_end_time IS 'Filter for history retention';
CREATE TABLE comment_history (
comment_id bytea20 NOT NULL,
@ -1928,7 +1930,7 @@ ALTER TABLE comment_history ALTER COLUMN endpoint_id SET STORAGE PLAIN;
ALTER TABLE comment_history ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE comment_history ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_comment_history_remove_time ON comment_history(remove_time);
CREATE INDEX idx_comment_history_env_remove_time ON comment_history(environment_id, remove_time);
COMMENT ON COLUMN comment_history.comment_id IS 'comment.id';
COMMENT ON COLUMN comment_history.environment_id IS 'environment.id';
@ -1936,7 +1938,7 @@ COMMENT ON COLUMN comment_history.endpoint_id IS 'endpoint.id';
COMMENT ON COLUMN comment_history.host_id IS 'host.id';
COMMENT ON COLUMN comment_history.service_id IS 'service.id';
COMMENT ON INDEX idx_comment_history_remove_time IS 'Filter for history retention';
COMMENT ON INDEX idx_comment_history_env_remove_time IS 'Filter for history retention';
CREATE TABLE flapping_history (
id bytea20 NOT NULL,
@ -1962,7 +1964,7 @@ ALTER TABLE flapping_history ALTER COLUMN endpoint_id SET STORAGE PLAIN;
ALTER TABLE flapping_history ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE flapping_history ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_flapping_history_end_time ON flapping_history(end_time);
CREATE INDEX idx_flapping_history_env_end_time ON flapping_history(environment_id, end_time);
COMMENT ON COLUMN flapping_history.id IS 'sha1(environment.id + "Host"|"Service" + host|service.name + start_time)';
COMMENT ON COLUMN flapping_history.environment_id IS 'environment.id';
@ -1970,7 +1972,7 @@ COMMENT ON COLUMN flapping_history.endpoint_id IS 'endpoint.id';
COMMENT ON COLUMN flapping_history.host_id IS 'host.id';
COMMENT ON COLUMN flapping_history.service_id IS 'service.id';
COMMENT ON INDEX idx_flapping_history_end_time IS 'Filter for history retention';
COMMENT ON INDEX idx_flapping_history_env_end_time IS 'Filter for history retention';
CREATE TABLE acknowledgement_history (
id bytea20 NOT NULL,
@ -1998,7 +2000,7 @@ ALTER TABLE acknowledgement_history ALTER COLUMN endpoint_id SET STORAGE PLAIN;
ALTER TABLE acknowledgement_history ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE acknowledgement_history ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_acknowledgement_history_clear_time ON acknowledgement_history(clear_time);
CREATE INDEX idx_acknowledgement_history_env_clear_time ON acknowledgement_history(environment_id, clear_time);
COMMENT ON COLUMN acknowledgement_history.id IS 'sha1(environment.id + "Host"|"Service" + host|service.name + set_time)';
COMMENT ON COLUMN acknowledgement_history.environment_id IS 'environment.id';
@ -2010,7 +2012,7 @@ COMMENT ON COLUMN acknowledgement_history.comment IS 'NULL if ack_set event happ
COMMENT ON COLUMN acknowledgement_history.is_sticky IS 'NULL if ack_set event happened before Icinga DB history recording';
COMMENT ON COLUMN acknowledgement_history.is_persistent IS 'NULL if ack_set event happened before Icinga DB history recording';
COMMENT ON INDEX idx_acknowledgement_history_clear_time IS 'Filter for history retention';
COMMENT ON INDEX idx_acknowledgement_history_env_clear_time IS 'Filter for history retention';
CREATE TABLE history (
id bytea20 NOT NULL,
@ -2097,6 +2099,7 @@ ALTER TABLE sla_history_state ALTER COLUMN host_id SET STORAGE PLAIN;
ALTER TABLE sla_history_state ALTER COLUMN service_id SET STORAGE PLAIN;
CREATE INDEX idx_sla_history_state_event ON sla_history_state(host_id, service_id, event_time);
CREATE INDEX idx_sla_history_state_env_event_time ON sla_history_state (environment_id, event_time);
COMMENT ON COLUMN sla_history_state.id IS 'state_history.id (may reference already deleted rows)';
COMMENT ON COLUMN sla_history_state.environment_id IS 'environment.id';
@ -2107,6 +2110,9 @@ COMMENT ON COLUMN sla_history_state.event_time IS 'unix timestamp the event occu
COMMENT ON COLUMN sla_history_state.hard_state IS 'hard state after this event';
COMMENT ON COLUMN sla_history_state.previous_hard_state IS 'hard state before this event';
COMMENT ON INDEX idx_sla_history_state_event IS 'Filter for calculating the sla reports';
COMMENT ON INDEX idx_sla_history_state_env_event_time IS 'Filter for history retention';
CREATE TABLE sla_history_downtime (
environment_id bytea20 NOT NULL,
endpoint_id bytea20 DEFAULT NULL,
@ -2128,6 +2134,10 @@ ALTER TABLE sla_history_downtime ALTER COLUMN service_id SET STORAGE PLAIN;
ALTER TABLE sla_history_downtime ALTER COLUMN downtime_id SET STORAGE PLAIN;
CREATE INDEX idx_sla_history_downtime_event ON sla_history_downtime(host_id, service_id, downtime_start, downtime_end);
CREATE INDEX idx_sla_history_downtime_env_downtime_end ON sla_history_downtime (environment_id, downtime_end);
COMMENT ON INDEX idx_sla_history_downtime_event IS 'Filter for calculating the sla reports';
COMMENT ON INDEX idx_sla_history_downtime_env_downtime_end IS 'Filter for sla history retention';
COMMENT ON COLUMN sla_history_downtime.environment_id IS 'environment.id';
COMMENT ON COLUMN sla_history_downtime.endpoint_id IS 'endpoint.id';