Skip to content

Fix foreign key constraints and the mysql procedure that is used #7381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 4 commits into from
Jul 6, 2023
Merged

Fix foreign key constraints and the mysql procedure that is used #7381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b55aac4
Updated IDEMPOTENT_ADD_FOREIGN_KEY procedure and fixed some foreign k…
harikrishna-patnala Mar 29, 2023
3f42927
Removed foreign key procedure creation and usage in schema4172to41800…
harikrishna-patnala Mar 31, 2023
6e58a47
Changed the statement from procedure to alter statement
harikrishna-patnala Jun 9, 2023
58c87c2
Removed unused procedure
harikrishna-patnala Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions engine/schema/src/main/java/com/cloud/upgrade/dao/DatabaseAccessObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ public class DatabaseAccessObject {

private static Logger s_logger = Logger.getLogger(DatabaseAccessObject.class);

public void addForeignKey(Connection conn, String tableName, String tableColumn, String foreignTableName, String foreignColumnName) {
String addForeignKeyStmt = String.format("ALTER TABLE `cloud`.`%s` ADD CONSTRAINT `fk_%s__%s` FOREIGN KEY `fk_%s__%s`(`%s`) REFERENCES `%s`(`%s`)", tableName, tableName, tableColumn, tableName, tableColumn, tableColumn, foreignTableName, foreignColumnName);
try(PreparedStatement pstmt = conn.prepareStatement(addForeignKeyStmt);)
{
pstmt.executeUpdate();
s_logger.debug(String.format("Foreign key is added successfully from the table %s", tableName));
} catch (SQLException e) {
s_logger.error("Ignored SQL Exception when trying to add foreign key on table " + tableName + " exception: " + e.getMessage());
}
}

public void dropKey(Connection conn, String tableName, String key, boolean isForeignKey)
{
String alter_sql_str;
Expand Down
5 changes: 4 additions & 1 deletion engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ public class DbUpgradeUtils {

private static DatabaseAccessObject dao = new DatabaseAccessObject();

public static void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
public static void addForeignKey(Connection conn, String tableName, String tableColumn, String foreignTableName, String foreignColumnName) {
dao.addForeignKey(conn, tableName, tableColumn, foreignTableName, foreignColumnName);
}
public static void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
for (String key : keys) {
dao.dropKey(conn, tableName, key, isForeignKey);
}
Expand Down
29 changes: 29 additions & 0 deletions engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41800to41810.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

import java.io.InputStream;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;

public class Upgrade41800to41810 implements DbUpgrade, DbUpgradeSystemVmTemplate {
final static Logger LOG = Logger.getLogger(Upgrade41800to41810.class);
Expand Down Expand Up @@ -55,6 +57,7 @@ public InputStream[] getPrepareScripts() {

@Override
public void performDataMigration(Connection conn) {
fixForeignKeyNames(conn);
}

@Override
Expand Down Expand Up @@ -82,4 +85,30 @@ public void updateSystemVmTemplates(Connection conn) {
throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
}
}

private void fixForeignKeyNames(Connection conn) {
//Alter foreign key name for user_vm table from fk_user_data_id to fk_user_vm__user_data_id (if exists)
List<String> keys = new ArrayList<String>();
keys.add("fk_user_data_id");
keys.add("fk_user_vm__user_data_id");
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_vm", keys, true);
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_vm", keys, false);
DbUpgradeUtils.addForeignKey(conn, "user_vm", "user_data_id", "user_data", "id");

//Alter foreign key name for vm_template table from fk_user_data_id to fk_vm_template__user_data_id (if exists)
keys = new ArrayList<>();
keys.add("fk_user_data_id");
keys.add("fk_vm_template__user_data_id");
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_template", keys, true);
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_template", keys, false);
DbUpgradeUtils.addForeignKey(conn, "vm_template", "user_data_id", "user_data", "id");

//Alter foreign key name for volumes table from fk_passphrase_id to fk_volumes__passphrase_id (if exists)
keys = new ArrayList<>();
keys.add("fk_passphrase_id");
keys.add("fk_volumes__passphrase_id");
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.volumes", keys, true);
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.volumes", keys, false);
DbUpgradeUtils.addForeignKey(conn, "volumes", "passphrase_id","passphrase", "id");
}
}
14 changes: 0 additions & 14 deletions engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,6 @@ CREATE PROCEDURE `cloud`.`IDEMPOTENT_ADD_COLUMN` (
BEGIN
DECLARE CONTINUE HANDLER FOR 1060 BEGIN END; SET @ddl = CONCAT('ALTER TABLE ', in_table_name); SET @ddl = CONCAT(@ddl, ' ', 'ADD COLUMN') ; SET @ddl = CONCAT(@ddl, ' ', in_column_name); SET @ddl = CONCAT(@ddl, ' ', in_column_definition); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; END;


-- Add foreign key procedure to link volumes to passphrase table
DROP PROCEDURE IF EXISTS `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`;
CREATE PROCEDURE `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY` (
IN in_table_name VARCHAR(200),
IN in_foreign_table_name VARCHAR(200),
IN in_foreign_column_name VARCHAR(200)
)
BEGIN
DECLARE CONTINUE HANDLER FOR 1005,1826 BEGIN END; SET @ddl = CONCAT('ALTER TABLE ', in_table_name); SET @ddl = CONCAT(@ddl, ' ', ' ADD CONSTRAINT '); SET @ddl = CONCAT(@ddl, 'fk_', in_foreign_table_name, '_', in_foreign_column_name); SET @ddl = CONCAT(@ddl, ' FOREIGN KEY (', in_foreign_table_name, '_', in_foreign_column_name, ')'); SET @ddl = CONCAT(@ddl, ' REFERENCES ', in_foreign_table_name, '(', in_foreign_column_name, ')'); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; END;

-- Add passphrase table
CREATE TABLE IF NOT EXISTS `cloud`.`passphrase` (
`id` bigint unsigned NOT NULL auto_increment,
Expand All @@ -244,7 +233,6 @@ CREATE TABLE IF NOT EXISTS `cloud`.`passphrase` (

-- Add passphrase column to volumes table
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.volumes', 'passphrase_id', 'bigint unsigned DEFAULT NULL COMMENT "encryption passphrase id" ');
CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.volumes', 'passphrase', 'id');
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.volumes', 'encrypt_format', 'varchar(64) DEFAULT NULL COMMENT "encryption format" ');

-- Add encrypt column to disk_offering
Expand Down Expand Up @@ -653,11 +641,9 @@ CREATE TABLE IF NOT EXISTS `cloud`.`user_data` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_vm', 'user_data_id', 'bigint unsigned DEFAULT NULL COMMENT "id of the user data" AFTER `user_data`');
CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.user_vm', 'user_data', 'id');
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_vm', 'user_data_details', 'mediumtext DEFAULT NULL COMMENT "value of the comma-separated list of parameters" AFTER `user_data_id`');

CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vm_template', 'user_data_id', 'bigint unsigned DEFAULT NULL COMMENT "id of the user data"');
CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.vm_template', 'user_data', 'id');
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vm_template', 'user_data_link_policy', 'varchar(255) DEFAULT NULL COMMENT "user data link policy with template"');

-- Added userdata details to template
Expand Down