From dc96fe641f2b0f3fa6d7a8b17dad25eaa0177138 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Tue, 4 Apr 2017 14:51:39 +0200 Subject: [PATCH] TT#8704 Implement peer probing. * Add probe column to provisioning.voip_peer_hosts * Add trigger to populate kamailio.dispatcher on active probing * Fix kamailio.version table to version 4 of dispatcher table to use the attrs column. * Write peerid (used for routing) and also peername and peergid (used for monitoring) into dispatcher attrs * Only enable probing if peer is enabled Change-Id: I29bc23ec27bf59672656fc972171a518aecce133 --- db_scripts/diff/15333.down | 87 +++++++++++++++++++++++ db_scripts/diff/15333.up | 138 +++++++++++++++++++++++++++++++++++++ last_file | 8 +++ next_id | 8 +++ 4 files changed, 241 insertions(+) create mode 100644 db_scripts/diff/15333.down create mode 100644 db_scripts/diff/15333.up create mode 100755 last_file create mode 100755 next_id diff --git a/db_scripts/diff/15333.down b/db_scripts/diff/15333.down new file mode 100644 index 00000000..d111fcf2 --- /dev/null +++ b/db_scripts/diff/15333.down @@ -0,0 +1,87 @@ +USE kamailio; + +UPDATE version SET table_version = 3 WHERE table_name = 'dispatcher'; + +USE provisioning; + +ALTER TABLE voip_peer_hosts DROP COLUMN probe; + +DROP TRIGGER IF EXISTS voip_phost_crepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_crepl_trig AFTER INSERT ON voip_peer_hosts + FOR EACH ROW BEGIN + + IF NEW.enabled THEN + INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id) + VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight + FROM kamailio.lcr_rule rule + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id + WHERE vpg.id <=> NEW.group_id; + + INSERT INTO voip_peer_preferences (peer_host_id, attribute_id, value) + SELECT NEW.id, p.id, pe.value + FROM voip_preferences p, voip_preferences_enum pe + WHERE p.id <=> preference_id AND p.peer_pref=1 AND pe.peer_pref=1 AND pe.default_val=1 AND pe.value IS NOT NULL; + + END IF; + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_phost_urepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_urepl_trig AFTER UPDATE ON voip_peer_hosts + FOR EACH ROW BEGIN + + IF OLD.enabled = 1 AND NEW.enabled = 1 THEN + + UPDATE kamailio.lcr_gw + SET gw_name = NEW.name, ip_addr = NEW.ip, hostname = NEW.host, port = NEW.port, transport = NEW.transport, flags = NEW.id + WHERE lcr_id = 1 + AND flags <=> NEW.id; + + UPDATE kamailio.lcr_rule_target rt, kamailio.lcr_gw gw + SET rt.weight = NEW.weight + WHERE gw.id <=> rt.gw_id + AND gw.lcr_id = 1 + AND gw.group_id <=> NEW.group_id + AND gw.flags <=> NEW.id; + + ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN + + INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id) + VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight + FROM kamailio.lcr_rule rule + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id + WHERE vpg.id <=> NEW.group_id; + + ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN + + DELETE FROM kamailio.lcr_gw + WHERE lcr_id = 1 + AND flags <=> NEW.id; + + END IF; + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_phost_drepl_trig; +DELIMITER ;; +CREATE TRIGGER voip_phost_drepl_trig AFTER DELETE ON voip_peer_hosts + FOR EACH ROW BEGIN + + DELETE FROM kamailio.lcr_gw + WHERE flags <=> OLD.id; + + DELETE FROM kamailio.peer_preferences + WHERE uuid = OLD.id; + +END ;; +DELIMITER ; diff --git a/db_scripts/diff/15333.up b/db_scripts/diff/15333.up new file mode 100644 index 00000000..4534cd04 --- /dev/null +++ b/db_scripts/diff/15333.up @@ -0,0 +1,138 @@ +USE kamailio; + +UPDATE version SET table_version = 4 WHERE table_name = 'dispatcher'; + +USE provisioning; + +ALTER TABLE voip_peer_hosts + ADD COLUMN probe TINYINT(1) NOT NULL DEFAULT 0; + +DROP TRIGGER IF EXISTS voip_phost_crepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_crepl_trig AFTER INSERT ON voip_peer_hosts + FOR EACH ROW BEGIN + + DECLARE m_proto CHAR(4); + IF NEW.transport = 2 THEN + SET m_proto := 'TCP'; + ELSEIF NEW.transport = 3 THEN + SET m_proto := 'TLS'; + ELSE + SET m_proto := 'UDP'; + END IF; + + IF NEW.enabled THEN + INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id) + VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight + FROM kamailio.lcr_rule rule + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id + WHERE vpg.id <=> NEW.group_id; + + INSERT INTO voip_peer_preferences (peer_host_id, attribute_id, value) + SELECT NEW.id, p.id, pe.value + FROM voip_preferences p, voip_preferences_enum pe + WHERE p.id <=> preference_id AND p.peer_pref=1 AND pe.peer_pref=1 AND pe.default_val=1 AND pe.value IS NOT NULL; + + IF NEW.probe = 1 THEN + INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description) + VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername=', NEW.name, ';peergid=', NEW.group_id, ';'), 'Peer Probe'); + END IF; + + END IF; + + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_phost_urepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_urepl_trig AFTER UPDATE ON voip_peer_hosts + FOR EACH ROW BEGIN + + DECLARE m_proto CHAR(4); + DECLARE m_probechange INTEGER; + + IF NEW.transport = 2 THEN + SET m_proto := 'TCP'; + ELSEIF NEW.transport = 3 THEN + SET m_proto := 'TLS'; + ELSE + SET m_proto := 'UDP'; + END IF; + + IF OLD.enabled = 1 AND NEW.enabled = 1 THEN + + UPDATE kamailio.lcr_gw + SET gw_name = NEW.name, ip_addr = NEW.ip, hostname = NEW.host, port = NEW.port, transport = NEW.transport, flags = NEW.id + WHERE lcr_id = 1 + AND flags <=> NEW.id; + + UPDATE kamailio.lcr_rule_target rt, kamailio.lcr_gw gw + SET rt.weight = NEW.weight + WHERE gw.id <=> rt.gw_id + AND gw.lcr_id = 1 + AND gw.group_id <=> NEW.group_id + AND gw.flags <=> NEW.id; + + IF OLD.probe = 1 AND (OLD.ip != NEW.ip OR OLD.port != NEW.port OR OLD.transport != NEW.transport OR OLD.name != NEW.name OR OLD.group_id != NEW.group_id) THEN + DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%'); + SET m_probechange := 1; + ELSEIF OLD.probe = 1 and NEW.probe = 0 THEN + DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%'); + END IF; + IF NEW.probe = 1 AND (m_probechange = 1 OR OLD.probe = 0) THEN + INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description) + VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername=', NEW.name, ';peergid=', NEW.group_id, ';'), 'Peer Probe'); + END IF; + + ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN + + INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id) + VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight + FROM kamailio.lcr_rule rule + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id + WHERE vpg.id <=> NEW.group_id; + + IF NEW.probe = 1 THEN + INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description) + VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername=', NEW.name, ';peergid=', NEW.group_id, ';'), 'Peer Probe'); + END IF; + + ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN + + DELETE FROM kamailio.lcr_gw + WHERE lcr_id = 1 + AND flags <=> NEW.id; + + IF OLD.probe = 1 THEN + DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', NEW.id, ';%'); + END IF; + + END IF; + + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_phost_drepl_trig; +DELIMITER ;; +CREATE TRIGGER voip_phost_drepl_trig AFTER DELETE ON voip_peer_hosts + FOR EACH ROW BEGIN + + DELETE FROM kamailio.lcr_gw + WHERE flags <=> OLD.id; + + DELETE FROM kamailio.peer_preferences + WHERE uuid = OLD.id; + + IF OLD.enabled = 1 AND OLD.probe = 1 THEN + DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%'); + END IF; +END ;; +DELIMITER ; diff --git a/last_file b/last_file new file mode 100755 index 00000000..d329abb6 --- /dev/null +++ b/last_file @@ -0,0 +1,8 @@ +#!/bin/bash + +LAST=$(\ + find db_scripts/ -name "*.up" |\ + awk -vFS=/ -vOFS=/ '{ print $NF }' |\ + sort -n | tail -1 | cut -f1 -d'.'\ +); +find . -type f -name "$LAST.up" diff --git a/next_id b/next_id new file mode 100755 index 00000000..78819788 --- /dev/null +++ b/next_id @@ -0,0 +1,8 @@ +#!/bin/bash + +LAST=$(\ + find db_scripts/ -name "*.up" |\ + awk -vFS=/ -vOFS=/ '{ print $NF }' |\ + sort -n | tail -1 | cut -f1 -d'.'\ +); +echo $(( LAST + 1))