From beacd8b668fc5aaef5ee49677add1dde49582b92 Mon Sep 17 00:00:00 2001 From: andrewbogott Date: Tue, 6 Nov 2012 14:29:10 -0600 Subject: Clarify server_name, hostname, host. Specifically: 'hostname' refers to the instance. 'host' refers to the nova node. 'server_name' refers to nothing and I've removed it. Change-Id: I29e2486dddc71289018fca58a4f02f1f3b0d1b9e --- .../138_drop_server_name_from_instances.py | 39 ++++ .../migrate_repo/versions/138_sqlite_downgrade.sql | 239 +++++++++++++++++++++ .../migrate_repo/versions/138_sqlite_upgrade.sql | 239 +++++++++++++++++++++ 3 files changed, 517 insertions(+) create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_downgrade.sql create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_upgrade.sql (limited to 'nova/db/sqlalchemy/migrate_repo/versions') diff --git a/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py new file mode 100644 index 000000000..2faae3a8e --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py @@ -0,0 +1,39 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from nova.openstack.common import log as logging +from sqlalchemy import Column, String, MetaData, Table + +LOG = logging.getLogger(__name__) + + +def upgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + instances = Table('instances', meta, autoload=True) + server_name = instances.columns.server_name + server_name.drop() + + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + instances = Table('instances', meta, autoload=True) + server_name = Column('server_name', + String(length=255)) + instances.create_column(server_name) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_downgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_downgrade.sql new file mode 100644 index 000000000..89873ccd4 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_downgrade.sql @@ -0,0 +1,239 @@ +BEGIN TRANSACTION; + CREATE TEMPORARY TABLE instances_backup ( + created_at DATETIME, + updated_at DATETIME, + deleted_at DATETIME, + deleted BOOLEAN, + id INTEGER NOT NULL, + internal_id INTEGER, + user_id VARCHAR(255), + project_id VARCHAR(255), + image_ref VARCHAR(255), + kernel_id VARCHAR(255), + ramdisk_id VARCHAR(255), + launch_index INTEGER, + key_name VARCHAR(255), + key_data TEXT, + power_state INTEGER, + vm_state VARCHAR(255), + memory_mb INTEGER, + vcpus INTEGER, + hostname VARCHAR(255), + host VARCHAR(255), + user_data TEXT, + reservation_id VARCHAR(255), + scheduled_at DATETIME, + launched_at DATETIME, + terminated_at DATETIME, + display_name VARCHAR(255), + display_description VARCHAR(255), + availability_zone VARCHAR(255), + locked BOOLEAN, + os_type VARCHAR(255), + launched_on TEXT, + instance_type_id INTEGER, + vm_mode VARCHAR(255), + uuid VARCHAR(36), + architecture VARCHAR(255), + root_device_name VARCHAR(255), + access_ip_v4 VARCHAR(255), + access_ip_v6 VARCHAR(255), + config_drive VARCHAR(255), + task_state VARCHAR(255), + default_ephemeral_device VARCHAR(255), + default_swap_device VARCHAR(255), + progress INTEGER, + auto_disk_config BOOLEAN, + shutdown_terminate BOOLEAN, + disable_terminate BOOLEAN, + root_gb INTEGER, + ephemeral_gb INTEGER, + cell_name VARCHAR(255), + node VARCHAR(255), + PRIMARY KEY (id) + ); + + INSERT INTO instances_backup + SELECT created_at, + updated_at, + deleted_at, + deleted, + id, + internal_id, + user_id, + project_id, + image_ref, + kernel_id, + ramdisk_id, + launch_index, + key_name, + key_data, + power_state, + vm_state, + memory_mb, + vcpus, + hostname, + host, + user_data, + reservation_id, + scheduled_at, + launched_at, + terminated_at, + display_name, + display_description, + availability_zone, + locked, + os_type, + launched_on, + instance_type_id, + vm_mode, + uuid, + architecture, + root_device_name, + access_ip_v4, + access_ip_v6, + config_drive, + task_state, + default_ephemeral_device, + default_swap_device, + progress, + auto_disk_config, + shutdown_terminate, + disable_terminate, + root_gb, + ephemeral_gb, + cell_name, + node + FROM instances; + + DROP TABLE instances; + + CREATE TABLE instances ( + created_at DATETIME, + updated_at DATETIME, + deleted_at DATETIME, + deleted BOOLEAN, + id INTEGER NOT NULL, + internal_id INTEGER, + user_id VARCHAR(255), + project_id VARCHAR(255), + image_ref VARCHAR(255), + kernel_id VARCHAR(255), + ramdisk_id VARCHAR(255), + server_name VARCHAR(255), + launch_index INTEGER, + key_name VARCHAR(255), + key_data TEXT, + power_state INTEGER, + vm_state VARCHAR(255), + memory_mb INTEGER, + vcpus INTEGER, + hostname VARCHAR(255), + host VARCHAR(255), + user_data TEXT, + reservation_id VARCHAR(255), + scheduled_at DATETIME, + launched_at DATETIME, + terminated_at DATETIME, + display_name VARCHAR(255), + display_description VARCHAR(255), + availability_zone VARCHAR(255), + locked BOOLEAN, + os_type VARCHAR(255), + launched_on TEXT, + instance_type_id INTEGER, + vm_mode VARCHAR(255), + uuid VARCHAR(36), + architecture VARCHAR(255), + root_device_name VARCHAR(255), + access_ip_v4 VARCHAR(255), + access_ip_v6 VARCHAR(255), + config_drive VARCHAR(255), + task_state VARCHAR(255), + default_ephemeral_device VARCHAR(255), + default_swap_device VARCHAR(255), + progress INTEGER, + auto_disk_config BOOLEAN, + shutdown_terminate BOOLEAN, + disable_terminate BOOLEAN, + root_gb INTEGER, + ephemeral_gb INTEGER, + cell_name VARCHAR(255), + node VARCHAR(255), + PRIMARY KEY (id) + ); + + CREATE INDEX instances_host_node_deleted_idx + ON instances (host, node, deleted); + + CREATE INDEX instances_host_deleted_idx + ON instances (host, deleted); + + CREATE INDEX instances_reservation_id_idx + ON instances (reservation_id); + + CREATE INDEX instances_terminated_at_launched_at_idx + ON instances (terminated_at, launched_at); + + CREATE INDEX instances_uuid_deleted_idx + ON instances (uuid, deleted); + + CREATE INDEX instances_task_state_updated_at_idx + ON instances (task_state, updated_at); + + INSERT INTO instances + SELECT created_at, + updated_at, + deleted_at, + deleted, + id, + internal_id, + user_id, + project_id, + image_ref, + kernel_id, + ramdisk_id, + hostname, + launch_index, + key_name, + key_data, + power_state, + vm_state, + memory_mb, + vcpus, + hostname, + host, + user_data, + reservation_id, + scheduled_at, + launched_at, + terminated_at, + display_name, + display_description, + availability_zone, + locked, + os_type, + launched_on, + instance_type_id, + vm_mode, + uuid, + architecture, + root_device_name, + access_ip_v4, + access_ip_v6, + config_drive, + task_state, + default_ephemeral_device, + default_swap_device, + progress, + auto_disk_config, + shutdown_terminate, + disable_terminate, + root_gb, + ephemeral_gb, + cell_name, + node + FROM instances_backup; + + DROP TABLE instances_backup; +COMMIT; diff --git a/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_upgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_upgrade.sql new file mode 100644 index 000000000..9a72d06c6 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_upgrade.sql @@ -0,0 +1,239 @@ +BEGIN TRANSACTION; + CREATE TEMPORARY TABLE instances_backup ( + created_at DATETIME, + updated_at DATETIME, + deleted_at DATETIME, + deleted BOOLEAN, + id INTEGER NOT NULL, + internal_id INTEGER, + user_id VARCHAR(255), + project_id VARCHAR(255), + image_ref VARCHAR(255), + kernel_id VARCHAR(255), + ramdisk_id VARCHAR(255), + server_name VARCHAR(255), + launch_index INTEGER, + key_name VARCHAR(255), + key_data TEXT, + power_state INTEGER, + vm_state VARCHAR(255), + memory_mb INTEGER, + vcpus INTEGER, + hostname VARCHAR(255), + host VARCHAR(255), + user_data TEXT, + reservation_id VARCHAR(255), + scheduled_at DATETIME, + launched_at DATETIME, + terminated_at DATETIME, + display_name VARCHAR(255), + display_description VARCHAR(255), + availability_zone VARCHAR(255), + locked BOOLEAN, + os_type VARCHAR(255), + launched_on TEXT, + instance_type_id INTEGER, + vm_mode VARCHAR(255), + uuid VARCHAR(36), + architecture VARCHAR(255), + root_device_name VARCHAR(255), + access_ip_v4 VARCHAR(255), + access_ip_v6 VARCHAR(255), + config_drive VARCHAR(255), + task_state VARCHAR(255), + default_ephemeral_device VARCHAR(255), + default_swap_device VARCHAR(255), + progress INTEGER, + auto_disk_config BOOLEAN, + shutdown_terminate BOOLEAN, + disable_terminate BOOLEAN, + root_gb INTEGER, + ephemeral_gb INTEGER, + cell_name VARCHAR(255), + node VARCHAR(255), + PRIMARY KEY (id) + ); + + INSERT INTO instances_backup + SELECT created_at, + updated_at, + deleted_at, + deleted, + id, + internal_id, + user_id, + project_id, + image_ref, + kernel_id, + ramdisk_id, + server_name, + launch_index, + key_name, + key_data, + power_state, + vm_state, + memory_mb, + vcpus, + hostname, + host, + user_data, + reservation_id, + scheduled_at, + launched_at, + terminated_at, + display_name, + display_description, + availability_zone, + locked, + os_type, + launched_on, + instance_type_id, + vm_mode, + uuid, + architecture, + root_device_name, + access_ip_v4, + access_ip_v6, + config_drive, + task_state, + default_ephemeral_device, + default_swap_device, + progress, + auto_disk_config, + shutdown_terminate, + disable_terminate, + root_gb, + ephemeral_gb, + cell_name, + node + FROM instances; + + DROP TABLE instances; + + CREATE TABLE instances ( + created_at DATETIME, + updated_at DATETIME, + deleted_at DATETIME, + deleted BOOLEAN, + id INTEGER NOT NULL, + internal_id INTEGER, + user_id VARCHAR(255), + project_id VARCHAR(255), + image_ref VARCHAR(255), + kernel_id VARCHAR(255), + ramdisk_id VARCHAR(255), + launch_index INTEGER, + key_name VARCHAR(255), + key_data TEXT, + power_state INTEGER, + vm_state VARCHAR(255), + memory_mb INTEGER, + vcpus INTEGER, + hostname VARCHAR(255), + host VARCHAR(255), + user_data TEXT, + reservation_id VARCHAR(255), + scheduled_at DATETIME, + launched_at DATETIME, + terminated_at DATETIME, + display_name VARCHAR(255), + display_description VARCHAR(255), + availability_zone VARCHAR(255), + locked BOOLEAN, + os_type VARCHAR(255), + launched_on TEXT, + instance_type_id INTEGER, + vm_mode VARCHAR(255), + uuid VARCHAR(36), + architecture VARCHAR(255), + root_device_name VARCHAR(255), + access_ip_v4 VARCHAR(255), + access_ip_v6 VARCHAR(255), + config_drive VARCHAR(255), + task_state VARCHAR(255), + default_ephemeral_device VARCHAR(255), + default_swap_device VARCHAR(255), + progress INTEGER, + auto_disk_config BOOLEAN, + shutdown_terminate BOOLEAN, + disable_terminate BOOLEAN, + root_gb INTEGER, + ephemeral_gb INTEGER, + cell_name VARCHAR(255), + node VARCHAR(255), + PRIMARY KEY (id) + ); + + CREATE INDEX instances_host_node_deleted_idx + ON instances (host, node, deleted); + + CREATE INDEX instances_host_deleted_idx + ON instances (host, deleted); + + CREATE INDEX instances_reservation_id_idx + ON instances (reservation_id); + + CREATE INDEX instances_terminated_at_launched_at_idx + ON instances (terminated_at, launched_at); + + CREATE INDEX instances_uuid_deleted_idx + ON instances (uuid, deleted); + + CREATE INDEX instances_task_state_updated_at_idx + ON instances (task_state, updated_at); + + INSERT INTO instances + SELECT created_at, + updated_at, + deleted_at, + deleted, + id, + internal_id, + user_id, + project_id, + image_ref, + kernel_id, + ramdisk_id, + launch_index, + key_name, + key_data, + power_state, + vm_state, + memory_mb, + vcpus, + hostname, + host, + user_data, + reservation_id, + scheduled_at, + launched_at, + terminated_at, + display_name, + display_description, + availability_zone, + locked, + os_type, + launched_on, + instance_type_id, + vm_mode, + uuid, + architecture, + root_device_name, + access_ip_v4, + access_ip_v6, + config_drive, + task_state, + default_ephemeral_device, + default_swap_device, + progress, + auto_disk_config, + shutdown_terminate, + disable_terminate, + root_gb, + ephemeral_gb, + cell_name, + node + FROM instances_backup; + + DROP TABLE instances_backup; +COMMIT; -- cgit