bernardodemarco commented on code in PR #13015:
URL: https://github.com/apache/cloudstack/pull/13015#discussion_r3277036141
##########
engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql:
##########
@@ -131,3 +131,22 @@ CREATE TABLE IF NOT EXISTS
`cloud_usage`.`quota_tariff_usage` (
-- Add the 'keep_mac_address_on_public_nic' column to the 'cloud.networks' and
'cloud.vpc' tables
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.networks',
'keep_mac_address_on_public_nic', 'TINYINT(1) NOT NULL DEFAULT 1');
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc',
'keep_mac_address_on_public_nic', 'TINYINT(1) NOT NULL DEFAULT 1');
+
+-- Soft delete port forwarding, load balancing and firewall rules
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.firewall_rules', 'removed',
'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.load_balancer_vm_map', 'removed',
'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.load_balancer_cert_map',
'removed', 'datetime DEFAULT NULL');
+CALL
`cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.load_balancer_healthcheck_policies',
'removed', 'datetime DEFAULT NULL');
+CALL
`cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.load_balancer_stickiness_policies',
'removed', 'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.global_load_balancer_lb_rule_map',
'removed', 'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.elastic_lb_vm_map', 'removed',
'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.tungsten_lb_health_monitor',
'removed', 'datetime DEFAULT NULL');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.global_load_balancing_rules',
'removed', 'datetime DEFAULT NULL');
+
+ALTER TABLE `cloud`.`load_balancer_vm_map`
+DROP KEY `load_balancer_id`,
+ADD UNIQUE KEY `load_balancer_id` (`load_balancer_id`, `instance_id`,
`instance_ip`, `removed`);
+
+ALTER TABLE `cloud`.`global_load_balancer_lb_rule_map`
+DROP KEY `gslb_rule_id`,
+ADD UNIQUE KEY `gslb_rule_id` (`gslb_rule_id`, `lb_rule_id`, `removed`);
Review Comment:
I do not think so. I've just reviewed them again and the only tables that
seem to have these explicit keys that need adjustments are
`load_balancer_vm_map` and `global_load_balancer_lb_rule_map`:
```
MariaDB [cloud]> show keys from load_balancer_vm_map;
+----------------------+------------+--------------------------------------+--------------+------------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
| Table | Non_unique | Key_name |
Seq_in_index | Column_name | Collation | Cardinality | Sub_part | Packed |
Null | Index_type | Comment | Index_comment | Ignored |
+----------------------+------------+--------------------------------------+--------------+------------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
| load_balancer_vm_map | 0 | PRIMARY |
1 | id | A | 0 | NULL | NULL |
| BTREE | | | NO |
| load_balancer_vm_map | 0 | load_balancer_id |
1 | load_balancer_id | A | 0 | NULL | NULL |
| BTREE | | | NO |
| load_balancer_vm_map | 0 | load_balancer_id |
2 | instance_id | A | 0 | NULL | NULL |
| BTREE | | | NO |
| load_balancer_vm_map | 0 | load_balancer_id |
3 | instance_ip | A | 0 | NULL | NULL |
YES | BTREE | | | NO |
| load_balancer_vm_map | 0 | load_balancer_id |
4 | removed | A | 0 | NULL | NULL |
YES | BTREE | | | NO |
| load_balancer_vm_map | 1 | fk_load_balancer_vm_map__instance_id |
1 | instance_id | A | 0 | NULL | NULL |
| BTREE | | | NO |
+----------------------+------------+--------------------------------------+--------------+------------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
6 rows in set (0.000 sec)
```
```
MariaDB [cloud]> show keys from global_load_balancer_lb_rule_map;
+----------------------------------+------------+---------------+--------------+--------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
| Table | Non_unique | Key_name |
Seq_in_index | Column_name | Collation | Cardinality | Sub_part | Packed |
Null | Index_type | Comment | Index_comment | Ignored |
+----------------------------------+------------+---------------+--------------+--------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
| global_load_balancer_lb_rule_map | 0 | PRIMARY |
1 | id | A | 0 | NULL | NULL | | BTREE
| | | NO |
| global_load_balancer_lb_rule_map | 0 | gslb_rule_id |
1 | gslb_rule_id | A | 0 | NULL | NULL | | BTREE
| | | NO |
| global_load_balancer_lb_rule_map | 0 | gslb_rule_id |
2 | lb_rule_id | A | 0 | NULL | NULL | | BTREE
| | | NO |
| global_load_balancer_lb_rule_map | 0 | gslb_rule_id |
3 | removed | A | 0 | NULL | NULL | YES | BTREE
| | | NO |
| global_load_balancer_lb_rule_map | 1 | fk_lb_rule_id |
1 | lb_rule_id | A | 0 | NULL | NULL | | BTREE
| | | NO |
+----------------------------------+------------+---------------+--------------+--------------+-----------+-------------+----------+--------+------+------------+---------+---------------+---------+
5 rows in set (0.000 sec)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
